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 1927 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1938 } | 1938 } |
1939 | 1939 |
1940 void RenderWidgetHostViewAura::GetScreenInfo(WebScreenInfo* results) { | 1940 void RenderWidgetHostViewAura::GetScreenInfo(WebScreenInfo* results) { |
1941 GetScreenInfoForWindow(results, window_->GetRootWindow() ? window_ : NULL); | 1941 GetScreenInfoForWindow(results, window_->GetRootWindow() ? window_ : NULL); |
1942 } | 1942 } |
1943 | 1943 |
1944 gfx::Rect RenderWidgetHostViewAura::GetBoundsInRootWindow() { | 1944 gfx::Rect RenderWidgetHostViewAura::GetBoundsInRootWindow() { |
1945 return window_->GetToplevelWindow()->GetBoundsInScreen(); | 1945 return window_->GetToplevelWindow()->GetBoundsInScreen(); |
1946 } | 1946 } |
1947 | 1947 |
1948 void RenderWidgetHostViewAura::GestureEventAck(int gesture_event_type) { | 1948 void RenderWidgetHostViewAura::GestureEventAck(int gesture_event_type, |
| 1949 InputEventAckState ack_result) { |
1949 if (touch_editing_client_) | 1950 if (touch_editing_client_) |
1950 touch_editing_client_->GestureEventAck(gesture_event_type); | 1951 touch_editing_client_->GestureEventAck(gesture_event_type); |
1951 } | 1952 } |
1952 | 1953 |
1953 void RenderWidgetHostViewAura::ProcessAckedTouchEvent( | 1954 void RenderWidgetHostViewAura::ProcessAckedTouchEvent( |
1954 const TouchEventWithLatencyInfo& touch, InputEventAckState ack_result) { | 1955 const TouchEventWithLatencyInfo& touch, InputEventAckState ack_result) { |
1955 ScopedVector<ui::TouchEvent> events; | 1956 ScopedVector<ui::TouchEvent> events; |
1956 if (!MakeUITouchEventsFromWebTouchEvents(touch, &events, | 1957 if (!MakeUITouchEventsFromWebTouchEvents(touch, &events, |
1957 SCREEN_COORDINATES)) | 1958 SCREEN_COORDINATES)) |
1958 return; | 1959 return; |
(...skipping 1212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3171 RenderWidgetHost* widget) { | 3172 RenderWidgetHost* widget) { |
3172 return new RenderWidgetHostViewAura(widget); | 3173 return new RenderWidgetHostViewAura(widget); |
3173 } | 3174 } |
3174 | 3175 |
3175 // static | 3176 // static |
3176 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) { | 3177 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) { |
3177 GetScreenInfoForWindow(results, NULL); | 3178 GetScreenInfoForWindow(results, NULL); |
3178 } | 3179 } |
3179 | 3180 |
3180 } // namespace content | 3181 } // namespace content |
OLD | NEW |