| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "base/bind_helpers.h" | 5 #include "base/bind_helpers.h" |
| 6 #include "base/command_line.h" | 6 #include "base/command_line.h" |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/message_loop/message_loop.h" | 8 #include "base/message_loop/message_loop.h" |
| 9 #include "content/browser/browser_plugin/browser_plugin_guest.h" | 9 #include "content/browser/browser_plugin/browser_plugin_guest.h" |
| 10 #include "content/browser/frame_host/render_widget_host_view_guest.h" | 10 #include "content/browser/frame_host/render_widget_host_view_guest.h" |
| (...skipping 19 matching lines...) Expand all Loading... |
| 30 | 30 |
| 31 namespace content { | 31 namespace content { |
| 32 | 32 |
| 33 namespace { | 33 namespace { |
| 34 | 34 |
| 35 #if defined(USE_AURA) | 35 #if defined(USE_AURA) |
| 36 blink::WebGestureEvent CreateFlingCancelEvent(double time_stamp) { | 36 blink::WebGestureEvent CreateFlingCancelEvent(double time_stamp) { |
| 37 blink::WebGestureEvent gesture_event; | 37 blink::WebGestureEvent gesture_event; |
| 38 gesture_event.timeStampSeconds = time_stamp; | 38 gesture_event.timeStampSeconds = time_stamp; |
| 39 gesture_event.type = blink::WebGestureEvent::GestureFlingCancel; | 39 gesture_event.type = blink::WebGestureEvent::GestureFlingCancel; |
| 40 gesture_event.sourceDevice = blink::WebGestureEvent::Touchscreen; | 40 gesture_event.sourceDevice = blink::WebGestureDeviceTouchscreen; |
| 41 return gesture_event; | 41 return gesture_event; |
| 42 } | 42 } |
| 43 #endif // defined(USE_AURA) | 43 #endif // defined(USE_AURA) |
| 44 | 44 |
| 45 } // namespace | 45 } // namespace |
| 46 | 46 |
| 47 RenderWidgetHostViewGuest::RenderWidgetHostViewGuest( | 47 RenderWidgetHostViewGuest::RenderWidgetHostViewGuest( |
| 48 RenderWidgetHost* widget_host, | 48 RenderWidgetHost* widget_host, |
| 49 BrowserPluginGuest* guest, | 49 BrowserPluginGuest* guest, |
| 50 RenderWidgetHostViewBase* platform_view) | 50 RenderWidgetHostViewBase* platform_view) |
| (...skipping 505 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 556 return SkBitmap::kARGB_8888_Config; | 556 return SkBitmap::kARGB_8888_Config; |
| 557 } | 557 } |
| 558 | 558 |
| 559 RenderWidgetHostViewBase* | 559 RenderWidgetHostViewBase* |
| 560 RenderWidgetHostViewGuest::GetGuestRenderWidgetHostView() const { | 560 RenderWidgetHostViewGuest::GetGuestRenderWidgetHostView() const { |
| 561 return static_cast<RenderWidgetHostViewBase*>( | 561 return static_cast<RenderWidgetHostViewBase*>( |
| 562 guest_->GetEmbedderRenderWidgetHostView()); | 562 guest_->GetEmbedderRenderWidgetHostView()); |
| 563 } | 563 } |
| 564 | 564 |
| 565 } // namespace content | 565 } // namespace content |
| OLD | NEW |