Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1607)

Unified Diff: webkit/compositor_bindings/WebLayerTreeViewImpl.cpp

Issue 10917153: Update cc snapshot to r127918 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webkit/compositor_bindings/WebLayerTreeViewImpl.cpp
diff --git a/webkit/compositor_bindings/WebLayerTreeViewImpl.cpp b/webkit/compositor_bindings/WebLayerTreeViewImpl.cpp
index 7bfcff168bda84e330418e4ce803925f59d97c58..d4f455d1ec411f450356bf40581915a66dcec134 100644
--- a/webkit/compositor_bindings/WebLayerTreeViewImpl.cpp
+++ b/webkit/compositor_bindings/WebLayerTreeViewImpl.cpp
@@ -6,10 +6,13 @@
#include "WebLayerTreeViewImpl.h"
#include "CCFontAtlas.h"
+#include "CCInputHandler.h"
#include "CCLayerTreeHost.h"
#include "LayerChromium.h"
#include "WebLayerImpl.h"
+#include "WebToCCInputHandlerAdapter.h"
#include <public/WebGraphicsContext3D.h>
+#include <public/WebInputHandler.h>
#include <public/WebLayer.h>
#include <public/WebLayerTreeView.h>
#include <public/WebLayerTreeViewClient.h>
@@ -70,11 +73,6 @@ void WebLayerTreeViewImpl::clearRootLayer()
m_layerTreeHost->setRootLayer(PassRefPtr<LayerChromium>());
}
-int WebLayerTreeViewImpl::compositorIdentifier()
-{
- return m_layerTreeHost->compositorIdentifier();
-}
-
void WebLayerTreeViewImpl::setViewportSize(const WebSize& layoutViewportSize, const WebSize& deviceViewportSize)
{
if (!deviceViewportSize.isEmpty())
@@ -227,6 +225,14 @@ void WebLayerTreeViewImpl::didRecreateOutputSurface(bool success)
m_client->didRecreateOutputSurface(success);
}
+PassOwnPtr<CCInputHandler> WebLayerTreeViewImpl::createInputHandler()
+{
+ OwnPtr<WebInputHandler> handler = adoptPtr(m_client->createInputHandler());
+ if (handler)
+ return WebToCCInputHandlerAdapter::create(handler.release());
+ return nullptr;
+}
+
void WebLayerTreeViewImpl::willCommit()
{
m_client->willCommit();
« no previous file with comments | « webkit/compositor_bindings/WebLayerTreeViewImpl.h ('k') | webkit/compositor_bindings/WebLayerTreeViewTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698