Title: [161305] trunk/Source/WebCore
- Revision
- 161305
- Author
- [email protected]
- Date
- 2014-01-03 19:41:25 -0800 (Fri, 03 Jan 2014)
Log Message
Try to fix CoordinatedGraphics build after r161303. Remove implementations
which are now in the cross-platform file.
* page/scrolling/coordinatedgraphics/ScrollingCoordinatorCoordinatedGraphics.cpp:
(WebCore::ScrollingCoordinatorCoordinatedGraphics::detachFromStateTree):
(WebCore::ScrollingCoordinatorCoordinatedGraphics::updateViewportConstrainedNode):
* page/scrolling/coordinatedgraphics/ScrollingStateNodeCoordinatedGraphics.cpp:
* page/scrolling/coordinatedgraphics/ScrollingStateScrollingNodeCoordinatedGraphics.cpp:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (161304 => 161305)
--- trunk/Source/WebCore/ChangeLog 2014-01-04 02:18:26 UTC (rev 161304)
+++ trunk/Source/WebCore/ChangeLog 2014-01-04 03:41:25 UTC (rev 161305)
@@ -1,5 +1,16 @@
2014-01-03 Simon Fraser <[email protected]>
+ Try to fix CoordinatedGraphics build after r161303. Remove implementations
+ which are now in the cross-platform file.
+
+ * page/scrolling/coordinatedgraphics/ScrollingCoordinatorCoordinatedGraphics.cpp:
+ (WebCore::ScrollingCoordinatorCoordinatedGraphics::detachFromStateTree):
+ (WebCore::ScrollingCoordinatorCoordinatedGraphics::updateViewportConstrainedNode):
+ * page/scrolling/coordinatedgraphics/ScrollingStateNodeCoordinatedGraphics.cpp:
+ * page/scrolling/coordinatedgraphics/ScrollingStateScrollingNodeCoordinatedGraphics.cpp:
+
+2014-01-03 Simon Fraser <[email protected]>
+
Simplify ScrollingStateNode references to various layer types
https://bugs.webkit.org/show_bug.cgi?id=126477
Modified: trunk/Source/WebCore/page/scrolling/coordinatedgraphics/ScrollingCoordinatorCoordinatedGraphics.cpp (161304 => 161305)
--- trunk/Source/WebCore/page/scrolling/coordinatedgraphics/ScrollingCoordinatorCoordinatedGraphics.cpp 2014-01-04 02:18:26 UTC (rev 161304)
+++ trunk/Source/WebCore/page/scrolling/coordinatedgraphics/ScrollingCoordinatorCoordinatedGraphics.cpp 2014-01-04 03:41:25 UTC (rev 161305)
@@ -62,7 +62,7 @@
{
ScrollingStateNode* node = m_scrollingStateTree->stateNodeForID(nodeID);
if (node && node->nodeType() == FixedNode)
- toCoordinatedGraphicsLayer(node->graphicsLayer())->setFixedToViewport(false);
+ toCoordinatedGraphicsLayer(node->layer())->setFixedToViewport(false);
m_scrollingStateTree->detachNode(nodeID);
}
@@ -84,7 +84,7 @@
case ViewportConstraints::FixedPositionConstraint: {
toCoordinatedGraphicsLayer(graphicsLayer)->setFixedToViewport(true); // FIXME : Use constraints!
ScrollingStateFixedNode* fixedNode = toScrollingStateFixedNode(node);
- fixedNode->setScrollLayer(graphicsLayer);
+ fixedNode->setLayer(graphicsLayer);
break;
}
case ViewportConstraints::StickyPositionConstraint:
Modified: trunk/Source/WebCore/page/scrolling/coordinatedgraphics/ScrollingStateNodeCoordinatedGraphics.cpp (161304 => 161305)
--- trunk/Source/WebCore/page/scrolling/coordinatedgraphics/ScrollingStateNodeCoordinatedGraphics.cpp 2014-01-04 02:18:26 UTC (rev 161304)
+++ trunk/Source/WebCore/page/scrolling/coordinatedgraphics/ScrollingStateNodeCoordinatedGraphics.cpp 2014-01-04 03:41:25 UTC (rev 161305)
@@ -34,22 +34,6 @@
namespace WebCore {
-PlatformLayer* ScrollingStateNode::platformScrollLayer() const
-{
- notImplemented();
- return 0;
-}
-
-void ScrollingStateNode::setScrollPlatformLayer(PlatformLayer*)
-{
- notImplemented();
-}
-
-void ScrollingStateNode::setScrollLayer(GraphicsLayer* graphicsLayer)
-{
- m_graphicsLayer = graphicsLayer;
-}
-
} // namespace WebCore
#endif // USE(COORDINATED_GRAPHICS)
Modified: trunk/Source/WebCore/page/scrolling/coordinatedgraphics/ScrollingStateScrollingNodeCoordinatedGraphics.cpp (161304 => 161305)
--- trunk/Source/WebCore/page/scrolling/coordinatedgraphics/ScrollingStateScrollingNodeCoordinatedGraphics.cpp 2014-01-04 02:18:26 UTC (rev 161304)
+++ trunk/Source/WebCore/page/scrolling/coordinatedgraphics/ScrollingStateScrollingNodeCoordinatedGraphics.cpp 2014-01-04 03:41:25 UTC (rev 161305)
@@ -32,39 +32,6 @@
namespace WebCore {
-PlatformLayer* ScrollingStateScrollingNode::counterScrollingPlatformLayer() const
-{
- ASSERT_NOT_REACHED(); // ScrollingStateTree in coord graphics is used only to handle constrained elements.
- return 0;
-}
-
-void ScrollingStateScrollingNode::setCounterScrollingLayer(GraphicsLayer*)
-{
- ASSERT_NOT_REACHED(); // ScrollingStateTree in coord graphics is used only to handle constrained elements.
-}
-
-PlatformLayer* ScrollingStateScrollingNode::headerPlatformLayer() const
-{
- ASSERT_NOT_REACHED(); // ScrollingStateTree in coord graphics is used only to handle constrained elements.
- return 0;
-}
-
-void ScrollingStateScrollingNode::setHeaderLayer(GraphicsLayer*)
-{
- ASSERT_NOT_REACHED(); // ScrollingStateTree in coord graphics is used only to handle constrained elements.
-}
-
-PlatformLayer* ScrollingStateScrollingNode::footerPlatformLayer() const
-{
- ASSERT_NOT_REACHED(); // ScrollingStateTree in coord graphics is used only to handle constrained elements.
- return 0;
-}
-
-void ScrollingStateScrollingNode::setFooterLayer(GraphicsLayer*)
-{
- ASSERT_NOT_REACHED(); // ScrollingStateTree in coord graphics is used only to handle constrained elements.
-}
-
} // namespace WebCore
#endif // USE(COORDINATED_GRAPHICS)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
