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

Unified Diff: webkit/compositor_bindings/WebLayerTreeViewImpl.cpp

Issue 11142031: Remove WTF dependencies from webkit_compositor_bindings (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 8 years, 2 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 c7b4d317882aa43ad7a353d4ba6a3dafefcefafd..f621a864a6eaeba69ae0c5454a520c03683eff9c 100644
--- a/webkit/compositor_bindings/WebLayerTreeViewImpl.cpp
+++ b/webkit/compositor_bindings/WebLayerTreeViewImpl.cpp
@@ -5,20 +5,20 @@
#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 "cc/font_atlas.h"
+#include "cc/input_handler.h"
+#include "cc/layer.h"
+#include "cc/layer_tree_host.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebInputHandler.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebLayer.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebLayerTreeView.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebLayerTreeViewClient.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebRenderingStats.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h"
#include "webcore_convert.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 cc;
@@ -233,9 +233,9 @@ void WebLayerTreeViewImpl::didRecreateOutputSurface(bool success)
scoped_ptr<CCInputHandler> WebLayerTreeViewImpl::createInputHandler()
{
scoped_ptr<CCInputHandler> ret;
- OwnPtr<WebInputHandler> handler = adoptPtr(m_client->createInputHandler());
+ scoped_ptr<WebInputHandler> handler(m_client->createInputHandler());
if (handler)
- ret = WebToCCInputHandlerAdapter::create(handler.release());
+ ret = WebToCCInputHandlerAdapter::create(handler.Pass());
return ret.Pass();
}
« 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