Chromium Code Reviews| 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 1358 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1369 } | 1369 } |
| 1370 | 1370 |
| 1371 BrowserAccessibilityManager* | 1371 BrowserAccessibilityManager* |
| 1372 RenderWidgetHostViewAura::CreateBrowserAccessibilityManager( | 1372 RenderWidgetHostViewAura::CreateBrowserAccessibilityManager( |
| 1373 BrowserAccessibilityDelegate* delegate) { | 1373 BrowserAccessibilityDelegate* delegate) { |
| 1374 BrowserAccessibilityManager* manager = NULL; | 1374 BrowserAccessibilityManager* manager = NULL; |
| 1375 #if defined(OS_WIN) | 1375 #if defined(OS_WIN) |
| 1376 manager = new BrowserAccessibilityManagerWin( | 1376 manager = new BrowserAccessibilityManagerWin( |
| 1377 BrowserAccessibilityManagerWin::GetEmptyDocument(), delegate); | 1377 BrowserAccessibilityManagerWin::GetEmptyDocument(), delegate); |
| 1378 #else | 1378 #else |
| 1379 manager = BrowserAccessibilityManager::Create( | 1379 manager = nullptr; |
|
no sievers
2015/10/22 20:55:41
see other comment wrt accessibility
mfomitchev
2015/11/02 21:51:16
Done.
| |
| 1380 BrowserAccessibilityManager::GetEmptyDocument(), delegate); | 1380 // manager = BrowserAccessibilityManager::Create( |
| 1381 // BrowserAccessibilityManager::GetEmptyDocument(), delegate); | |
| 1381 #endif | 1382 #endif |
| 1382 return manager; | 1383 return manager; |
| 1383 } | 1384 } |
| 1384 | 1385 |
| 1385 gfx::AcceleratedWidget | 1386 gfx::AcceleratedWidget |
| 1386 RenderWidgetHostViewAura::AccessibilityGetAcceleratedWidget() { | 1387 RenderWidgetHostViewAura::AccessibilityGetAcceleratedWidget() { |
| 1387 #if defined(OS_WIN) | 1388 #if defined(OS_WIN) |
| 1388 if (legacy_render_widget_host_HWND_) | 1389 if (legacy_render_widget_host_HWND_) |
| 1389 return legacy_render_widget_host_HWND_->hwnd(); | 1390 return legacy_render_widget_host_HWND_->hwnd(); |
| 1390 #endif | 1391 #endif |
| (...skipping 822 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2213 blink::WebGestureEvent gesture_event = MakeWebGestureEvent(*event); | 2214 blink::WebGestureEvent gesture_event = MakeWebGestureEvent(*event); |
| 2214 host_->ForwardGestureEvent(gesture_event); | 2215 host_->ForwardGestureEvent(gesture_event); |
| 2215 if (event->type() == ui::ET_SCROLL_FLING_START) | 2216 if (event->type() == ui::ET_SCROLL_FLING_START) |
| 2216 RecordAction(base::UserMetricsAction("TrackpadScrollFling")); | 2217 RecordAction(base::UserMetricsAction("TrackpadScrollFling")); |
| 2217 } | 2218 } |
| 2218 | 2219 |
| 2219 event->SetHandled(); | 2220 event->SetHandled(); |
| 2220 } | 2221 } |
| 2221 | 2222 |
| 2222 void RenderWidgetHostViewAura::OnTouchEvent(ui::TouchEvent* event) { | 2223 void RenderWidgetHostViewAura::OnTouchEvent(ui::TouchEvent* event) { |
| 2224 Focus(); | |
|
no sievers
2015/10/22 20:55:41
revert
mfomitchev
2015/11/02 21:51:16
Done.
| |
| 2223 TRACE_EVENT0("input", "RenderWidgetHostViewAura::OnTouchEvent"); | 2225 TRACE_EVENT0("input", "RenderWidgetHostViewAura::OnTouchEvent"); |
| 2224 | 2226 |
| 2225 bool had_no_pointer = !pointer_state_.GetPointerCount(); | 2227 bool had_no_pointer = !pointer_state_.GetPointerCount(); |
| 2226 | 2228 |
| 2227 // Update the touch event first. | 2229 // Update the touch event first. |
| 2228 if (!pointer_state_.OnTouch(*event)) { | 2230 if (!pointer_state_.OnTouch(*event)) { |
| 2229 event->StopPropagation(); | 2231 event->StopPropagation(); |
| 2230 return; | 2232 return; |
| 2231 } | 2233 } |
| 2232 | 2234 |
| (...skipping 656 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2889 | 2891 |
| 2890 //////////////////////////////////////////////////////////////////////////////// | 2892 //////////////////////////////////////////////////////////////////////////////// |
| 2891 // RenderWidgetHostViewBase, public: | 2893 // RenderWidgetHostViewBase, public: |
| 2892 | 2894 |
| 2893 // static | 2895 // static |
| 2894 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { | 2896 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { |
| 2895 GetScreenInfoForWindow(results, NULL); | 2897 GetScreenInfoForWindow(results, NULL); |
| 2896 } | 2898 } |
| 2897 | 2899 |
| 2898 } // namespace content | 2900 } // namespace content |
| OLD | NEW |