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/bind.h" | 7 #include "base/bind.h" |
8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/debug/trace_event.h" | 10 #include "base/debug/trace_event.h" |
(...skipping 1925 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1936 } | 1936 } |
1937 | 1937 |
1938 void RenderWidgetHostViewAura::GetScreenInfo(WebScreenInfo* results) { | 1938 void RenderWidgetHostViewAura::GetScreenInfo(WebScreenInfo* results) { |
1939 GetScreenInfoForWindow(results, window_->GetRootWindow() ? window_ : NULL); | 1939 GetScreenInfoForWindow(results, window_->GetRootWindow() ? window_ : NULL); |
1940 } | 1940 } |
1941 | 1941 |
1942 gfx::Rect RenderWidgetHostViewAura::GetBoundsInRootWindow() { | 1942 gfx::Rect RenderWidgetHostViewAura::GetBoundsInRootWindow() { |
1943 return window_->GetToplevelWindow()->GetBoundsInScreen(); | 1943 return window_->GetToplevelWindow()->GetBoundsInScreen(); |
1944 } | 1944 } |
1945 | 1945 |
1946 void RenderWidgetHostViewAura::GestureEventAck(int gesture_event_type) { | 1946 void RenderWidgetHostViewAura::GestureEventAck(int gesture_event_type, |
| 1947 InputEventAckState ack_result) { |
1947 if (touch_editing_client_) | 1948 if (touch_editing_client_) |
1948 touch_editing_client_->GestureEventAck(gesture_event_type); | 1949 touch_editing_client_->GestureEventAck(gesture_event_type); |
1949 } | 1950 } |
1950 | 1951 |
1951 void RenderWidgetHostViewAura::ProcessAckedTouchEvent( | 1952 void RenderWidgetHostViewAura::ProcessAckedTouchEvent( |
1952 const TouchEventWithLatencyInfo& touch, InputEventAckState ack_result) { | 1953 const TouchEventWithLatencyInfo& touch, InputEventAckState ack_result) { |
1953 ScopedVector<ui::TouchEvent> events; | 1954 ScopedVector<ui::TouchEvent> events; |
1954 if (!MakeUITouchEventsFromWebTouchEvents(touch, &events, | 1955 if (!MakeUITouchEventsFromWebTouchEvents(touch, &events, |
1955 SCREEN_COORDINATES)) | 1956 SCREEN_COORDINATES)) |
1956 return; | 1957 return; |
(...skipping 1211 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3168 RenderWidgetHost* widget) { | 3169 RenderWidgetHost* widget) { |
3169 return new RenderWidgetHostViewAura(widget); | 3170 return new RenderWidgetHostViewAura(widget); |
3170 } | 3171 } |
3171 | 3172 |
3172 // static | 3173 // static |
3173 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) { | 3174 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) { |
3174 GetScreenInfoForWindow(results, NULL); | 3175 GetScreenInfoForWindow(results, NULL); |
3175 } | 3176 } |
3176 | 3177 |
3177 } // namespace content | 3178 } // namespace content |
OLD | NEW |