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

Unified Diff: webkit/compositor_bindings/web_to_ccinput_handler_adapter.cc

Issue 12481008: Remove cross-repo OVERRIDE annotations and IWYU-ify comp bindings (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix forward decl in web_float_animation_curve_impl.h Created 7 years, 10 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/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 ee8e0c95fc110596a3577891334dd2df26d3fd3a..767c911a8deb9431221343369dd8619ad34a2939 100644
--- a/webkit/compositor_bindings/web_to_ccinput_handler_adapter.cc
+++ b/webkit/compositor_bindings/web_to_ccinput_handler_adapter.cc
@@ -41,33 +41,31 @@ class WebToCCInputHandlerAdapter::ClientAdapter : public WebInputHandlerClient {
virtual ~ClientAdapter() {}
- virtual ScrollStatus scrollBegin(WebPoint point, ScrollInputType type)
- OVERRIDE {
+ virtual ScrollStatus scrollBegin(WebPoint point, ScrollInputType type) {
return static_cast<WebInputHandlerClient::ScrollStatus>(
client_->scrollBegin(
point, static_cast<cc::InputHandlerClient::ScrollInputType>(type)));
}
- virtual bool scrollByIfPossible(WebPoint point, WebSize offset) OVERRIDE {
+ virtual bool scrollByIfPossible(WebPoint point, WebSize offset) {
return client_->scrollBy(point, offset);
}
- virtual void scrollEnd() OVERRIDE { client_->scrollEnd(); }
+ virtual void scrollEnd() { client_->scrollEnd(); }
- virtual void pinchGestureBegin() OVERRIDE { client_->pinchGestureBegin(); }
+ virtual void pinchGestureBegin() { client_->pinchGestureBegin(); }
- virtual void pinchGestureUpdate(float magnify_delta, WebPoint anchor)
- OVERRIDE {
+ virtual void pinchGestureUpdate(float magnify_delta, WebPoint anchor) {
client_->pinchGestureUpdate(magnify_delta, anchor);
}
- virtual void pinchGestureEnd() OVERRIDE { client_->pinchGestureEnd(); }
+ virtual void pinchGestureEnd() { client_->pinchGestureEnd(); }
virtual void startPageScaleAnimation(WebSize target_position,
bool anchor_point,
float page_scale,
double start_time_sec,
- double duration_sec) OVERRIDE {
+ double duration_sec) {
base::TimeTicks start_time = base::TimeTicks::FromInternalValue(
start_time_sec * base::Time::kMicrosecondsPerSecond);
base::TimeDelta duration = base::TimeDelta::FromMicroseconds(
@@ -76,7 +74,7 @@ class WebToCCInputHandlerAdapter::ClientAdapter : public WebInputHandlerClient {
target_position, anchor_point, page_scale, start_time, duration);
}
- virtual void scheduleAnimation() OVERRIDE { client_->scheduleAnimation(); }
+ virtual void scheduleAnimation() { client_->scheduleAnimation(); }
virtual bool haveTouchEventHandlersAt(WebPoint point) {
return client_->haveTouchEventHandlersAt(point);

Powered by Google App Engine
This is Rietveld 408576698