Update cc snapshot to r127918

webkit/compositor_bindings/WebLayerTreeViewImpl.cpp

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #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>
 #include <public/WebRenderingStats.h>
 #include <public/WebSize.h>
 
 using namespace WebCore;
 
 namespace WebKit {
 
@@ skipping 40 matching lines @@
 void WebLayerTreeViewImpl::setRootLayer(const WebLayer& root)
 {
     m_layerTreeHost->setRootLayer(static_cast<const WebLayerImpl*>(&root)->layer());
 }
 
 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())
         m_layerTreeHost->setViewportSize(layoutViewportSize, deviceViewportSize);
     else
         m_layerTreeHost->setViewportSize(layoutViewportSize, layoutViewportSize);
 }
 
 WebSize WebLayerTreeViewImpl::layoutViewportSize() const
 {
@@ skipping 132 matching lines @@
 PassOwnPtr<WebCompositorOutputSurface> WebLayerTreeViewImpl::createOutputSurface()
 {
     return adoptPtr(m_client->createOutputSurface());
 }
 
 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();
 }
 
 void WebLayerTreeViewImpl::didCommit()
 {
     m_client->didCommit();
 }
 
 void WebLayerTreeViewImpl::didCommitAndDrawFrame()
 {
     m_client->didCommitAndDrawFrame();
 }
 
 void WebLayerTreeViewImpl::didCompleteSwapBuffers()
 {
     m_client->didCompleteSwapBuffers();
 }
 
 void WebLayerTreeViewImpl::scheduleComposite()
 {
     m_client->scheduleComposite();
 }
 
 } // namespace WebKit