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

Unified Diff: webkit/compositor_bindings/WebToCCInputHandlerAdapter.cpp

Issue 11189043: cc: Rename cc classes and members to match filenames (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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/WebToCCInputHandlerAdapter.cpp
diff --git a/webkit/compositor_bindings/WebToCCInputHandlerAdapter.cpp b/webkit/compositor_bindings/WebToCCInputHandlerAdapter.cpp
index 32f44f83961b1c648f803cbead3a9859896f1602..c110981f3a7771eb492a3be348d4390f776506b7 100644
--- a/webkit/compositor_bindings/WebToCCInputHandlerAdapter.cpp
+++ b/webkit/compositor_bindings/WebToCCInputHandlerAdapter.cpp
@@ -14,11 +14,11 @@
#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);
-COMPILE_ASSERT_MATCHING_ENUM(WebInputHandlerClient::ScrollStatusIgnored, CCInputHandlerClient::ScrollIgnored);
-COMPILE_ASSERT_MATCHING_ENUM(WebInputHandlerClient::ScrollInputTypeGesture, CCInputHandlerClient::Gesture);
-COMPILE_ASSERT_MATCHING_ENUM(WebInputHandlerClient::ScrollInputTypeWheel, CCInputHandlerClient::Wheel);
+COMPILE_ASSERT_MATCHING_ENUM(WebInputHandlerClient::ScrollStatusOnMainThread, InputHandlerClient::ScrollOnMainThread);
+COMPILE_ASSERT_MATCHING_ENUM(WebInputHandlerClient::ScrollStatusStarted, InputHandlerClient::ScrollStarted);
+COMPILE_ASSERT_MATCHING_ENUM(WebInputHandlerClient::ScrollStatusIgnored, InputHandlerClient::ScrollIgnored);
+COMPILE_ASSERT_MATCHING_ENUM(WebInputHandlerClient::ScrollInputTypeGesture, InputHandlerClient::Gesture);
+COMPILE_ASSERT_MATCHING_ENUM(WebInputHandlerClient::ScrollInputTypeWheel, InputHandlerClient::Wheel);
namespace WebKit {
@@ -38,7 +38,7 @@ WebToCCInputHandlerAdapter::~WebToCCInputHandlerAdapter()
class WebToCCInputHandlerAdapter::ClientAdapter : public WebInputHandlerClient {
public:
- ClientAdapter(cc::CCInputHandlerClient* client)
+ ClientAdapter(cc::InputHandlerClient* 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<cc::CCInputHandlerClient::ScrollInputType>(type)));
+ return static_cast<WebInputHandlerClient::ScrollStatus>(m_client->scrollBegin(convert(point), static_cast<cc::InputHandlerClient::ScrollInputType>(type)));
}
virtual void scrollBy(WebPoint point, WebSize offset) OVERRIDE
@@ -92,11 +92,11 @@ public:
}
private:
- cc::CCInputHandlerClient* m_client;
+ cc::InputHandlerClient* m_client;
};
-void WebToCCInputHandlerAdapter::bindToClient(cc::CCInputHandlerClient* client)
+void WebToCCInputHandlerAdapter::bindToClient(cc::InputHandlerClient* client)
{
m_clientAdapter.reset(new ClientAdapter(client));
m_handler->bindToClient(m_clientAdapter.get());

Powered by Google App Engine
This is Rietveld 408576698