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

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_android.cc

Issue 15029006: Make it possible for the scroll offset delegate to intercept fling. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: reactivate the patch! Created 7 years, 4 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/renderer_host/render_widget_host_view_android.h" 5 #include "content/browser/renderer_host/render_widget_host_view_android.h"
6 6
7 #include <android/bitmap.h> 7 #include <android/bitmap.h>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 846 matching lines...) Expand 10 before | Expand all | Expand 10 after
857 void RenderWidgetHostViewAndroid::SetScrollOffsetPinning( 857 void RenderWidgetHostViewAndroid::SetScrollOffsetPinning(
858 bool is_pinned_to_left, bool is_pinned_to_right) { 858 bool is_pinned_to_left, bool is_pinned_to_right) {
859 // intentionally empty, like RenderWidgetHostViewViews 859 // intentionally empty, like RenderWidgetHostViewViews
860 } 860 }
861 861
862 void RenderWidgetHostViewAndroid::UnhandledWheelEvent( 862 void RenderWidgetHostViewAndroid::UnhandledWheelEvent(
863 const WebKit::WebMouseWheelEvent& event) { 863 const WebKit::WebMouseWheelEvent& event) {
864 // intentionally empty, like RenderWidgetHostViewViews 864 // intentionally empty, like RenderWidgetHostViewViews
865 } 865 }
866 866
867 void RenderWidgetHostViewAndroid::GestureEventAck(
868 int gesture_event_type,
869 InputEventAckState ack_result) {
870 if (gesture_event_type == WebKit::WebInputEvent::GestureFlingStart &&
871 ack_result == INPUT_EVENT_ACK_STATE_NO_CONSUMER_EXISTS) {
872 content_view_core_->UnhandledFlingStartEvent();
873 }
874 }
875
867 InputEventAckState RenderWidgetHostViewAndroid::FilterInputEvent( 876 InputEventAckState RenderWidgetHostViewAndroid::FilterInputEvent(
868 const WebKit::WebInputEvent& input_event) { 877 const WebKit::WebInputEvent& input_event) {
869 if (host_) { 878 if (host_) {
870 SynchronousCompositorImpl* compositor = 879 SynchronousCompositorImpl* compositor =
871 SynchronousCompositorImpl::FromID(host_->GetProcess()->GetID(), 880 SynchronousCompositorImpl::FromID(host_->GetProcess()->GetID(),
872 host_->GetRoutingID()); 881 host_->GetRoutingID());
873 if (compositor) 882 if (compositor)
874 return compositor->HandleInputEvent(input_event); 883 return compositor->HandleInputEvent(input_event);
875 } 884 }
876 return INPUT_EVENT_ACK_STATE_NOT_CONSUMED; 885 return INPUT_EVENT_ACK_STATE_NOT_CONSUMED;
(...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after
1134 // RenderWidgetHostView, public: 1143 // RenderWidgetHostView, public:
1135 1144
1136 // static 1145 // static
1137 RenderWidgetHostView* 1146 RenderWidgetHostView*
1138 RenderWidgetHostView::CreateViewForWidget(RenderWidgetHost* widget) { 1147 RenderWidgetHostView::CreateViewForWidget(RenderWidgetHost* widget) {
1139 RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(widget); 1148 RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(widget);
1140 return new RenderWidgetHostViewAndroid(rwhi, NULL); 1149 return new RenderWidgetHostViewAndroid(rwhi, NULL);
1141 } 1150 }
1142 1151
1143 } // namespace content 1152 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698