Title: [161533] trunk/Source/WebKit2
- Revision
- 161533
- Author
- [email protected]
- Date
- 2014-01-08 18:12:17 -0800 (Wed, 08 Jan 2014)
Log Message
Make WK2 build when ENABLE(ASYNC_SCROLLING) is not defined
https://bugs.webkit.org/show_bug.cgi?id=126675
Reviewed by Tim Horton.
We need a stub RemoteScrollingCoordinatorTransaction outside
the #ifdef so that RemoteLayerTreeDrawingAreaProxy messages
work.
* Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp:
(WebKit::RemoteScrollingCoordinatorTransaction::encode):
(WebKit::RemoteScrollingCoordinatorTransaction::decode):
* Shared/Scrolling/RemoteScrollingCoordinatorTransaction.h:
* UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm:
(WebKit::RemoteLayerTreeDrawingAreaProxy::commitLayerTree):
* WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm:
(WebKit::RemoteLayerTreeDrawingArea::flushLayers):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (161532 => 161533)
--- trunk/Source/WebKit2/ChangeLog 2014-01-09 02:11:59 UTC (rev 161532)
+++ trunk/Source/WebKit2/ChangeLog 2014-01-09 02:12:17 UTC (rev 161533)
@@ -1,3 +1,23 @@
+2014-01-08 Simon Fraser <[email protected]>
+
+ Make WK2 build when ENABLE(ASYNC_SCROLLING) is not defined
+ https://bugs.webkit.org/show_bug.cgi?id=126675
+
+ Reviewed by Tim Horton.
+
+ We need a stub RemoteScrollingCoordinatorTransaction outside
+ the #ifdef so that RemoteLayerTreeDrawingAreaProxy messages
+ work.
+
+ * Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp:
+ (WebKit::RemoteScrollingCoordinatorTransaction::encode):
+ (WebKit::RemoteScrollingCoordinatorTransaction::decode):
+ * Shared/Scrolling/RemoteScrollingCoordinatorTransaction.h:
+ * UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm:
+ (WebKit::RemoteLayerTreeDrawingAreaProxy::commitLayerTree):
+ * WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm:
+ (WebKit::RemoteLayerTreeDrawingArea::flushLayers):
+
2014-01-08 Tim Horton <[email protected]>
TileController can fail to receive exposedRect from the drawing area if set at the wrong time
Modified: trunk/Source/WebKit2/Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp (161532 => 161533)
--- trunk/Source/WebKit2/Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp 2014-01-09 02:11:59 UTC (rev 161532)
+++ trunk/Source/WebKit2/Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp 2014-01-09 02:12:17 UTC (rev 161533)
@@ -26,8 +26,6 @@
#include "config.h"
#include "RemoteScrollingCoordinatorTransaction.h"
-#if ENABLE(ASYNC_SCROLLING)
-
#include "ArgumentCoders.h"
#include "MessageDecoder.h"
#include "MessageEncoder.h"
@@ -41,6 +39,8 @@
using namespace WebCore;
+#if ENABLE(ASYNC_SCROLLING)
+
namespace IPC {
template<> struct ArgumentCoder<ScrollingStateNode> {
@@ -304,4 +304,19 @@
} // namespace WebKit
+#else // !ENABLE(ASYNC_SCROLLING)
+
+namespace WebKit {
+
+void RemoteScrollingCoordinatorTransaction::encode(IPC::ArgumentEncoder&) const
+{
+}
+
+bool RemoteScrollingCoordinatorTransaction::decode(IPC::ArgumentDecoder& decoder, RemoteScrollingCoordinatorTransaction& transaction)
+{
+ return true;
+}
+
+} // namespace WebKit
+
#endif // ENABLE(ASYNC_SCROLLING)
Modified: trunk/Source/WebKit2/Shared/Scrolling/RemoteScrollingCoordinatorTransaction.h (161532 => 161533)
--- trunk/Source/WebKit2/Shared/Scrolling/RemoteScrollingCoordinatorTransaction.h 2014-01-09 02:11:59 UTC (rev 161532)
+++ trunk/Source/WebKit2/Shared/Scrolling/RemoteScrollingCoordinatorTransaction.h 2014-01-09 02:12:17 UTC (rev 161533)
@@ -26,8 +26,6 @@
#ifndef RemoteScrollingCoordinatorTransaction_h
#define RemoteScrollingCoordinatorTransaction_h
-#if ENABLE(ASYNC_SCROLLING)
-
#include <WebCore/ScrollingStateTree.h>
#include <wtf/OwnPtr.h>
#include <wtf/PassOwnPtr.h>
@@ -41,20 +39,23 @@
class RemoteScrollingCoordinatorTransaction {
public:
+
+#if ENABLE(ASYNC_SCROLLING)
void setStateTreeToEncode(PassOwnPtr<WebCore::ScrollingStateTree> stateTree) { m_scrollingStateTree = stateTree; }
OwnPtr<WebCore::ScrollingStateTree>& scrollingStateTree() { return m_scrollingStateTree; }
-
+#endif // ENABLE(ASYNC_SCROLLING)
+
void encode(IPC::ArgumentEncoder&) const;
static bool decode(IPC::ArgumentDecoder&, RemoteScrollingCoordinatorTransaction&);
private:
+#if ENABLE(ASYNC_SCROLLING)
bool decode(IPC::ArgumentDecoder&);
OwnPtr<WebCore::ScrollingStateTree> m_scrollingStateTree;
+#endif // ENABLE(ASYNC_SCROLLING)
};
} // namespace WebKit
-#endif // ENABLE(ASYNC_SCROLLING)
-
#endif // RemoteScrollingCoordinatorTransaction_h
Modified: trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm (161532 => 161533)
--- trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm 2014-01-09 02:11:59 UTC (rev 161532)
+++ trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm 2014-01-09 02:12:17 UTC (rev 161533)
@@ -86,7 +86,9 @@
void RemoteLayerTreeDrawingAreaProxy::commitLayerTree(const RemoteLayerTreeTransaction& layerTreeTransaction, const RemoteScrollingCoordinatorTransaction& scrollingTreeTransaction)
{
m_remoteLayerTreeHost.updateLayerTree(layerTreeTransaction);
+#if ENABLE(ASYNC_SCROLLING)
m_webPageProxy->scrollingCoordinatorProxy()->updateScrollingTree(scrollingTreeTransaction);
+#endif
}
} // namespace WebKit
Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm (161532 => 161533)
--- trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm 2014-01-09 02:11:59 UTC (rev 161532)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm 2014-01-09 02:12:17 UTC (rev 161533)
@@ -300,9 +300,11 @@
m_remoteLayerTreeContext->buildTransaction(layerTransaction, *m_rootLayer);
RemoteScrollingCoordinatorTransaction scrollingTransaction;
+#if ENABLE(ASYNC_SCROLLING)
if (m_webPage->scrollingCoordinator())
toRemoteScrollingCoordinator(m_webPage->scrollingCoordinator())->buildTransaction(scrollingTransaction);
-
+#endif
+
m_webPage->send(Messages::RemoteLayerTreeDrawingAreaProxy::CommitLayerTree(layerTransaction, scrollingTransaction));
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
