Title: [273407] trunk
Revision
273407
Author
s...@apple.com
Date
2021-02-24 09:58:32 -0800 (Wed, 24 Feb 2021)

Log Message

[GPU Process] In process DisplayList display should have a higher precedence than GPUP display
https://bugs.webkit.org/show_bug.cgi?id=222345

Reviewed by Wenson Hsieh.

Source/WebCore:

Give ShouldUseDisplayList a higher precedence since it is a debug option.

* platform/graphics/ImageBuffer.cpp:
(WebCore::ImageBuffer::create):

LayoutTests:

* gpu-process/TestExpectations:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (273406 => 273407)


--- trunk/LayoutTests/ChangeLog	2021-02-24 17:51:55 UTC (rev 273406)
+++ trunk/LayoutTests/ChangeLog	2021-02-24 17:58:32 UTC (rev 273407)
@@ -1,5 +1,14 @@
 2021-02-24  Said Abou-Hallawa  <s...@apple.com>
 
+        [GPU Process] In process DisplayList display should have a higher precedence than GPUP display
+        https://bugs.webkit.org/show_bug.cgi?id=222345
+
+        Reviewed by Wenson Hsieh.
+
+        * gpu-process/TestExpectations:
+
+2021-02-24  Said Abou-Hallawa  <s...@apple.com>
+
         [GPU Process] Implement ImageBufferShareableBitmapBackend::bytesPerRow()
         https://bugs.webkit.org/show_bug.cgi?id=222348
 

Modified: trunk/LayoutTests/gpu-process/TestExpectations (273406 => 273407)


--- trunk/LayoutTests/gpu-process/TestExpectations	2021-02-24 17:51:55 UTC (rev 273406)
+++ trunk/LayoutTests/gpu-process/TestExpectations	2021-02-24 17:58:32 UTC (rev 273407)
@@ -3,7 +3,6 @@
 compositing/layer-creation/spanOverlapsCanvas.html [ Failure ]
 
 css3/blending/blend-mode-clip-accelerated-blending-canvas.html [ Failure ]
-displaylists/canvas-display-list.html [ Failure ]
 
 # webkit.org/b/220389
 fast/canvas/canvas-arc-360-winding.html [ Failure ]

Modified: trunk/Source/WebCore/ChangeLog (273406 => 273407)


--- trunk/Source/WebCore/ChangeLog	2021-02-24 17:51:55 UTC (rev 273406)
+++ trunk/Source/WebCore/ChangeLog	2021-02-24 17:58:32 UTC (rev 273407)
@@ -1,3 +1,15 @@
+2021-02-24  Said Abou-Hallawa  <s...@apple.com>
+
+        [GPU Process] In process DisplayList display should have a higher precedence than GPUP display
+        https://bugs.webkit.org/show_bug.cgi?id=222345
+
+        Reviewed by Wenson Hsieh.
+
+        Give ShouldUseDisplayList a higher precedence since it is a debug option.
+
+        * platform/graphics/ImageBuffer.cpp:
+        (WebCore::ImageBuffer::create):
+
 2021-02-24  Zalan Bujtas  <za...@apple.com>
 
         [LegacyLineLayout] Inline level box should not stick out at the bottom of its containing block

Modified: trunk/Source/WebCore/platform/graphics/ImageBuffer.cpp (273406 => 273407)


--- trunk/Source/WebCore/platform/graphics/ImageBuffer.cpp	2021-02-24 17:51:55 UTC (rev 273406)
+++ trunk/Source/WebCore/platform/graphics/ImageBuffer.cpp	2021-02-24 17:58:32 UTC (rev 273407)
@@ -41,10 +41,9 @@
 RefPtr<ImageBuffer> ImageBuffer::create(const FloatSize& size, RenderingMode renderingMode, ShouldUseDisplayList shouldUseDisplayList, RenderingPurpose purpose, float resolutionScale, DestinationColorSpace colorSpace, PixelFormat pixelFormat, const HostWindow* hostWindow)
 {
     RefPtr<ImageBuffer> imageBuffer;
-    if (hostWindow)
-        imageBuffer = hostWindow->createImageBuffer(size, renderingMode, purpose, resolutionScale, colorSpace, pixelFormat);
-
-    if (!imageBuffer && shouldUseDisplayList == ShouldUseDisplayList::Yes) {
+    
+    // Give ShouldUseDisplayList a higher precedence since it is a debug option.
+    if (shouldUseDisplayList == ShouldUseDisplayList::Yes) {
         if (renderingMode == RenderingMode::Accelerated)
             imageBuffer = DisplayListAcceleratedImageBuffer::create(size, resolutionScale, colorSpace, pixelFormat, hostWindow);
         
@@ -51,6 +50,9 @@
         if (!imageBuffer)
             imageBuffer = DisplayListUnacceleratedImageBuffer::create(size, resolutionScale, colorSpace, pixelFormat, hostWindow);
     }
+    
+    if (hostWindow && !imageBuffer)
+        imageBuffer = hostWindow->createImageBuffer(size, renderingMode, purpose, resolutionScale, colorSpace, pixelFormat);
 
     if (!imageBuffer)
         imageBuffer = ImageBuffer::create(size, renderingMode, resolutionScale, colorSpace, pixelFormat, hostWindow);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to