Diff
Modified: trunk/Source/WebKit2/ChangeLog (161528 => 161529)
--- trunk/Source/WebKit2/ChangeLog 2014-01-09 01:19:39 UTC (rev 161528)
+++ trunk/Source/WebKit2/ChangeLog 2014-01-09 01:25:52 UTC (rev 161529)
@@ -1,3 +1,22 @@
+2014-01-08 Simon Fraser <[email protected]>
+
+ Add ENABLE(ASYNC_SCROLLING) guards around WK2 scrolling files
+ https://bugs.webkit.org/show_bug.cgi?id=126672
+
+ Reviewed by Tim Horton.
+
+ Protected WK2 scrolling files with ENABLE(ASYNC_SCROLLING) guards.
+
+ * Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp:
+ * Shared/Scrolling/RemoteScrollingCoordinatorTransaction.h:
+ * UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.cpp:
+ * UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.h:
+ * UIProcess/Scrolling/RemoteScrollingTree.cpp:
+ * UIProcess/Scrolling/RemoteScrollingTree.h:
+ * WebProcess/Scrolling/RemoteScrollingCoordinator.h:
+ * WebProcess/Scrolling/RemoteScrollingCoordinator.messages.in:
+ * WebProcess/Scrolling/RemoteScrollingCoordinator.mm:
+
2014-01-08 Ryuan Choi <[email protected]>
[EFL][WK2] Add API to execute js script
Modified: trunk/Source/WebKit2/Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp (161528 => 161529)
--- trunk/Source/WebKit2/Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp 2014-01-09 01:19:39 UTC (rev 161528)
+++ trunk/Source/WebKit2/Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp 2014-01-09 01:25:52 UTC (rev 161529)
@@ -26,6 +26,8 @@
#include "config.h"
#include "RemoteScrollingCoordinatorTransaction.h"
+#if ENABLE(ASYNC_SCROLLING)
+
#include "ArgumentCoders.h"
#include "MessageDecoder.h"
#include "MessageEncoder.h"
@@ -301,3 +303,5 @@
}
} // namespace WebKit
+
+#endif // ENABLE(ASYNC_SCROLLING)
Modified: trunk/Source/WebKit2/Shared/Scrolling/RemoteScrollingCoordinatorTransaction.h (161528 => 161529)
--- trunk/Source/WebKit2/Shared/Scrolling/RemoteScrollingCoordinatorTransaction.h 2014-01-09 01:19:39 UTC (rev 161528)
+++ trunk/Source/WebKit2/Shared/Scrolling/RemoteScrollingCoordinatorTransaction.h 2014-01-09 01:25:52 UTC (rev 161529)
@@ -26,6 +26,8 @@
#ifndef RemoteScrollingCoordinatorTransaction_h
#define RemoteScrollingCoordinatorTransaction_h
+#if ENABLE(ASYNC_SCROLLING)
+
#include <WebCore/ScrollingStateTree.h>
#include <wtf/OwnPtr.h>
#include <wtf/PassOwnPtr.h>
@@ -53,4 +55,6 @@
} // namespace WebKit
+#endif // ENABLE(ASYNC_SCROLLING)
+
#endif // RemoteScrollingCoordinatorTransaction_h
Modified: trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.cpp (161528 => 161529)
--- trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.cpp 2014-01-09 01:19:39 UTC (rev 161528)
+++ trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.cpp 2014-01-09 01:25:52 UTC (rev 161529)
@@ -26,6 +26,8 @@
#include "config.h"
#include "RemoteScrollingCoordinatorProxy.h"
+#if ENABLE(ASYNC_SCROLLING)
+
#include "ArgumentCoders.h"
#include "MessageDecoder.h"
#include "MessageEncoder.h"
@@ -124,3 +126,5 @@
}
} // namespace WebKit
+
+#endif // ENABLE(ASYNC_SCROLLING)
Modified: trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.h (161528 => 161529)
--- trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.h 2014-01-09 01:19:39 UTC (rev 161528)
+++ trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.h 2014-01-09 01:25:52 UTC (rev 161529)
@@ -26,6 +26,8 @@
#ifndef RemoteScrollingCoordinatorProxy_h
#define RemoteScrollingCoordinatorProxy_h
+#if ENABLE(ASYNC_SCROLLING)
+
#include "MessageReceiver.h"
#include "RemoteScrollingCoordinator.h"
#include <wtf/Noncopyable.h>
@@ -70,4 +72,6 @@
} // namespace WebKit
+#endif // ENABLE(ASYNC_SCROLLING)
+
#endif // RemoteScrollingCoordinatorProxy_h
Modified: trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingTree.cpp (161528 => 161529)
--- trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingTree.cpp 2014-01-09 01:19:39 UTC (rev 161528)
+++ trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingTree.cpp 2014-01-09 01:25:52 UTC (rev 161529)
@@ -26,6 +26,8 @@
#include "config.h"
#include "RemoteScrollingTree.h"
+#if ENABLE(ASYNC_SCROLLING)
+
#include "RemoteLayerTreeHost.h"
#include "RemoteScrollingCoordinatorProxy.h"
#include <WebCore/ScrollingTreeFixedNode.h>
@@ -89,3 +91,5 @@
}
} // namespace WebKit
+
+#endif // ENABLE(ASYNC_SCROLLING)
Modified: trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingTree.h (161528 => 161529)
--- trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingTree.h 2014-01-09 01:19:39 UTC (rev 161528)
+++ trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingTree.h 2014-01-09 01:25:52 UTC (rev 161529)
@@ -26,6 +26,8 @@
#ifndef RemoteScrollingTree_h
#define RemoteScrollingTree_h
+#if ENABLE(ASYNC_SCROLLING)
+
#include "RemoteScrollingCoordinator.h"
#include <WebCore/ScrollElasticityController.h>
#include <WebCore/ScrollingConstraints.h>
@@ -62,4 +64,6 @@
} // namespace WebKit
+#endif // ENABLE(ASYNC_SCROLLING)
+
#endif // RemoteScrollingTree_h
Modified: trunk/Source/WebKit2/WebProcess/Scrolling/RemoteScrollingCoordinator.h (161528 => 161529)
--- trunk/Source/WebKit2/WebProcess/Scrolling/RemoteScrollingCoordinator.h 2014-01-09 01:19:39 UTC (rev 161528)
+++ trunk/Source/WebKit2/WebProcess/Scrolling/RemoteScrollingCoordinator.h 2014-01-09 01:25:52 UTC (rev 161529)
@@ -26,6 +26,8 @@
#ifndef RemoteScrollingCoordinator_h
#define RemoteScrollingCoordinator_h
+#if ENABLE(ASYNC_SCROLLING)
+
#include "MessageReceiver.h"
#include <WebCore/AsyncScrollingCoordinator.h>
#include <WebCore/ScrollTypes.h>
@@ -78,4 +80,6 @@
} // namespace WebKit
+#endif // ENABLE(ASYNC_SCROLLING)
+
#endif // RemoteScrollingCoordinator_h
Modified: trunk/Source/WebKit2/WebProcess/Scrolling/RemoteScrollingCoordinator.messages.in (161528 => 161529)
--- trunk/Source/WebKit2/WebProcess/Scrolling/RemoteScrollingCoordinator.messages.in 2014-01-09 01:19:39 UTC (rev 161528)
+++ trunk/Source/WebKit2/WebProcess/Scrolling/RemoteScrollingCoordinator.messages.in 2014-01-09 01:25:52 UTC (rev 161529)
@@ -20,6 +20,10 @@
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#if ENABLE(ASYNC_SCROLLING)
+
messages -> RemoteScrollingCoordinator {
ScrollPositionChangedForNode(uint64_t nodeID, WebCore::FloatPoint scrollPosition);
}
+
+#endif // ENABLE(ASYNC_SCROLLING)
Modified: trunk/Source/WebKit2/WebProcess/Scrolling/RemoteScrollingCoordinator.mm (161528 => 161529)
--- trunk/Source/WebKit2/WebProcess/Scrolling/RemoteScrollingCoordinator.mm 2014-01-09 01:19:39 UTC (rev 161528)
+++ trunk/Source/WebKit2/WebProcess/Scrolling/RemoteScrollingCoordinator.mm 2014-01-09 01:25:52 UTC (rev 161529)
@@ -26,6 +26,8 @@
#import "config.h"
#import "RemoteScrollingCoordinator.h"
+#if ENABLE(ASYNC_SCROLLING)
+
#import "ArgumentCoders.h"
#import "GraphicsLayerCARemote.h"
#import "MessageDecoder.h"
@@ -95,3 +97,5 @@
}
} // namespace WebKit
+
+#endif // ENABLE(ASYNC_SCROLLING)
