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 2159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2170 } | 2170 } |
2171 | 2171 |
2172 void RenderWidgetHostViewAura::ProcessAckedTouchEvent( | 2172 void RenderWidgetHostViewAura::ProcessAckedTouchEvent( |
2173 const TouchEventWithLatencyInfo& touch, InputEventAckState ack_result) { | 2173 const TouchEventWithLatencyInfo& touch, InputEventAckState ack_result) { |
2174 ScopedVector<ui::TouchEvent> events; | 2174 ScopedVector<ui::TouchEvent> events; |
2175 if (!MakeUITouchEventsFromWebTouchEvents(touch, &events, | 2175 if (!MakeUITouchEventsFromWebTouchEvents(touch, &events, |
2176 SCREEN_COORDINATES)) | 2176 SCREEN_COORDINATES)) |
2177 return; | 2177 return; |
2178 | 2178 |
2179 aura::WindowTreeHost* host = window_->GetHost(); | 2179 aura::WindowTreeHost* host = window_->GetHost(); |
2180 // |dispatcher| is NULL during tests. | 2180 // |host| is NULL during tests. |
2181 if (!host) | 2181 if (!host) |
2182 return; | 2182 return; |
2183 | 2183 |
2184 ui::EventResult result = (ack_result == | 2184 ui::EventResult result = (ack_result == |
2185 INPUT_EVENT_ACK_STATE_CONSUMED) ? ui::ER_HANDLED : ui::ER_UNHANDLED; | 2185 INPUT_EVENT_ACK_STATE_CONSUMED) ? ui::ER_HANDLED : ui::ER_UNHANDLED; |
2186 for (ScopedVector<ui::TouchEvent>::iterator iter = events.begin(), | 2186 for (ScopedVector<ui::TouchEvent>::iterator iter = events.begin(), |
2187 end = events.end(); iter != end; ++iter) { | 2187 end = events.end(); iter != end; ++iter) { |
2188 host->dispatcher()->ProcessedTouchEvent((*iter), window_, result); | 2188 host->dispatcher()->ProcessedTouchEvent((*iter), window_, result); |
2189 } | 2189 } |
2190 } | 2190 } |
(...skipping 1404 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3595 RenderWidgetHost* widget) { | 3595 RenderWidgetHost* widget) { |
3596 return new RenderWidgetHostViewAura(widget); | 3596 return new RenderWidgetHostViewAura(widget); |
3597 } | 3597 } |
3598 | 3598 |
3599 // static | 3599 // static |
3600 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) { | 3600 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) { |
3601 GetScreenInfoForWindow(results, NULL); | 3601 GetScreenInfoForWindow(results, NULL); |
3602 } | 3602 } |
3603 | 3603 |
3604 } // namespace content | 3604 } // namespace content |
OLD | NEW |