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

Unified Diff: webkit/compositor_bindings/WebToCCInputHandlerAdapter.cpp

Issue 10914268: Change cc files from namespace WebCore to cc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased 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/WebToCCInputHandlerAdapter.cpp
diff --git a/webkit/compositor_bindings/WebToCCInputHandlerAdapter.cpp b/webkit/compositor_bindings/WebToCCInputHandlerAdapter.cpp
index 895fee5d494184e58e0a5502188cc538e2cf7aa0..89fb5cad98137568c45f00d2d4726adaf6899343 100644
--- a/webkit/compositor_bindings/WebToCCInputHandlerAdapter.cpp
+++ b/webkit/compositor_bindings/WebToCCInputHandlerAdapter.cpp
@@ -11,8 +11,8 @@
#include "webcore_convert.h"
#include <public/WebInputHandlerClient.h>
-#define COMPILE_ASSERT_MATCHING_ENUM(webkit_name, webcore_name) \
- COMPILE_ASSERT(int(WebKit::webkit_name) == int(WebCore::webcore_name), mismatching_enums)
+#define COMPILE_ASSERT_MATCHING_ENUM(webkit_name, cc_name) \
+ COMPILE_ASSERT(int(WebKit::webkit_name) == int(cc::cc_name), mismatching_enums)
COMPILE_ASSERT_MATCHING_ENUM(WebInputHandlerClient::ScrollStatusOnMainThread, CCInputHandlerClient::ScrollOnMainThread);
COMPILE_ASSERT_MATCHING_ENUM(WebInputHandlerClient::ScrollStatusStarted, CCInputHandlerClient::ScrollStarted);
@@ -38,7 +38,7 @@ WebToCCInputHandlerAdapter::~WebToCCInputHandlerAdapter()
class WebToCCInputHandlerAdapter::ClientAdapter : public WebInputHandlerClient {
public:
- ClientAdapter(WebCore::CCInputHandlerClient* client)
+ ClientAdapter(cc::CCInputHandlerClient* client)
: m_client(client)
{
}
@@ -49,7 +49,7 @@ public:
virtual ScrollStatus scrollBegin(WebPoint point, ScrollInputType type) OVERRIDE
{
- return static_cast<WebInputHandlerClient::ScrollStatus>(m_client->scrollBegin(convert(point), static_cast<WebCore::CCInputHandlerClient::ScrollInputType>(type)));
+ return static_cast<WebInputHandlerClient::ScrollStatus>(m_client->scrollBegin(convert(point), static_cast<cc::CCInputHandlerClient::ScrollInputType>(type)));
}
virtual void scrollBy(WebPoint point, WebSize offset) OVERRIDE
@@ -92,11 +92,11 @@ public:
}
private:
- WebCore::CCInputHandlerClient* m_client;
+ cc::CCInputHandlerClient* m_client;
};
-void WebToCCInputHandlerAdapter::bindToClient(WebCore::CCInputHandlerClient* client)
+void WebToCCInputHandlerAdapter::bindToClient(cc::CCInputHandlerClient* client)
{
m_clientAdapter = adoptPtr(new ClientAdapter(client));
m_handler->bindToClient(m_clientAdapter.get());
@@ -108,4 +108,3 @@ void WebToCCInputHandlerAdapter::animate(double monotonicTime)
}
}
-
« no previous file with comments | « webkit/compositor_bindings/WebToCCInputHandlerAdapter.h ('k') | webkit/compositor_bindings/WebTransformAnimationCurveImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698