Changeset 110620 in webkit

Timestamp:

Mar 13, 2012, 3:06:24 PM (15 years ago)

Author:

enne@google.com

Message:

[chromium] Mark root layer scrollbars as always opaque to disable blending
​https://bugs.webkit.org/show_bug.cgi?id=79951

Reviewed by James Robinson.

Source/WebCore:

Now that scrollbar layers exist, mark non-overlay root scrollbars as
opaque. This disables blending for correctness and performance.

• page/scrolling/chromium/ScrollingCoordinatorChromium.cpp:

(WebCore::scrollbarLayerDidChange):
(WebCore::ScrollingCoordinator::frameViewHorizontalScrollbarLayerDidChange):
(WebCore::ScrollingCoordinator::frameViewVerticalScrollbarLayerDidChange):

• platform/graphics/chromium/LayerRendererChromium.cpp:

(WebCore::LayerRendererChromium::drawTileQuad):

LayoutTests:

Mark canvas-text-alignment.html as failing on Linux in general, not
just in debug. I believe that with this change, the same image will
pass on both release and debug, but will land that change separately.

• platform/chromium/test_expectations.txt:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/chromium/test_expectations.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/scrolling/chromium/ScrollingCoordinatorChromium.cpp (modified) (4 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-03-13  Adrienne Walker  <enne@google.com>
+
+        [chromium] Mark root layer scrollbars as always opaque to disable blending
+        https://bugs.webkit.org/show_bug.cgi?id=79951
+
+        Reviewed by James Robinson.
+
+        Mark canvas-text-alignment.html as failing on Linux in general, not
+        just in debug. I believe that with this change, the same image will
+        pass on both release and debug, but will land that change separately.
+
+        * platform/chromium/test_expectations.txt:
+
 2012-03-13  Thiago Marcos P. Santos  <thiago.santos@intel.com>
 

trunk/LayoutTests/platform/chromium/test_expectations.txt

@@ -3703 +3703 @@
 BUGV8_1948 : fast/js/dfg-put-by-id-prototype-check.html = TEXT
 
-BUGWK78529 LINUX DEBUG : platform/chromium/virtual/gpu/fast/canvas/canvas-text-alignment.html = IMAGE
+BUGWK78529 LINUX : platform/chromium/virtual/gpu/fast/canvas/canvas-text-alignment.html = IMAGE
 
 BUGWK78561 WIN : css3/filters/crash-hw-sw-switch.html = MISSING

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-13  Adrienne Walker  <enne@google.com>
+
+        [chromium] Mark root layer scrollbars as always opaque to disable blending
+        https://bugs.webkit.org/show_bug.cgi?id=79951
+
+        Reviewed by James Robinson.
+
+        Now that scrollbar layers exist, mark non-overlay root scrollbars as
+        opaque. This disables blending for correctness and performance.
+
+        * page/scrolling/chromium/ScrollingCoordinatorChromium.cpp:
+        (WebCore::scrollbarLayerDidChange):
+        (WebCore::ScrollingCoordinator::frameViewHorizontalScrollbarLayerDidChange):
+        (WebCore::ScrollingCoordinator::frameViewVerticalScrollbarLayerDidChange):
+        * platform/graphics/chromium/LayerRendererChromium.cpp:
+        (WebCore::LayerRendererChromium::drawTileQuad):
+
 2012-03-13  Gavin Peters  <gavinp@chromium.org>
 

trunk/Source/WebCore/page/scrolling/chromium/ScrollingCoordinatorChromium.cpp

@@ -82 +82 @@
 }
 
-static void scrollbarLayerDidChange(Scrollbar* scrollbar, LayerChromium* scrollLayer, GraphicsLayer* scrollbarGraphicsLayer)
+static void scrollbarLayerDidChange(Scrollbar* scrollbar, LayerChromium* scrollLayer, GraphicsLayer* scrollbarGraphicsLayer, FrameView* frameView)
 {
     ASSERT(scrollbar);
-    ASSERT(scrollLayer);
     ASSERT(scrollbarGraphicsLayer);
+
+    if (!scrollLayer) {
+        // FIXME: sometimes we get called before setScrollLayer, workaround by finding the scroll layout ourselves.
+        scrollLayer = scrollLayerForFrameView(frameView)->platformLayer();
+        ASSERT(scrollLayer);
+    }
+
+    // Root layer non-overlay scrollbars should be marked opaque to disable
+    // blending.
+    bool isOpaqueRootScrollbar = !frameView->parent() && !scrollbar->isOverlayScrollbar();
+    if (!scrollbarGraphicsLayer->contentsOpaque())
+        scrollbarGraphicsLayer->setContentsOpaque(isOpaqueRootScrollbar);
 
     if (scrollbar->isCustomScrollbar() || !CCProxy::hasImplThread()) {
@@ -97 +108 @@
     scrollbarGraphicsLayer->setContentsToMedia(scrollbarLayer.get());
     scrollbarGraphicsLayer->setDrawsContent(false);
+    scrollbarLayer->setOpaque(scrollbarGraphicsLayer->contentsOpaque());
 }
 
@@ -104 +116 @@
         return;
 
-    LayerChromium* scrollLayer = m_private->scrollLayer();
-    if (!scrollLayer) // FIXME: sometimes we get called before setScrollLayer, workaround by finding the scroll layout ourselves.
-        scrollLayer = scrollLayerForFrameView(frameView)->platformLayer();
-
-    scrollbarLayerDidChange(frameView->horizontalScrollbar(), scrollLayer, horizontalScrollbarLayer);
+    scrollbarLayerDidChange(frameView->horizontalScrollbar(), m_private->scrollLayer(), horizontalScrollbarLayer, frameView);
 }
 
@@ -116 +124 @@
         return;
 
-    LayerChromium* scrollLayer = m_private->scrollLayer();
-    if (!scrollLayer) // FIXME: sometimes we get called before setScrollLayer, workaround by finding the scroll layout ourselves.
-        scrollLayer = scrollLayerForFrameView(frameView)->platformLayer();
-
-    scrollbarLayerDidChange(frameView->verticalScrollbar(), scrollLayer, verticalScrollbarLayer);
+    scrollbarLayerDidChange(frameView->verticalScrollbar(), m_private->scrollLayer(), verticalScrollbarLayer, frameView);
 }