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

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

Issue 300863002: mac: History swiping doesn't work right with iframes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix unit tests. Created 6 years, 6 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
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/android/sys_utils.h" 9 #include "base/android/sys_utils.h"
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 1079 matching lines...) Expand 10 before | Expand all | Expand 10 after
1090 const TouchEventWithLatencyInfo& touch, InputEventAckState ack_result) { 1090 const TouchEventWithLatencyInfo& touch, InputEventAckState ack_result) {
1091 const bool event_consumed = ack_result == INPUT_EVENT_ACK_STATE_CONSUMED; 1091 const bool event_consumed = ack_result == INPUT_EVENT_ACK_STATE_CONSUMED;
1092 gesture_provider_.OnTouchEventAck(event_consumed); 1092 gesture_provider_.OnTouchEventAck(event_consumed);
1093 } 1093 }
1094 1094
1095 void RenderWidgetHostViewAndroid::SetScrollOffsetPinning( 1095 void RenderWidgetHostViewAndroid::SetScrollOffsetPinning(
1096 bool is_pinned_to_left, bool is_pinned_to_right) { 1096 bool is_pinned_to_left, bool is_pinned_to_right) {
1097 // intentionally empty, like RenderWidgetHostViewViews 1097 // intentionally empty, like RenderWidgetHostViewViews
1098 } 1098 }
1099 1099
1100 void RenderWidgetHostViewAndroid::UnhandledWheelEvent( 1100 void RenderWidgetHostViewAndroid::ProcessedWheelEvent(
1101 const blink::WebMouseWheelEvent& event) { 1101 const blink::WebMouseWheelEvent& event,
1102 bool consumed) {
1102 // intentionally empty, like RenderWidgetHostViewViews 1103 // intentionally empty, like RenderWidgetHostViewViews
1103 } 1104 }
1104 1105
1105 void RenderWidgetHostViewAndroid::GestureEventAck( 1106 void RenderWidgetHostViewAndroid::GestureEventAck(
1106 const blink::WebGestureEvent& event, 1107 const blink::WebGestureEvent& event,
1107 InputEventAckState ack_result) { 1108 InputEventAckState ack_result) {
1108 if (content_view_core_) 1109 if (content_view_core_)
1109 content_view_core_->OnGestureEventAck(event, ack_result); 1110 content_view_core_->OnGestureEventAck(event, ack_result);
1110 } 1111 }
1111 1112
(...skipping 340 matching lines...) Expand 10 before | Expand all | Expand 10 after
1452 results->availableRect = display.work_area(); 1453 results->availableRect = display.work_area();
1453 results->deviceScaleFactor = display.device_scale_factor(); 1454 results->deviceScaleFactor = display.device_scale_factor();
1454 results->orientationAngle = display.RotationAsDegree(); 1455 results->orientationAngle = display.RotationAsDegree();
1455 gfx::DeviceDisplayInfo info; 1456 gfx::DeviceDisplayInfo info;
1456 results->depth = info.GetBitsPerPixel(); 1457 results->depth = info.GetBitsPerPixel();
1457 results->depthPerComponent = info.GetBitsPerComponent(); 1458 results->depthPerComponent = info.GetBitsPerComponent();
1458 results->isMonochrome = (results->depthPerComponent == 0); 1459 results->isMonochrome = (results->depthPerComponent == 0);
1459 } 1460 }
1460 1461
1461 } // namespace content 1462 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698