OLD | NEW |
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/build_info.h" | 9 #include "base/android/build_info.h" |
10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
(...skipping 1546 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1557 if (selection_controller_->WillHandleLongPressEvent( | 1557 if (selection_controller_->WillHandleLongPressEvent( |
1558 base::TimeTicks() + | 1558 base::TimeTicks() + |
1559 base::TimeDelta::FromSecondsD(input_event.timeStampSeconds), | 1559 base::TimeDelta::FromSecondsD(input_event.timeStampSeconds), |
1560 gfx::PointF(gesture_event.x, gesture_event.y))) { | 1560 gfx::PointF(gesture_event.x, gesture_event.y))) { |
1561 return INPUT_EVENT_ACK_STATE_CONSUMED; | 1561 return INPUT_EVENT_ACK_STATE_CONSUMED; |
1562 } | 1562 } |
1563 break; | 1563 break; |
1564 | 1564 |
1565 case blink::WebInputEvent::GestureTap: | 1565 case blink::WebInputEvent::GestureTap: |
1566 if (selection_controller_->WillHandleTapEvent( | 1566 if (selection_controller_->WillHandleTapEvent( |
1567 gfx::PointF(gesture_event.x, gesture_event.y))) { | 1567 gfx::PointF(gesture_event.x, gesture_event.y), |
| 1568 gesture_event.data.tap.tapCount)) { |
1568 return INPUT_EVENT_ACK_STATE_CONSUMED; | 1569 return INPUT_EVENT_ACK_STATE_CONSUMED; |
1569 } | 1570 } |
1570 break; | 1571 break; |
1571 | 1572 |
1572 default: | 1573 default: |
1573 break; | 1574 break; |
1574 } | 1575 } |
1575 } | 1576 } |
1576 | 1577 |
1577 if (overscroll_controller_ && | 1578 if (overscroll_controller_ && |
(...skipping 421 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1999 results->orientationAngle = display.RotationAsDegree(); | 2000 results->orientationAngle = display.RotationAsDegree(); |
2000 results->orientationType = | 2001 results->orientationType = |
2001 RenderWidgetHostViewBase::GetOrientationTypeForMobile(display); | 2002 RenderWidgetHostViewBase::GetOrientationTypeForMobile(display); |
2002 gfx::DeviceDisplayInfo info; | 2003 gfx::DeviceDisplayInfo info; |
2003 results->depth = info.GetBitsPerPixel(); | 2004 results->depth = info.GetBitsPerPixel(); |
2004 results->depthPerComponent = info.GetBitsPerComponent(); | 2005 results->depthPerComponent = info.GetBitsPerComponent(); |
2005 results->isMonochrome = (results->depthPerComponent == 0); | 2006 results->isMonochrome = (results->depthPerComponent == 0); |
2006 } | 2007 } |
2007 | 2008 |
2008 } // namespace content | 2009 } // namespace content |
OLD | NEW |