| 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 <set> | 7 #include <set> |
| 8 | 8 |
| 9 #include "base/auto_reset.h" | 9 #include "base/auto_reset.h" |
| 10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
| (...skipping 1331 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1342 } | 1342 } |
| 1343 | 1343 |
| 1344 BrowserAccessibilityManager* | 1344 BrowserAccessibilityManager* |
| 1345 RenderWidgetHostViewAura::CreateBrowserAccessibilityManager( | 1345 RenderWidgetHostViewAura::CreateBrowserAccessibilityManager( |
| 1346 BrowserAccessibilityDelegate* delegate) { | 1346 BrowserAccessibilityDelegate* delegate) { |
| 1347 BrowserAccessibilityManager* manager = NULL; | 1347 BrowserAccessibilityManager* manager = NULL; |
| 1348 #if defined(OS_WIN) | 1348 #if defined(OS_WIN) |
| 1349 manager = new BrowserAccessibilityManagerWin( | 1349 manager = new BrowserAccessibilityManagerWin( |
| 1350 BrowserAccessibilityManagerWin::GetEmptyDocument(), delegate); | 1350 BrowserAccessibilityManagerWin::GetEmptyDocument(), delegate); |
| 1351 #else | 1351 #else |
| 1352 manager = BrowserAccessibilityManager::Create( | 1352 manager = nullptr; |
| 1353 BrowserAccessibilityManager::GetEmptyDocument(), delegate); | 1353 // manager = BrowserAccessibilityManager::Create( |
| 1354 // BrowserAccessibilityManager::GetEmptyDocument(), delegate); |
| 1354 #endif | 1355 #endif |
| 1355 return manager; | 1356 return manager; |
| 1356 } | 1357 } |
| 1357 | 1358 |
| 1358 gfx::AcceleratedWidget | 1359 gfx::AcceleratedWidget |
| 1359 RenderWidgetHostViewAura::AccessibilityGetAcceleratedWidget() { | 1360 RenderWidgetHostViewAura::AccessibilityGetAcceleratedWidget() { |
| 1360 #if defined(OS_WIN) | 1361 #if defined(OS_WIN) |
| 1361 if (legacy_render_widget_host_HWND_) | 1362 if (legacy_render_widget_host_HWND_) |
| 1362 return legacy_render_widget_host_HWND_->hwnd(); | 1363 return legacy_render_widget_host_HWND_->hwnd(); |
| 1363 #endif | 1364 #endif |
| (...skipping 790 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2154 blink::WebGestureEvent gesture_event = MakeWebGestureEvent(*event); | 2155 blink::WebGestureEvent gesture_event = MakeWebGestureEvent(*event); |
| 2155 host_->ForwardGestureEvent(gesture_event); | 2156 host_->ForwardGestureEvent(gesture_event); |
| 2156 if (event->type() == ui::ET_SCROLL_FLING_START) | 2157 if (event->type() == ui::ET_SCROLL_FLING_START) |
| 2157 RecordAction(base::UserMetricsAction("TrackpadScrollFling")); | 2158 RecordAction(base::UserMetricsAction("TrackpadScrollFling")); |
| 2158 } | 2159 } |
| 2159 | 2160 |
| 2160 event->SetHandled(); | 2161 event->SetHandled(); |
| 2161 } | 2162 } |
| 2162 | 2163 |
| 2163 void RenderWidgetHostViewAura::OnTouchEvent(ui::TouchEvent* event) { | 2164 void RenderWidgetHostViewAura::OnTouchEvent(ui::TouchEvent* event) { |
| 2165 Focus(); |
| 2164 TRACE_EVENT0("input", "RenderWidgetHostViewAura::OnTouchEvent"); | 2166 TRACE_EVENT0("input", "RenderWidgetHostViewAura::OnTouchEvent"); |
| 2165 | 2167 |
| 2166 bool had_no_pointer = !pointer_state_.GetPointerCount(); | 2168 bool had_no_pointer = !pointer_state_.GetPointerCount(); |
| 2167 | 2169 |
| 2168 // Update the touch event first. | 2170 // Update the touch event first. |
| 2169 if (!pointer_state_.OnTouch(*event)) { | 2171 if (!pointer_state_.OnTouch(*event)) { |
| 2170 event->StopPropagation(); | 2172 event->StopPropagation(); |
| 2171 return; | 2173 return; |
| 2172 } | 2174 } |
| 2173 | 2175 |
| (...skipping 645 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2819 | 2821 |
| 2820 //////////////////////////////////////////////////////////////////////////////// | 2822 //////////////////////////////////////////////////////////////////////////////// |
| 2821 // RenderWidgetHostViewBase, public: | 2823 // RenderWidgetHostViewBase, public: |
| 2822 | 2824 |
| 2823 // static | 2825 // static |
| 2824 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { | 2826 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { |
| 2825 GetScreenInfoForWindow(results, NULL); | 2827 GetScreenInfoForWindow(results, NULL); |
| 2826 } | 2828 } |
| 2827 | 2829 |
| 2828 } // namespace content | 2830 } // namespace content |
| OLD | NEW |