r148197 broke the GTK+ build
authormrobinson@webkit.org <mrobinson@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 12 Apr 2013 19:35:33 +0000 (19:35 +0000)
committermrobinson@webkit.org <mrobinson@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 12 Apr 2013 19:35:33 +0000 (19:35 +0000)
https://bugs.webkit.org/show_bug.cgi?id=114525

Reviewed by Anders Carlsson.

Re-add the ENABLE(SCROLLING_THREAD) guards to scrolling thread files
and extend them with USE(COORDINATED_GRAPHICS). This code is unused
by other configurations currently.

* page/scrolling/ScrollingStateFixedNode.cpp: Re-add guards.
* page/scrolling/ScrollingStateFixedNode.h: Ditto.
* page/scrolling/ScrollingStateNode.cpp: Ditto.
* page/scrolling/ScrollingStateNode.h: Ditto.
* page/scrolling/ScrollingStateScrollingNode.cpp: Ditto.
* page/scrolling/ScrollingStateScrollingNode.h: Ditto.
* page/scrolling/ScrollingStateStickyNode.cpp: Ditto.
* page/scrolling/ScrollingStateStickyNode.h: Ditto.
* page/scrolling/ScrollingStateTree.cpp: Ditto.
* page/scrolling/ScrollingStateTree.h: Ditto.
* page/scrolling/mac/ScrollingStateNodeMac.mm: Ditto.
* page/scrolling/mac/ScrollingStateScrollingNodeMac.mm: Ditto.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@148298 268f45cc-cd09-0410-ab3c-d52691b4dbfc

13 files changed:
Source/WebCore/ChangeLog
Source/WebCore/page/scrolling/ScrollingStateFixedNode.cpp
Source/WebCore/page/scrolling/ScrollingStateFixedNode.h
Source/WebCore/page/scrolling/ScrollingStateNode.cpp
Source/WebCore/page/scrolling/ScrollingStateNode.h
Source/WebCore/page/scrolling/ScrollingStateScrollingNode.cpp
Source/WebCore/page/scrolling/ScrollingStateScrollingNode.h
Source/WebCore/page/scrolling/ScrollingStateStickyNode.cpp
Source/WebCore/page/scrolling/ScrollingStateStickyNode.h
Source/WebCore/page/scrolling/ScrollingStateTree.cpp
Source/WebCore/page/scrolling/ScrollingStateTree.h
Source/WebCore/page/scrolling/mac/ScrollingStateNodeMac.mm
Source/WebCore/page/scrolling/mac/ScrollingStateScrollingNodeMac.mm

index 609ef37..5b4f8d9 100644 (file)
@@ -1,3 +1,27 @@
+2013-04-12  Martin Robinson  <mrobinson@igalia.com>
+
+        r148197 broke the GTK+ build
+        https://bugs.webkit.org/show_bug.cgi?id=114525
+
+        Reviewed by Anders Carlsson.
+
+        Re-add the ENABLE(SCROLLING_THREAD) guards to scrolling thread files
+        and extend them with USE(COORDINATED_GRAPHICS). This code is unused
+        by other configurations currently.
+
+        * page/scrolling/ScrollingStateFixedNode.cpp: Re-add guards.
+        * page/scrolling/ScrollingStateFixedNode.h: Ditto.
+        * page/scrolling/ScrollingStateNode.cpp: Ditto.
+        * page/scrolling/ScrollingStateNode.h: Ditto.
+        * page/scrolling/ScrollingStateScrollingNode.cpp: Ditto.
+        * page/scrolling/ScrollingStateScrollingNode.h: Ditto.
+        * page/scrolling/ScrollingStateStickyNode.cpp: Ditto.
+        * page/scrolling/ScrollingStateStickyNode.h: Ditto.
+        * page/scrolling/ScrollingStateTree.cpp: Ditto.
+        * page/scrolling/ScrollingStateTree.h: Ditto.
+        * page/scrolling/mac/ScrollingStateNodeMac.mm: Ditto.
+        * page/scrolling/mac/ScrollingStateScrollingNodeMac.mm: Ditto.
+
 2013-04-12  Jer Noble  <jer.noble@apple.com>
 
         (AVFoundation) WebKit fails to detect live stream.
index 775ab93..98b1d71 100644 (file)
@@ -31,6 +31,8 @@
 #include "TextStream.h"
 #include <wtf/OwnPtr.h>
 
+#if ENABLE(THREADED_SCROLLING) || USE(COORDINATED_GRAPHICS)
+
 namespace WebCore {
 
 PassOwnPtr<ScrollingStateFixedNode> ScrollingStateFixedNode::create(ScrollingStateTree* stateTree, ScrollingNodeID nodeID)
@@ -110,3 +112,5 @@ void ScrollingStateFixedNode::dumpProperties(TextStream& ts, int indent) const
 }
 
 } // namespace WebCore
+
+#endif // ENABLE(THREADED_SCROLLING) || USE(COORDINATED_GRAPHICS)
index ba01f56..84ae422 100644 (file)
@@ -26,6 +26,8 @@
 #ifndef ScrollingStateFixedNode_h
 #define ScrollingStateFixedNode_h
 
+#if ENABLE(THREADED_SCROLLING) || USE(COORDINATED_GRAPHICS)
+
 #include "ScrollingConstraints.h"
 #include "ScrollingStateNode.h"
 
@@ -74,4 +76,6 @@ void toScrollingStateFixedNode(const ScrollingStateFixedNode*);
 
 } // namespace WebCore
 
+#endif // ENABLE(THREADED_SCROLLING) || USE(COORDINATED_GRAPHICS)
+
 #endif // ScrollingStateFixedNode_h
index 636ea3a..6afe5b0 100644 (file)
@@ -26,6 +26,8 @@
 #include "config.h"
 #include "ScrollingStateNode.h"
 
+#if ENABLE(THREADED_SCROLLING) || USE(COORDINATED_GRAPHICS)
+
 #include "ScrollingStateFixedNode.h"
 #include "ScrollingStateTree.h"
 #include "TextStream.h"
@@ -145,3 +147,5 @@ String ScrollingStateNode::scrollingStateTreeAsText() const
 }
 
 } // namespace WebCore
+
+#endif // ENABLE(THREADED_SCROLLING) || USE(COORDINATED_GRAPHICS)
index 4868c9c..9800f30 100644 (file)
@@ -26,6 +26,8 @@
 #ifndef ScrollingStateNode_h
 #define ScrollingStateNode_h
 
+#if ENABLE(THREADED_SCROLLING) || USE(COORDINATED_GRAPHICS)
+
 #include "PlatformLayer.h"
 #include "ScrollingCoordinator.h"
 #include <wtf/OwnPtr.h>
@@ -115,4 +117,6 @@ private:
 
 } // namespace WebCore
 
+#endif // ENABLE(THREADED_SCROLLING) || USE(COORDINATED_GRAPHICS)
+
 #endif // ScrollingStateNode_h
index d0945fe..92f16b3 100644 (file)
@@ -26,6 +26,8 @@
 #include "config.h"
 #include "ScrollingStateScrollingNode.h"
 
+#if ENABLE(THREADED_SCROLLING) || USE(COORDINATED_GRAPHICS)
+
 #include "ScrollingStateTree.h"
 #include "TextStream.h"
 #include <wtf/OwnPtr.h>
@@ -282,3 +284,5 @@ void ScrollingStateScrollingNode::dumpProperties(TextStream& ts, int indent) con
 }
 
 } // namespace WebCore
+
+#endif // ENABLE(THREADED_SCROLLING) || USE(COORDINATED_GRAPHICS)
index e764872..84d0142 100644 (file)
@@ -26,6 +26,8 @@
 #ifndef ScrollingStateScrollingNode_h
 #define ScrollingStateScrollingNode_h
 
+#if ENABLE(THREADED_SCROLLING) || USE(COORDINATED_GRAPHICS)
+
 #include "IntRect.h"
 #include "Region.h"
 #include "ScrollTypes.h"
@@ -170,4 +172,6 @@ void toScrollingStateScrollingNode(const ScrollingStateScrollingNode*);
 
 } // namespace WebCore
 
+#endif // ENABLE(THREADED_SCROLLING) || USE(COORDINATED_GRAPHICS)
+
 #endif // ScrollingStateScrollingNode_h
index 83e1b73..4831e51 100644 (file)
@@ -26,6 +26,8 @@
 #include "config.h"
 #include "ScrollingStateStickyNode.h"
 
+#if ENABLE(THREADED_SCROLLING) || USE(COORDINATED_GRAPHICS)
+
 #include "GraphicsLayer.h"
 #include "ScrollingStateTree.h"
 #include "TextStream.h"
@@ -129,3 +131,5 @@ void ScrollingStateStickyNode::dumpProperties(TextStream& ts, int indent) const
 }
 
 } // namespace WebCore
+
+#endif // ENABLE(THREADED_SCROLLING) || USE(COORDINATED_GRAPHICS)
index f65378c..54a7daa 100644 (file)
@@ -26,6 +26,8 @@
 #ifndef ScrollingStateStickyNode_h
 #define ScrollingStateStickyNode_h
 
+#if ENABLE(THREADED_SCROLLING) || USE(COORDINATED_GRAPHICS)
+
 #include "ScrollingConstraints.h"
 #include "ScrollingStateNode.h"
 
@@ -74,4 +76,6 @@ void toScrollingStateStickyNode(const ScrollingStateStickyNode*);
 
 } // namespace WebCore
 
+#endif // ENABLE(THREADED_SCROLLING) || USE(COORDINATED_GRAPHICS)
+
 #endif // ScrollingStateStickyNode_h
index 110e5fb..9ed8819 100644 (file)
  */
  
 #include "config.h"
-
 #include "ScrollingStateTree.h"
 
+#if ENABLE(THREADED_SCROLLING) || USE(COORDINATED_GRAPHICS)
+
 #include "ScrollingStateFixedNode.h"
 #include "ScrollingStateScrollingNode.h"
 #include "ScrollingStateStickyNode.h"
@@ -179,3 +180,5 @@ ScrollingStateNode* ScrollingStateTree::stateNodeForID(ScrollingNodeID scrollLay
 }
 
 } // namespace WebCore
+
+#endif // ENABLE(THREADED_SCROLLING) || USE(COORDINATED_GRAPHICS)
index ed7b6e5..6075b28 100644 (file)
@@ -26,6 +26,8 @@
 #ifndef ScrollingStateTree_h
 #define ScrollingStateTree_h
 
+#if ENABLE(THREADED_SCROLLING) || USE(COORDINATED_GRAPHICS)
+
 #include "ScrollingStateScrollingNode.h"
 #include <wtf/OwnPtr.h>
 #include <wtf/PassOwnPtr.h>
@@ -77,4 +79,6 @@ private:
 
 } // namespace WebCore
 
+#endif // ENABLE(THREADED_SCROLLING) || USE(COORDINATED_GRAPHICS)
+
 #endif // ScrollingStateTree_h
index afda630..9e1b84b 100644 (file)
@@ -29,6 +29,8 @@
 #include "GraphicsLayer.h"
 #include "ScrollingStateTree.h"
 
+#if ENABLE(THREADED_SCROLLING)
+
 namespace WebCore {
 
 PlatformLayer* ScrollingStateNode::platformScrollLayer() const
@@ -56,3 +58,5 @@ void ScrollingStateNode::setScrollLayer(GraphicsLayer* graphicsLayer)
 }
 
 } // namespace WebCore
+
+#endif
index 705c81c..89fede9 100644 (file)
@@ -29,6 +29,8 @@
 #include "GraphicsLayer.h"
 #include "ScrollingStateTree.h"
 
+#if ENABLE(THREADED_SCROLLING)
+
 namespace WebCore {
 
 PlatformLayer* ScrollingStateScrollingNode::counterScrollingPlatformLayer() const
@@ -51,3 +53,5 @@ void ScrollingStateScrollingNode::setCounterScrollingLayer(GraphicsLayer* graphi
 }
 
 } // namespace WebCore
+
+#endif // ENABLE(THREADED_SCROLLING)