Index: webkit/compositor_bindings/web_to_ccinput_handler_adapter.cc |
diff --git a/webkit/compositor_bindings/web_to_ccinput_handler_adapter.cc b/webkit/compositor_bindings/web_to_ccinput_handler_adapter.cc |
index 581e515766522638c9f8317049c09bd6830a006b..d079a0b57e3b0dccb9d5084b243dd9725c229459 100644 |
--- a/webkit/compositor_bindings/web_to_ccinput_handler_adapter.cc |
+++ b/webkit/compositor_bindings/web_to_ccinput_handler_adapter.cc |
@@ -6,8 +6,9 @@ |
#include "third_party/WebKit/Source/Platform/chromium/public/WebInputHandlerClient.h" |
-#define COMPILE_ASSERT_MATCHING_ENUM(webkit_name, cc_name) \ |
- COMPILE_ASSERT(int(WebKit::webkit_name) == int(cc::cc_name), \ |
+#define COMPILE_ASSERT_MATCHING_ENUM(webkit_name, cc_name) \ |
+ COMPILE_ASSERT(static_cast<int>(WebKit::webkit_name) == \ |
+ static_cast<int>(cc::cc_name), \ |
mismatching_enums) |
COMPILE_ASSERT_MATCHING_ENUM(WebInputHandlerClient::ScrollStatusOnMainThread, |
@@ -37,7 +38,7 @@ WebToCCInputHandlerAdapter::~WebToCCInputHandlerAdapter() {} |
class WebToCCInputHandlerAdapter::ClientAdapter : public WebInputHandlerClient { |
public: |
- ClientAdapter(cc::InputHandlerClient* client) : client_(client) {} |
+ explicit ClientAdapter(cc::InputHandlerClient* client) : client_(client) {} |
virtual ~ClientAdapter() {} |