Changeset 107119 in webkit

Timestamp:

Feb 8, 2012 12:24:57 PM (12 years ago)

Author:

andersca@apple.com

Message:

Add a content shadow layer to the render layer compositor
​https://bugs.webkit.org/show_bug.cgi?id=78133
<rdar://problem/10797742>

Reviewed by Beth Dakin.

Have the render layer compositor optionally create a content shadow layer,
and add a ScrollbarTheme::setUpContentShadowLayer member function that subclasses
can use to set content shadow properties.

• platform/mac/ScrollbarThemeMac.mm:

(WebCore::ScrollbarThemeMac::setUpContentShadowLayer):
Set the layer properties once, and set the shadow path on every call, since we know that this
function will be called every time the size of the content shadow layer changes.

• rendering/RenderLayerCompositor.cpp:

(WebCore::RenderLayerCompositor::updateRootLayerPosition):
Reposition the content shadow layer, and call ScrollbarTheme::setUpContentShadowLayer if the size changes.

(WebCore::RenderLayerCompositor::requiresContentShadowLayer):
Add new helper function.

(WebCore::RenderLayerCompositor::updateOverflowControlsLayers):
Create a content shadow layer if needed.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/ScrollbarTheme.h (modified) (1 diff)
• platform/mac/ScrollbarThemeMac.h (modified) (1 diff)
• platform/mac/ScrollbarThemeMac.mm (modified) (1 diff)
• rendering/RenderLayerCompositor.cpp (modified) (3 diffs)
• rendering/RenderLayerCompositor.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-08  Anders Carlsson  <andersca@apple.com>
+
+        Add a content shadow layer to the render layer compositor
+        https://bugs.webkit.org/show_bug.cgi?id=78133
+        <rdar://problem/10797742>
+
+        Reviewed by Beth Dakin.
+
+        Have the render layer compositor optionally create a content shadow layer,
+        and add a ScrollbarTheme::setUpContentShadowLayer member function that subclasses
+        can use to set content shadow properties.
+
+        * platform/mac/ScrollbarThemeMac.mm:
+        (WebCore::ScrollbarThemeMac::setUpContentShadowLayer):
+        Set the layer properties once, and set the shadow path on every call, since we know that this
+        function will be called every time the size of the content shadow layer changes.
+
+        * rendering/RenderLayerCompositor.cpp:
+        (WebCore::RenderLayerCompositor::updateRootLayerPosition):
+        Reposition the content shadow layer, and call ScrollbarTheme::setUpContentShadowLayer if the size changes.
+
+        (WebCore::RenderLayerCompositor::requiresContentShadowLayer):
+        Add new helper function.
+
+        (WebCore::RenderLayerCompositor::updateOverflowControlsLayers):
+        Create a content shadow layer if needed.
+
 2012-02-07  Andy Estes  <aestes@apple.com>
 

trunk/Source/WebCore/platform/ScrollbarTheme.h

@@ -91 +91 @@
 #if USE(ACCELERATED_COMPOSITING) && ENABLE(RUBBER_BANDING)
     virtual void setUpOverhangAreasLayerContents(GraphicsLayer*) { }
+    virtual void setUpContentShadowLayer(GraphicsLayer*) { }
 #endif
 

trunk/Source/WebCore/platform/mac/ScrollbarThemeMac.h

@@ -84 +84 @@
 #if !PLATFORM(CHROMIUM) && USE(ACCELERATED_COMPOSITING) && ENABLE(RUBBER_BANDING)
     virtual void setUpOverhangAreasLayerContents(GraphicsLayer*) OVERRIDE;
+    virtual void setUpContentShadowLayer(GraphicsLayer*) OVERRIDE;
 #endif
 };

trunk/Source/WebCore/platform/mac/ScrollbarThemeMac.mm

@@ -625 +625 @@
 }
 
+void ScrollbarThemeMac::setUpContentShadowLayer(GraphicsLayer* graphicsLayer)
+{
+    // We operate on the CALayer directly here, since GraphicsLayer doesn't have the concept
+    // of shadows, and we know that WebCore won't touch this layer.
+    CALayer *contentShadowLayer = graphicsLayer->platformLayer();
+
+    static const CGFloat shadowOpacity = 0.66;
+    static const CGFloat shadowRadius = 3;
+
+    // We only need to set these shadow properties once.
+    if (!contentShadowLayer.shadowOpacity) {
+        contentShadowLayer.shadowColor = CGColorGetConstantColor(kCGColorBlack);
+        contentShadowLayer.shadowOffset = CGSizeZero;
+        contentShadowLayer.shadowOpacity = shadowOpacity;
+        contentShadowLayer.shadowRadius = shadowRadius;
+    }
+
+    RetainPtr<CGPathRef> shadowPath = adoptCF(CGPathCreateWithRect(CGRectMake(0, 0, graphicsLayer->size().width(), graphicsLayer->size().height()), NULL));
+    contentShadowLayer.shadowPath = shadowPath.get();
+}
+
 #endif
 

trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp

@@ -1232 +1232 @@
         m_clipLayer->setSize(frameView->visibleContentRect(false /* exclude scrollbars */).size());
     }
+
+#if ENABLE(RUBBER_BANDING)
+    if (m_contentShadowLayer) {
+        m_contentShadowLayer->setPosition(m_rootContentLayer->position());
+
+        FloatSize rootContentLayerSize = m_rootContentLayer->size();
+        if (m_contentShadowLayer->size() != rootContentLayerSize) {
+            m_contentShadowLayer->setSize(rootContentLayerSize);
+            ScrollbarTheme::theme()->setUpContentShadowLayer(m_contentShadowLayer.get());
+        }
+    }
+#endif
 }
 
@@ -1723 +1735 @@
     return false;
 }
+
+bool RenderLayerCompositor::requiresContentShadowLayer() const
+{
+    // We don't want a layer if this is a subframe.
+    if (m_renderView->document()->ownerElement())
+        return false;
+
+#if PLATFORM(MAC) && ENABLE(THREADED_SCROLLING)
+    // On Mac, we want a content shadow layer if we have a scrolling coordinator.
+    if (scrollingCoordinator())
+        return true;
+#endif
+
+    return false;
+}
 #endif
 
@@ -1746 +1773 @@
         m_layerForOverhangAreas->removeFromParent();
         m_layerForOverhangAreas = nullptr;
+    }
+
+    if (requiresContentShadowLayer()) {
+        if (!m_contentShadowLayer) {
+            m_contentShadowLayer = GraphicsLayer::create(this);
+#ifndef NDEBUG
+            m_contentShadowLayer->setName("content shadow");
+#endif
+            m_contentShadowLayer->setSize(m_rootContentLayer->size());
+            m_contentShadowLayer->setPosition(m_rootContentLayer->position());
+            ScrollbarTheme::theme()->setUpContentShadowLayer(m_contentShadowLayer.get());
+
+            m_scrollLayer->addChildBelow(m_contentShadowLayer.get(), m_rootContentLayer.get());
+        }
+    } else if (m_contentShadowLayer) {
+        m_contentShadowLayer->removeFromParent();
+        m_contentShadowLayer = nullptr;
     }
 #endif

trunk/Source/WebCore/rendering/RenderLayerCompositor.h

@@ -292 +292 @@
 #if ENABLE(RUBBER_BANDING)
     bool requiresOverhangAreasLayer() const;
+    bool requiresContentShadowLayer() const;
 #endif
 
@@ -338 +339 @@
 #if ENABLE(RUBBER_BANDING)
     OwnPtr<GraphicsLayer> m_layerForOverhangAreas;
+    OwnPtr<GraphicsLayer> m_contentShadowLayer;
 #endif
 #if PROFILE_LAYER_REBUILD