Diff
Modified: trunk/Source/WebCore/ChangeLog (148297 => 148298)
--- trunk/Source/WebCore/ChangeLog 2013-04-12 19:28:21 UTC (rev 148297)
+++ trunk/Source/WebCore/ChangeLog 2013-04-12 19:35:33 UTC (rev 148298)
@@ -1,3 +1,27 @@
+2013-04-12 Martin Robinson <mrobin...@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.no...@apple.com>
(AVFoundation) WebKit fails to detect live stream.
Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateFixedNode.cpp (148297 => 148298)
--- trunk/Source/WebCore/page/scrolling/ScrollingStateFixedNode.cpp 2013-04-12 19:28:21 UTC (rev 148297)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateFixedNode.cpp 2013-04-12 19:35:33 UTC (rev 148298)
@@ -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 @@
}
} // namespace WebCore
+
+#endif // ENABLE(THREADED_SCROLLING) || USE(COORDINATED_GRAPHICS)
Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateFixedNode.h (148297 => 148298)
--- trunk/Source/WebCore/page/scrolling/ScrollingStateFixedNode.h 2013-04-12 19:28:21 UTC (rev 148297)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateFixedNode.h 2013-04-12 19:35:33 UTC (rev 148298)
@@ -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 @@
} // namespace WebCore
+#endif // ENABLE(THREADED_SCROLLING) || USE(COORDINATED_GRAPHICS)
+
#endif // ScrollingStateFixedNode_h
Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateNode.cpp (148297 => 148298)
--- trunk/Source/WebCore/page/scrolling/ScrollingStateNode.cpp 2013-04-12 19:28:21 UTC (rev 148297)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateNode.cpp 2013-04-12 19:35:33 UTC (rev 148298)
@@ -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 @@
}
} // namespace WebCore
+
+#endif // ENABLE(THREADED_SCROLLING) || USE(COORDINATED_GRAPHICS)
Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateNode.h (148297 => 148298)
--- trunk/Source/WebCore/page/scrolling/ScrollingStateNode.h 2013-04-12 19:28:21 UTC (rev 148297)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateNode.h 2013-04-12 19:35:33 UTC (rev 148298)
@@ -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 @@
} // namespace WebCore
+#endif // ENABLE(THREADED_SCROLLING) || USE(COORDINATED_GRAPHICS)
+
#endif // ScrollingStateNode_h
Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.cpp (148297 => 148298)
--- trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.cpp 2013-04-12 19:28:21 UTC (rev 148297)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.cpp 2013-04-12 19:35:33 UTC (rev 148298)
@@ -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 @@
}
} // namespace WebCore
+
+#endif // ENABLE(THREADED_SCROLLING) || USE(COORDINATED_GRAPHICS)
Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.h (148297 => 148298)
--- trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.h 2013-04-12 19:28:21 UTC (rev 148297)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.h 2013-04-12 19:35:33 UTC (rev 148298)
@@ -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 @@
} // namespace WebCore
+#endif // ENABLE(THREADED_SCROLLING) || USE(COORDINATED_GRAPHICS)
+
#endif // ScrollingStateScrollingNode_h
Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateStickyNode.cpp (148297 => 148298)
--- trunk/Source/WebCore/page/scrolling/ScrollingStateStickyNode.cpp 2013-04-12 19:28:21 UTC (rev 148297)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateStickyNode.cpp 2013-04-12 19:35:33 UTC (rev 148298)
@@ -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 @@
}
} // namespace WebCore
+
+#endif // ENABLE(THREADED_SCROLLING) || USE(COORDINATED_GRAPHICS)
Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateStickyNode.h (148297 => 148298)
--- trunk/Source/WebCore/page/scrolling/ScrollingStateStickyNode.h 2013-04-12 19:28:21 UTC (rev 148297)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateStickyNode.h 2013-04-12 19:35:33 UTC (rev 148298)
@@ -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 @@
} // namespace WebCore
+#endif // ENABLE(THREADED_SCROLLING) || USE(COORDINATED_GRAPHICS)
+
#endif // ScrollingStateStickyNode_h
Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateTree.cpp (148297 => 148298)
--- trunk/Source/WebCore/page/scrolling/ScrollingStateTree.cpp 2013-04-12 19:28:21 UTC (rev 148297)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateTree.cpp 2013-04-12 19:35:33 UTC (rev 148298)
@@ -24,9 +24,10 @@
*/
#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 @@
}
} // namespace WebCore
+
+#endif // ENABLE(THREADED_SCROLLING) || USE(COORDINATED_GRAPHICS)
Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateTree.h (148297 => 148298)
--- trunk/Source/WebCore/page/scrolling/ScrollingStateTree.h 2013-04-12 19:28:21 UTC (rev 148297)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateTree.h 2013-04-12 19:35:33 UTC (rev 148298)
@@ -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 @@
} // namespace WebCore
+#endif // ENABLE(THREADED_SCROLLING) || USE(COORDINATED_GRAPHICS)
+
#endif // ScrollingStateTree_h
Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingStateNodeMac.mm (148297 => 148298)
--- trunk/Source/WebCore/page/scrolling/mac/ScrollingStateNodeMac.mm 2013-04-12 19:28:21 UTC (rev 148297)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingStateNodeMac.mm 2013-04-12 19:35:33 UTC (rev 148298)
@@ -29,6 +29,8 @@
#include "GraphicsLayer.h"
#include "ScrollingStateTree.h"
+#if ENABLE(THREADED_SCROLLING)
+
namespace WebCore {
PlatformLayer* ScrollingStateNode::platformScrollLayer() const
@@ -56,3 +58,5 @@
}
} // namespace WebCore
+
+#endif
Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingStateScrollingNodeMac.mm (148297 => 148298)
--- trunk/Source/WebCore/page/scrolling/mac/ScrollingStateScrollingNodeMac.mm 2013-04-12 19:28:21 UTC (rev 148297)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingStateScrollingNodeMac.mm 2013-04-12 19:35:33 UTC (rev 148298)
@@ -29,6 +29,8 @@
#include "GraphicsLayer.h"
#include "ScrollingStateTree.h"
+#if ENABLE(THREADED_SCROLLING)
+
namespace WebCore {
PlatformLayer* ScrollingStateScrollingNode::counterScrollingPlatformLayer() const
@@ -51,3 +53,5 @@
}
} // namespace WebCore
+
+#endif // ENABLE(THREADED_SCROLLING)
