Changeset 183775 in webkit

Timestamp:

May 4, 2015, 3:53:10 PM (11 years ago)

Author:

Simon Fraser

Message:

Fix updating of tiled backing opaquenss when the page background color changes
​https://bugs.webkit.org/show_bug.cgi?id=144600
rdar://problem/20723035

Reviewed by Tim Horton.

Source/WebCore:

RenderLayerCompositor makes the page tiles opaque or not based on the result of
viewHasTransparentBackground(), which consults the view transparency, and
FrameView::documentBackgroundColor(). documentBackgroundColor() in turn is based
on the root and/or body background colors.

We thus need to re-evaluate whether page tiles are opaque when any of these inputs
change, but were failing to do so for the FrameView's baseBackgroundColor, and
the page root background color.

Fix by having FrameView::setBaseBackgroundColor(), and RenderBox::styleDidChange()
(for the root) trigger a compositing update when necessary.

Added setViewBaseBackgroundColor() on Internals for testing.

Test: platform/mac-wk2/tiled-drawing/background-transparency-toggle.html

• page/FrameView.cpp:

(WebCore::FrameView::setTransparent): Use the isViewForDocumentInFrame() helper.
(WebCore::FrameView::setBaseBackgroundColor): Bail if we're not the view for the
frame's document, and trigger a compositing update check if the alpha changed.
(WebCore::FrameView::isViewForDocumentInFrame): Helper that checks to see if
this FrameView is associated with the Document being displayed in the FrameView's
Frame. This returns false when we're setting up a new FrameView (its Frame still
points to the old document, so renderView() returns the RenderView for the Frame's
existing Document).

• page/FrameView.h:
• rendering/RenderBox.cpp:

(WebCore::RenderBox::styleDidChange): Have the compositor check to see if it needs
to do an update.

• rendering/RenderLayerCompositor.cpp:

(WebCore::RenderLayerCompositor::rootBackgroundTransparencyChanged): If the result
of documentBackgroundColor() changed in alpha since the last time, trigger a compositing
update.

• rendering/RenderLayerCompositor.h:
• testing/Internals.cpp:

(WebCore::Internals::setViewBaseBackgroundColor):

• testing/Internals.h:
• testing/Internals.idl:

LayoutTests:

Test that dumps layers with various baseBackgroundColor and body background color
combinations.

• platform/mac-wk2/tiled-drawing/background-transparency-toggle-expected.txt: Added.
• platform/mac-wk2/tiled-drawing/background-transparency-toggle.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac-wk2/tiled-drawing/background-transparency-toggle-expected.txt (added)
• LayoutTests/platform/mac-wk2/tiled-drawing/background-transparency-toggle.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/FrameView.cpp (modified) (4 diffs)
• Source/WebCore/page/FrameView.h (modified) (1 diff)
• Source/WebCore/rendering/RenderBox.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderLayerCompositor.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderLayerCompositor.h (modified) (2 diffs)
• Source/WebCore/testing/Internals.cpp (modified) (1 diff)
• Source/WebCore/testing/Internals.h (modified) (1 diff)
• Source/WebCore/testing/Internals.idl (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-05-04  Simon Fraser  <simon.fraser@apple.com>
+
+        Fix updating of tiled backing opaquenss when the page background color changes
+        https://bugs.webkit.org/show_bug.cgi?id=144600
+        rdar://problem/20723035
+
+        Reviewed by Tim Horton.
+
+        Test that dumps layers with various baseBackgroundColor and body background color
+        combinations.
+
+        * platform/mac-wk2/tiled-drawing/background-transparency-toggle-expected.txt: Added.
+        * platform/mac-wk2/tiled-drawing/background-transparency-toggle.html: Added.
+
 2015-05-04  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-05-04  Simon Fraser  <simon.fraser@apple.com>
+
+        Fix updating of tiled backing opaquenss when the page background color changes
+        https://bugs.webkit.org/show_bug.cgi?id=144600
+        rdar://problem/20723035
+
+        Reviewed by Tim Horton.
+
+        RenderLayerCompositor makes the page tiles opaque or not based on the result of
+        viewHasTransparentBackground(), which consults the view transparency, and
+        FrameView::documentBackgroundColor(). documentBackgroundColor() in turn is based
+        on the root and/or body background colors.
+
+        We thus need to re-evaluate whether page tiles are opaque when any of these inputs
+        change, but were failing to do so for the FrameView's baseBackgroundColor, and
+        the page root background color.
+        
+        Fix by having FrameView::setBaseBackgroundColor(), and RenderBox::styleDidChange()
+        (for the root) trigger a compositing update when necessary.
+
+        Added setViewBaseBackgroundColor() on Internals for testing.
+
+        Test: platform/mac-wk2/tiled-drawing/background-transparency-toggle.html
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::setTransparent): Use the isViewForDocumentInFrame() helper.
+        (WebCore::FrameView::setBaseBackgroundColor): Bail if we're not the view for the 
+        frame's document, and trigger a compositing update check if the alpha changed.
+        (WebCore::FrameView::isViewForDocumentInFrame): Helper that checks to see if
+        this FrameView is associated with the Document being displayed in the FrameView's
+        Frame. This returns false when we're setting up a new FrameView (its Frame still
+        points to the old document, so renderView() returns the RenderView for the Frame's
+        existing Document).
+        * page/FrameView.h:
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::styleDidChange): Have the compositor check to see if it needs
+        to do an update.
+        * rendering/RenderLayerCompositor.cpp:
+        (WebCore::RenderLayerCompositor::rootBackgroundTransparencyChanged): If the result
+        of documentBackgroundColor() changed in alpha since the last time, trigger a compositing
+        update.
+        * rendering/RenderLayerCompositor.h:
+        * testing/Internals.cpp:
+        (WebCore::Internals::setViewBaseBackgroundColor):
+        * testing/Internals.h:
+        * testing/Internals.idl:
+
 2015-05-04  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/page/FrameView.cpp

@@ -2679 +2679 @@
     m_isTransparent = isTransparent;
 
-    RenderView* renderView = this->renderView();
-    if (!renderView)
-        return;
-
     // setTransparent can be called in the window between FrameView initialization
     // and switching in the new Document; this means that the RenderView that we
     // retrieve is actually attached to the previous Document, which is going away,
     // and must not update compositing layers.
-    if (&renderView->frameView() != this)
-        return;
-
-    RenderLayerCompositor& compositor = renderView->compositor();
-    compositor.setCompositingLayersNeedRebuild();
-    compositor.scheduleCompositingLayerUpdate();
+    if (!isViewForDocumentInFrame())
+        return;
+
+    renderView()->compositor().rootBackgroundTransparencyChanged();
 }
 
@@ -2707 +2701 @@
 void FrameView::setBaseBackgroundColor(const Color& backgroundColor)
 {
+    bool hadAlpha = m_baseBackgroundColor.hasAlpha();
+    
     if (!backgroundColor.isValid())
         m_baseBackgroundColor = Color::white;
@@ -2712 +2708 @@
         m_baseBackgroundColor = backgroundColor;
 
+    if (!isViewForDocumentInFrame())
+        return;
+
     recalculateScrollbarOverlayStyle();
+
+    if (m_baseBackgroundColor.hasAlpha() != hadAlpha)
+        renderView()->compositor().rootBackgroundTransparencyChanged();
 }
 
@@ -4111 +4113 @@
 }
 
+bool FrameView::isViewForDocumentInFrame() const
+{
+    RenderView* renderView = this->renderView();
+    if (!renderView)
+        return false;
+
+    return &renderView->frameView() == this;
+}
+
 void FrameView::enableAutoSizeMode(bool enable, const IntSize& minSize, const IntSize& maxSize)
 {

trunk/Source/WebCore/page/FrameView.h

@@ -649 +649 @@
 
     bool qualifiesAsVisuallyNonEmpty() const;
+    bool isViewForDocumentInFrame() const;
 
     AXObjectCache* axObjectCache() const;

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -426 +426 @@
         if (rootStyleChanged && is<RenderBlockFlow>(rootRenderer) && downcast<RenderBlockFlow>(*rootRenderer).multiColumnFlowThread())
             downcast<RenderBlockFlow>(*rootRenderer).updateStylesForColumnChildren();
+
+        if (diff != StyleDifferenceEqual)
+            view().compositor().rootBackgroundTransparencyChanged();
     }
 

trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp

@@ -3215 +3215 @@
 }
 
+void RenderLayerCompositor::rootBackgroundTransparencyChanged()
+{
+    Color documentBackgroundColor = m_renderView.frameView().documentBackgroundColor();
+    if (m_lastDocumentBackgroundColor.isValid() && documentBackgroundColor.hasAlpha() == m_lastDocumentBackgroundColor.hasAlpha())
+        return;
+
+    // FIXME: We should do something less expensive than a full layer rebuild.
+    setCompositingLayersNeedRebuild();
+    scheduleCompositingLayerUpdate();
+}
+
 void RenderLayerCompositor::setRootExtendedBackgroundColor(const Color& color)
 {

trunk/Source/WebCore/rendering/RenderLayerCompositor.h

@@ -166 +166 @@
     GraphicsLayer* fixedRootBackgroundLayer() const;
     
+    // Called after the view transparency, or the document or base background color change.
+    void rootBackgroundTransparencyChanged();
+    
     // Repaint the appropriate layers when the given RenderLayer starts or stops being composited.
     void repaintOnCompositingChange(RenderLayer&);
@@ -555 +558 @@
 
     Color m_rootExtendedBackgroundColor;
+    Color m_lastDocumentBackgroundColor;
 
     HashMap<ScrollingNodeID, RenderLayer*> m_scrollingNodeToLayerMap;

trunk/Source/WebCore/testing/Internals.cpp

@@ -988 +988 @@
 }
 
+void Internals::setViewBaseBackgroundColor(const String& colorValue, ExceptionCode& ec)
+{
+    Document* document = contextDocument();
+    if (!document || !document->view()) {
+        ec = INVALID_ACCESS_ERR;
+        return;
+    }
+
+    document->view()->setBaseBackgroundColor(Color(colorValue));
+}
+
 void Internals::setPagination(const String& mode, int gap, int pageLength, ExceptionCode& ec)
 {

trunk/Source/WebCore/testing/Internals.h

@@ -158 +158 @@
 
     void setScrollViewPosition(long x, long y, ExceptionCode&);
+    void setViewBaseBackgroundColor(const String& colorValue, ExceptionCode&);
+
     void setPagination(const String& mode, int gap, ExceptionCode& ec) { setPagination(mode, gap, 0, ec); }
     void setPagination(const String& mode, int gap, int pageLength, ExceptionCode&);

trunk/Source/WebCore/testing/Internals.idl

@@ -123 +123 @@
     [RaisesException] void setScrollViewPosition(long x, long y);
 
+    [RaisesException] void setViewBaseBackgroundColor(DOMString colorValue);
+
     [RaisesException] void setPagination(DOMString mode, long gap, optional long pageLength);