| 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_aura.h" | 5 #include "content/browser/renderer_host/render_widget_host_view_aura.h" |
| 6 | 6 |
| 7 #include "base/auto_reset.h" | 7 #include "base/auto_reset.h" |
| 8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/callback_helpers.h" | 10 #include "base/callback_helpers.h" |
| (...skipping 2096 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2107 rect.Inset(GetSystemMetrics(SM_CXSIZEFRAME), | 2107 rect.Inset(GetSystemMetrics(SM_CXSIZEFRAME), |
| 2108 GetSystemMetrics(SM_CYSIZEFRAME)); | 2108 GetSystemMetrics(SM_CYSIZEFRAME)); |
| 2109 } | 2109 } |
| 2110 | 2110 |
| 2111 return gfx::win::ScreenToDIPRect(rect); | 2111 return gfx::win::ScreenToDIPRect(rect); |
| 2112 #else | 2112 #else |
| 2113 return window_->GetToplevelWindow()->GetBoundsInScreen(); | 2113 return window_->GetToplevelWindow()->GetBoundsInScreen(); |
| 2114 #endif | 2114 #endif |
| 2115 } | 2115 } |
| 2116 | 2116 |
| 2117 void RenderWidgetHostViewAura::GestureEventAck(int gesture_event_type, | 2117 void RenderWidgetHostViewAura::GestureEventAck( |
| 2118 InputEventAckState ack_result) { | 2118 const blink::WebGestureEvent& event, |
| 2119 InputEventAckState ack_result) { |
| 2119 if (touch_editing_client_) | 2120 if (touch_editing_client_) |
| 2120 touch_editing_client_->GestureEventAck(gesture_event_type); | 2121 touch_editing_client_->GestureEventAck(event.type); |
| 2121 } | 2122 } |
| 2122 | 2123 |
| 2123 void RenderWidgetHostViewAura::ProcessAckedTouchEvent( | 2124 void RenderWidgetHostViewAura::ProcessAckedTouchEvent( |
| 2124 const TouchEventWithLatencyInfo& touch, InputEventAckState ack_result) { | 2125 const TouchEventWithLatencyInfo& touch, InputEventAckState ack_result) { |
| 2125 ScopedVector<ui::TouchEvent> events; | 2126 ScopedVector<ui::TouchEvent> events; |
| 2126 if (!MakeUITouchEventsFromWebTouchEvents(touch, &events, | 2127 if (!MakeUITouchEventsFromWebTouchEvents(touch, &events, |
| 2127 SCREEN_COORDINATES)) | 2128 SCREEN_COORDINATES)) |
| 2128 return; | 2129 return; |
| 2129 | 2130 |
| 2130 aura::WindowEventDispatcher* dispatcher = window_->GetDispatcher(); | 2131 aura::WindowEventDispatcher* dispatcher = window_->GetDispatcher(); |
| (...skipping 1412 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3543 RenderWidgetHost* widget) { | 3544 RenderWidgetHost* widget) { |
| 3544 return new RenderWidgetHostViewAura(widget); | 3545 return new RenderWidgetHostViewAura(widget); |
| 3545 } | 3546 } |
| 3546 | 3547 |
| 3547 // static | 3548 // static |
| 3548 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) { | 3549 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) { |
| 3549 GetScreenInfoForWindow(results, NULL); | 3550 GetScreenInfoForWindow(results, NULL); |
| 3550 } | 3551 } |
| 3551 | 3552 |
| 3552 } // namespace content | 3553 } // namespace content |
| OLD | NEW |