Diff
Modified: trunk/Source/WebCore/ChangeLog (161302 => 161303)
--- trunk/Source/WebCore/ChangeLog 2014-01-04 02:01:19 UTC (rev 161302)
+++ trunk/Source/WebCore/ChangeLog 2014-01-04 02:04:34 UTC (rev 161303)
@@ -1,3 +1,60 @@
+2014-01-03 Simon Fraser <[email protected]>
+
+ Simplify ScrollingStateNode references to various layer types
+ https://bugs.webkit.org/show_bug.cgi?id=126477
+
+ Reviewed by Tim Horton.
+
+ ScrollingStateNodes referenced both GraphicsLayer and PlatformLayers, in
+ confusing ways. In the main thread they have a GraphicsLayer*, but need
+ to check to see if the underlying PlatformLayer changed. Then, when
+ cloned to commit to the scrolling thread, they drop the GraphicsLayer
+ and store a PlatformLayer.
+
+ Hide the complexity (and prepare for the future) by adding LayerRepresentation,
+ which wraps various different flavors of layers, and knows how to check whether
+ the PlatformLayer underlying a GraphicsLayer changed.
+
+ ScrollingStateNode layer setters then just take and compare LayerRepresentations.
+ Copy constructors convert to a PlatformLayer representation (though not really
+ in the right place currently), and ScrollingTreeNodes get PlatformLayers.
+
+ * page/scrolling/AsyncScrollingCoordinator.cpp:
+ (WebCore::AsyncScrollingCoordinator::updateScrollingNode):
+ (WebCore::AsyncScrollingCoordinator::setScrollLayerForNode):
+ * page/scrolling/ScrollingStateFixedNode.cpp:
+ (WebCore::ScrollingStateFixedNode::syncLayerPositionForViewportRect):
+ * page/scrolling/ScrollingStateNode.cpp:
+ (WebCore::ScrollingStateNode::ScrollingStateNode):
+ (WebCore::ScrollingStateNode::setLayer):
+ * page/scrolling/ScrollingStateNode.h:
+ (WebCore::LayerRepresentation::LayerRepresentation):
+ (WebCore::LayerRepresentation::operator GraphicsLayer*):
+ (WebCore::LayerRepresentation::operator PlatformLayer*):
+ (WebCore::LayerRepresentation::operator GraphicsLayer::PlatformLayerID):
+ (WebCore::LayerRepresentation::operator ==):
+ (WebCore::LayerRepresentation::toPlatformLayer):
+ (WebCore::LayerRepresentation::representsGraphicsLayer):
+ (WebCore::LayerRepresentation::representsPlatformLayer):
+ (WebCore::LayerRepresentation::representsPlatformLayerID):
+ (WebCore::ScrollingStateNode::layer):
+ * page/scrolling/ScrollingStateScrollingNode.cpp:
+ (WebCore::ScrollingStateScrollingNode::ScrollingStateScrollingNode):
+ (WebCore::ScrollingStateScrollingNode::setCounterScrollingLayer):
+ (WebCore::ScrollingStateScrollingNode::setHeaderLayer):
+ (WebCore::ScrollingStateScrollingNode::setFooterLayer):
+ * page/scrolling/ScrollingStateScrollingNode.h:
+ * page/scrolling/ScrollingStateStickyNode.cpp:
+ (WebCore::ScrollingStateStickyNode::syncLayerPositionForViewportRect):
+ * page/scrolling/mac/ScrollingStateNodeMac.mm:
+ * page/scrolling/mac/ScrollingStateScrollingNodeMac.mm:
+ * page/scrolling/mac/ScrollingTreeFixedNode.mm:
+ (WebCore::ScrollingTreeFixedNode::updateBeforeChildren):
+ * page/scrolling/mac/ScrollingTreeScrollingNodeMac.mm:
+ (WebCore::ScrollingTreeScrollingNodeMac::updateBeforeChildren):
+ * page/scrolling/mac/ScrollingTreeStickyNode.mm:
+ (WebCore::ScrollingTreeStickyNode::updateBeforeChildren):
+
2014-01-03 Brent Fulgham <[email protected]>
[WebGL] Blit operation from Multisample FBO to rendering FBO must ignore GL_SCISSOR test
Modified: trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp (161302 => 161303)
--- trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp 2014-01-04 02:01:19 UTC (rev 161302)
+++ trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp 2014-01-04 02:04:34 UTC (rev 161303)
@@ -206,7 +206,7 @@
if (!node)
return;
- node->setScrollLayer(scrollLayer);
+ node->setLayer(scrollLayer);
node->setCounterScrollingLayer(counterScrollingLayer);
scheduleTreeStateCommit();
}
@@ -238,7 +238,8 @@
void AsyncScrollingCoordinator::setScrollLayerForNode(GraphicsLayer* scrollLayer, ScrollingStateNode* node)
{
- node->setScrollLayer(scrollLayer);
+ node->setLayer(scrollLayer);
+ // FIXME: only schedule a commit if something changed.
scheduleTreeStateCommit();
}
Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateFixedNode.cpp (161302 => 161303)
--- trunk/Source/WebCore/page/scrolling/ScrollingStateFixedNode.cpp 2014-01-04 02:01:19 UTC (rev 161302)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateFixedNode.cpp 2014-01-04 02:04:34 UTC (rev 161303)
@@ -73,7 +73,7 @@
void ScrollingStateFixedNode::syncLayerPositionForViewportRect(const LayoutRect& viewportRect)
{
FloatPoint position = m_constraints.layerPositionForViewportRect(viewportRect);
- graphicsLayer()->syncPosition(position);
+ static_cast<GraphicsLayer*>(layer())->syncPosition(position);
}
void ScrollingStateFixedNode::dumpProperties(TextStream& ts, int indent) const
Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateNode.cpp (161302 => 161303)
--- trunk/Source/WebCore/page/scrolling/ScrollingStateNode.cpp 2014-01-04 02:01:19 UTC (rev 161302)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateNode.cpp 2014-01-04 02:04:34 UTC (rev 161303)
@@ -46,8 +46,7 @@
}
// This copy constructor is used for cloning nodes in the tree, and it doesn't make sense
-// to clone the relationship pointers, so don't copy that information from the original
-// node.
+// to clone the relationship pointers, so don't copy that information from the original node.
ScrollingStateNode::ScrollingStateNode(const ScrollingStateNode& stateNode, ScrollingStateTree& adoptiveTree)
: m_nodeType(stateNode.nodeType())
, m_nodeID(stateNode.scrollingNodeID())
@@ -55,8 +54,9 @@
, m_scrollingStateTree(adoptiveTree)
, m_parent(0)
{
- // FIXME: why doesn't this set the GraphicsLayer?
- setScrollPlatformLayer(stateNode.platformScrollLayer());
+ // The cloned tree references PlatformLayers, which are safe to send to the scrolling thread.
+ // FIXME: this Mac threaded-scrolling assumption doesn't belong here.
+ setLayer(stateNode.layer().toPlatformLayer());
scrollingStateTree().addNode(this);
}
@@ -127,6 +127,17 @@
m_children->at(i)->willBeRemovedFromStateTree();
}
+void ScrollingStateNode::setLayer(const LayerRepresentation& layerRepresentation)
+{
+ if (layerRepresentation == m_layer)
+ return;
+
+ m_layer = layerRepresentation;
+
+ setPropertyChanged(ScrollLayer);
+ scrollingStateTree().setHasChangedProperties(true);
+}
+
void ScrollingStateNode::dump(TextStream& ts, int indent) const
{
writeIndent(ts, indent);
Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateNode.h (161302 => 161303)
--- trunk/Source/WebCore/page/scrolling/ScrollingStateNode.h 2014-01-04 02:01:19 UTC (rev 161302)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateNode.h 2014-01-04 02:04:34 UTC (rev 161303)
@@ -28,7 +28,7 @@
#if ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS)
-#include "PlatformLayer.h"
+#include "GraphicsLayer.h"
#include "ScrollingCoordinator.h"
#include <wtf/OwnPtr.h>
#include <wtf/PassOwnPtr.h>
@@ -44,6 +44,102 @@
class ScrollingStateTree;
class TextStream;
+// Used to allow ScrollingStateNodes to refer to layers in various contexts:
+// a) Async scrolling, main thread: ScrollingStateNode holds onto a GraphicsLayer, and uses m_layerID
+// to detect whether that GraphicsLayer's underlying PlatformLayer changed.
+// b) Threaded scrolling, commit to scrolling thread: ScrollingStateNode wraps a PlatformLayer, which
+// can be passed to the Scrolling Thread
+// c) Remote scrolling UI process, where LayerRepresentation wraps just a PlatformLayerID.
+class LayerRepresentation {
+public:
+ enum LayerRepresentationType {
+ EmptyRepresentation,
+ GraphicsLayerRepresentation,
+ PlatformLayerRepresentation,
+ PlatformLayerIDRepresentation
+ };
+
+ LayerRepresentation()
+ : m_graphicsLayer(nullptr)
+ , m_layerID(0)
+ , m_representation(EmptyRepresentation)
+ { }
+
+ LayerRepresentation(GraphicsLayer* graphicsLayer)
+ : m_graphicsLayer(graphicsLayer)
+ , m_layerID(graphicsLayer ? graphicsLayer->primaryLayerID() : 0)
+ , m_representation(GraphicsLayerRepresentation)
+ { }
+
+ LayerRepresentation(PlatformLayer* platformLayer)
+ : m_platformLayer(platformLayer)
+ , m_layerID(0)
+ , m_representation(PlatformLayerRepresentation)
+ { }
+
+ LayerRepresentation(GraphicsLayer::PlatformLayerID layerID)
+ : m_graphicsLayer(nullptr)
+ , m_layerID(layerID)
+ , m_representation(PlatformLayerIDRepresentation)
+ { }
+
+ operator GraphicsLayer*() const
+ {
+ ASSERT(m_representation == GraphicsLayerRepresentation);
+ return m_graphicsLayer;
+ }
+
+ operator PlatformLayer*() const
+ {
+ ASSERT(m_representation == PlatformLayerRepresentation);
+ return m_platformLayer;
+ }
+
+ operator GraphicsLayer::PlatformLayerID() const
+ {
+ ASSERT(m_representation == PlatformLayerIDRepresentation || m_representation == GraphicsLayerRepresentation);
+ return m_layerID;
+ }
+
+ bool operator ==(const LayerRepresentation& other) const
+ {
+ if (m_representation != other.m_representation)
+ return false;
+ switch (m_representation) {
+ case EmptyRepresentation:
+ return true;
+ case GraphicsLayerRepresentation:
+ return m_graphicsLayer == other.m_graphicsLayer
+ && m_layerID == other.m_layerID;
+ case PlatformLayerRepresentation:
+ return m_platformLayer == other.m_platformLayer;
+ case PlatformLayerIDRepresentation:
+ return m_layerID == other.m_layerID;
+ }
+ ASSERT_NOT_REACHED();
+ return true;
+ }
+
+ LayerRepresentation toPlatformLayer() const
+ {
+ ASSERT(m_representation == GraphicsLayerRepresentation);
+ return m_graphicsLayer ? m_graphicsLayer->platformLayer() : nullptr;
+ }
+
+ bool representsGraphicsLayer() const { return m_representation == GraphicsLayerRepresentation; }
+ bool representsPlatformLayer() const { return m_representation == PlatformLayerRepresentation; }
+ bool representsPlatformLayerID() const { return m_representation == PlatformLayerIDRepresentation; }
+
+private:
+ union {
+ GraphicsLayer* m_graphicsLayer;
+ PlatformLayer *m_platformLayer;
+ };
+
+ GraphicsLayer::PlatformLayerID m_layerID;
+ LayerRepresentationType m_representation;
+};
+
class ScrollingStateNode {
public:
ScrollingStateNode(ScrollingNodeType, ScrollingStateTree&, ScrollingNodeID);
@@ -68,10 +164,8 @@
virtual void syncLayerPositionForViewportRect(const LayoutRect& /*viewportRect*/) { }
- GraphicsLayer* graphicsLayer() { return m_graphicsLayer; }
- PlatformLayer* platformScrollLayer() const;
- void setScrollLayer(GraphicsLayer*);
- void setScrollPlatformLayer(PlatformLayer*);
+ const LayerRepresentation& layer() const { return m_layer; }
+ void setLayer(const LayerRepresentation&);
ScrollingStateTree& scrollingStateTree() const { return m_scrollingStateTree; }
@@ -106,10 +200,7 @@
ScrollingStateNode* m_parent;
OwnPtr<Vector<OwnPtr<ScrollingStateNode>>> m_children;
-#if PLATFORM(MAC)
- RetainPtr<PlatformLayer> m_platformScrollLayer;
-#endif
- GraphicsLayer* m_graphicsLayer;
+ LayerRepresentation m_layer;
};
#define SCROLLING_STATE_NODE_TYPE_CASTS(ToValueTypeName, predicate) \
Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.cpp (161302 => 161303)
--- trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.cpp 2014-01-04 02:01:19 UTC (rev 161302)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.cpp 2014-01-04 02:04:34 UTC (rev 161303)
@@ -41,9 +41,6 @@
ScrollingStateScrollingNode::ScrollingStateScrollingNode(ScrollingStateTree& stateTree, ScrollingNodeID nodeID)
: ScrollingStateNode(ScrollingNode, stateTree, nodeID)
- , m_counterScrollingLayer(0)
- , m_headerLayer(0)
- , m_footerLayer(0)
#if PLATFORM(MAC)
, m_verticalScrollbarPainter(0)
, m_horizontalScrollbarPainter(0)
@@ -78,9 +75,11 @@
, m_requestedScrollPosition(stateNode.requestedScrollPosition())
, m_requestedScrollPositionRepresentsProgrammaticScroll(stateNode.requestedScrollPositionRepresentsProgrammaticScroll())
{
- setCounterScrollingLayer(stateNode.counterScrollingLayer());
- setHeaderLayer(stateNode.headerLayer());
- setFooterLayer(stateNode.footerLayer());
+ // The cloned tree references PlatformLayers, which are safe to send to the scrolling thread.
+ // FIXME: this Mac threaded-scrolling assumption doesn't belong here.
+ setCounterScrollingLayer(stateNode.counterScrollingLayer().toPlatformLayer());
+ setHeaderLayer(stateNode.headerLayer().toPlatformLayer());
+ setFooterLayer(stateNode.footerLayer().toPlatformLayer());
}
ScrollingStateScrollingNode::~ScrollingStateScrollingNode()
@@ -211,6 +210,40 @@
scrollingStateTree().setHasChangedProperties(true);
}
+void ScrollingStateScrollingNode::setCounterScrollingLayer(const LayerRepresentation& layerRepresentation)
+{
+ if (layerRepresentation == m_counterScrollingLayer)
+ return;
+
+ m_counterScrollingLayer = layerRepresentation;
+
+ setPropertyChanged(CounterScrollingLayer);
+ scrollingStateTree().setHasChangedProperties(true);
+}
+
+void ScrollingStateScrollingNode::setHeaderLayer(const LayerRepresentation& layerRepresentation)
+{
+ if (layerRepresentation == m_headerLayer)
+ return;
+
+ m_headerLayer = layerRepresentation;
+
+ setPropertyChanged(HeaderLayer);
+ scrollingStateTree().setHasChangedProperties(true);
+}
+
+
+void ScrollingStateScrollingNode::setFooterLayer(const LayerRepresentation& layerRepresentation)
+{
+ if (layerRepresentation == m_footerLayer)
+ return;
+
+ m_footerLayer = layerRepresentation;
+
+ setPropertyChanged(FooterLayer);
+ scrollingStateTree().setHasChangedProperties(true);
+}
+
void ScrollingStateScrollingNode::dumpProperties(TextStream& ts, int indent) const
{
ts << "(" << "Scrolling node" << "\n";
Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.h (161302 => 161303)
--- trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.h 2014-01-04 02:01:19 UTC (rev 161302)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.h 2014-01-04 02:04:34 UTC (rev 161303)
@@ -28,6 +28,7 @@
#if ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS)
+#include "GraphicsLayer.h"
#include "IntRect.h"
#include "Region.h"
#include "ScrollTypes.h"
@@ -104,19 +105,16 @@
void setFooterHeight(int);
// This is a layer moved in the opposite direction to scrolling, for example for background-attachment:fixed
- GraphicsLayer* counterScrollingLayer() const { return m_counterScrollingLayer; }
- void setCounterScrollingLayer(GraphicsLayer*);
- PlatformLayer* counterScrollingPlatformLayer() const;
+ const LayerRepresentation& counterScrollingLayer() const { return m_counterScrollingLayer; }
+ void setCounterScrollingLayer(const LayerRepresentation&);
// The header and footer layers scroll vertically with the page, they should remain fixed when scrolling horizontally.
- GraphicsLayer* headerLayer() const { return m_headerLayer; }
- void setHeaderLayer(GraphicsLayer*);
- PlatformLayer* headerPlatformLayer() const;
+ const LayerRepresentation& headerLayer() const { return m_headerLayer; }
+ void setHeaderLayer(const LayerRepresentation&);
// The header and footer layers scroll vertically with the page, they should remain fixed when scrolling horizontally.
- GraphicsLayer* footerLayer() const { return m_footerLayer; }
- void setFooterLayer(GraphicsLayer*);
- PlatformLayer* footerPlatformLayer() const;
+ const LayerRepresentation& footerLayer() const { return m_footerLayer; }
+ void setFooterLayer(const LayerRepresentation&);
#if PLATFORM(MAC)
ScrollbarPainter verticalScrollbarPainter() const { return m_verticalScrollbarPainter; }
@@ -132,13 +130,11 @@
ScrollingStateScrollingNode(ScrollingStateTree&, ScrollingNodeID);
ScrollingStateScrollingNode(const ScrollingStateScrollingNode&, ScrollingStateTree&);
- GraphicsLayer* m_counterScrollingLayer;
- GraphicsLayer* m_headerLayer;
- GraphicsLayer* m_footerLayer;
+ LayerRepresentation m_counterScrollingLayer;
+ LayerRepresentation m_headerLayer;
+ LayerRepresentation m_footerLayer;
+
#if PLATFORM(MAC)
- RetainPtr<PlatformLayer> m_counterScrollingPlatformLayer;
- RetainPtr<PlatformLayer> m_headerPlatformLayer;
- RetainPtr<PlatformLayer> m_footerPlatformLayer;
ScrollbarPainter m_verticalScrollbarPainter;
ScrollbarPainter m_horizontalScrollbarPainter;
#endif
Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateStickyNode.cpp (161302 => 161303)
--- trunk/Source/WebCore/page/scrolling/ScrollingStateStickyNode.cpp 2014-01-04 02:01:19 UTC (rev 161302)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateStickyNode.cpp 2014-01-04 02:04:34 UTC (rev 161303)
@@ -73,7 +73,7 @@
void ScrollingStateStickyNode::syncLayerPositionForViewportRect(const LayoutRect& viewportRect)
{
FloatPoint position = m_constraints.layerPositionForConstrainingRect(viewportRect);
- graphicsLayer()->syncPosition(position);
+ static_cast<GraphicsLayer*>(layer())->syncPosition(position);
}
void ScrollingStateStickyNode::dumpProperties(TextStream& ts, int indent) const
Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingStateNodeMac.mm (161302 => 161303)
--- trunk/Source/WebCore/page/scrolling/mac/ScrollingStateNodeMac.mm 2014-01-04 02:01:19 UTC (rev 161302)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingStateNodeMac.mm 2014-01-04 02:04:34 UTC (rev 161303)
@@ -33,30 +33,6 @@
namespace WebCore {
-PlatformLayer* ScrollingStateNode::platformScrollLayer() const
-{
- return m_platformScrollLayer.get();
-}
-
-void ScrollingStateNode::setScrollPlatformLayer(PlatformLayer* platformLayer)
-{
- m_platformScrollLayer = platformLayer;
-}
-
-void ScrollingStateNode::setScrollLayer(GraphicsLayer* graphicsLayer)
-{
- PlatformLayer* platformScrollLayer = graphicsLayer ? graphicsLayer->platformLayer() : nil;
-
- if (m_platformScrollLayer == platformScrollLayer)
- return;
-
- m_platformScrollLayer = platformScrollLayer;
- m_graphicsLayer = graphicsLayer;
-
- setPropertyChanged(ScrollLayer);
- scrollingStateTree().setHasChangedProperties(true);
-}
-
} // namespace WebCore
#endif // ENABLE(ASYNC_SCROLLING)
Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingStateScrollingNodeMac.mm (161302 => 161303)
--- trunk/Source/WebCore/page/scrolling/mac/ScrollingStateScrollingNodeMac.mm 2014-01-04 02:01:19 UTC (rev 161302)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingStateScrollingNodeMac.mm 2014-01-04 02:04:34 UTC (rev 161303)
@@ -34,61 +34,6 @@
#if ENABLE(ASYNC_SCROLLING)
namespace WebCore {
-
-PlatformLayer* ScrollingStateScrollingNode::counterScrollingPlatformLayer() const
-{
- return m_counterScrollingPlatformLayer.get();
-}
-
-void ScrollingStateScrollingNode::setCounterScrollingLayer(GraphicsLayer* graphicsLayer)
-{
- PlatformLayer* platformScrollLayer = graphicsLayer ? graphicsLayer->platformLayer() : nil;
- if (m_counterScrollingPlatformLayer == platformScrollLayer)
- return;
-
- m_counterScrollingPlatformLayer = platformScrollLayer;
- m_counterScrollingLayer = graphicsLayer;
-
- setPropertyChanged(CounterScrollingLayer);
- scrollingStateTree().setHasChangedProperties(true);
-}
-
-PlatformLayer* ScrollingStateScrollingNode::headerPlatformLayer() const
-{
- return m_headerPlatformLayer.get();
-}
-
-void ScrollingStateScrollingNode::setHeaderLayer(GraphicsLayer* graphicsLayer)
-{
- PlatformLayer* platformHeaderLayer = graphicsLayer ? graphicsLayer->platformLayer() : nil;
- if (m_headerPlatformLayer == platformHeaderLayer)
- return;
-
- m_headerPlatformLayer = platformHeaderLayer;
- m_headerLayer = graphicsLayer;
-
- setPropertyChanged(HeaderLayer);
- scrollingStateTree().setHasChangedProperties(true);
-}
-
-PlatformLayer* ScrollingStateScrollingNode::footerPlatformLayer() const
-{
- return m_footerPlatformLayer.get();
-}
-
-void ScrollingStateScrollingNode::setFooterLayer(GraphicsLayer* graphicsLayer)
-{
- PlatformLayer* platformFooterLayer = graphicsLayer ? graphicsLayer->platformLayer() : nil;
- if (m_footerPlatformLayer == platformFooterLayer)
- return;
-
- m_footerPlatformLayer = platformFooterLayer;
- m_footerLayer = graphicsLayer;
-
- setPropertyChanged(FooterLayer);
- scrollingStateTree().setHasChangedProperties(true);
-}
-
void ScrollingStateScrollingNode::setScrollbarPaintersFromScrollbars(Scrollbar* verticalScrollbar, Scrollbar* horizontalScrollbar)
{
ScrollbarTheme* scrollbarTheme = ScrollbarTheme::theme();
Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.mm (161302 => 161303)
--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.mm 2014-01-04 02:01:19 UTC (rev 161302)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.mm 2014-01-04 02:04:34 UTC (rev 161303)
@@ -52,7 +52,7 @@
const ScrollingStateFixedNode& fixedStateNode = toScrollingStateFixedNode(stateNode);
if (fixedStateNode.hasChangedProperty(ScrollingStateNode::ScrollLayer))
- m_layer = fixedStateNode.platformScrollLayer();
+ m_layer = fixedStateNode.layer();
if (stateNode.hasChangedProperty(ScrollingStateFixedNode::ViewportConstraints))
m_constraints = fixedStateNode.viewportConstraints();
Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeMac.mm (161302 => 161303)
--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeMac.mm 2014-01-04 02:01:19 UTC (rev 161302)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeMac.mm 2014-01-04 02:04:34 UTC (rev 161303)
@@ -76,16 +76,16 @@
const auto& scrollingStateNode = toScrollingStateScrollingNode(stateNode);
if (scrollingStateNode.hasChangedProperty(ScrollingStateNode::ScrollLayer))
- m_scrollLayer = scrollingStateNode.platformScrollLayer();
+ m_scrollLayer = scrollingStateNode.layer();
if (scrollingStateNode.hasChangedProperty(ScrollingStateScrollingNode::CounterScrollingLayer))
- m_counterScrollingLayer = scrollingStateNode.counterScrollingPlatformLayer();
+ m_counterScrollingLayer = scrollingStateNode.counterScrollingLayer();
if (scrollingStateNode.hasChangedProperty(ScrollingStateScrollingNode::HeaderLayer))
- m_headerLayer = scrollingStateNode.headerPlatformLayer();
+ m_headerLayer = scrollingStateNode.headerLayer();
if (scrollingStateNode.hasChangedProperty(ScrollingStateScrollingNode::FooterLayer))
- m_footerLayer = scrollingStateNode.footerPlatformLayer();
+ m_footerLayer = scrollingStateNode.footerLayer();
if (scrollingStateNode.hasChangedProperty(ScrollingStateScrollingNode::PainterForScrollbar)) {
m_verticalScrollbarPainter = scrollingStateNode.verticalScrollbarPainter();
Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.mm (161302 => 161303)
--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.mm 2014-01-04 02:01:19 UTC (rev 161302)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.mm 2014-01-04 02:04:34 UTC (rev 161303)
@@ -52,7 +52,7 @@
const ScrollingStateStickyNode& stickyStateNode = toScrollingStateStickyNode(stateNode);
if (stickyStateNode.hasChangedProperty(ScrollingStateNode::ScrollLayer))
- m_layer = stickyStateNode.platformScrollLayer();
+ m_layer = stickyStateNode.layer();
if (stateNode.hasChangedProperty(ScrollingStateStickyNode::ViewportConstraints))
m_constraints = stickyStateNode.viewportConstraints();
