| 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 1783 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1794 | 1794 |
| 1795 aura::RootWindow* root = window_->GetRootWindow(); | 1795 aura::RootWindow* root = window_->GetRootWindow(); |
| 1796 // |root| is NULL during tests. | 1796 // |root| is NULL during tests. |
| 1797 if (!root) | 1797 if (!root) |
| 1798 return; | 1798 return; |
| 1799 | 1799 |
| 1800 ui::EventResult result = (ack_result == | 1800 ui::EventResult result = (ack_result == |
| 1801 INPUT_EVENT_ACK_STATE_CONSUMED) ? ui::ER_HANDLED : ui::ER_UNHANDLED; | 1801 INPUT_EVENT_ACK_STATE_CONSUMED) ? ui::ER_HANDLED : ui::ER_UNHANDLED; |
| 1802 for (ScopedVector<ui::TouchEvent>::iterator iter = events.begin(), | 1802 for (ScopedVector<ui::TouchEvent>::iterator iter = events.begin(), |
| 1803 end = events.end(); iter != end; ++iter) { | 1803 end = events.end(); iter != end; ++iter) { |
| 1804 (*iter)->latency()->AddLatencyNumber( | |
| 1805 ui::INPUT_EVENT_LATENCY_ACKED_COMPONENT, | |
| 1806 static_cast<int64>(ack_result), | |
| 1807 0); | |
| 1808 root->ProcessedTouchEvent((*iter), window_, result); | 1804 root->ProcessedTouchEvent((*iter), window_, result); |
| 1809 } | 1805 } |
| 1810 } | 1806 } |
| 1811 | 1807 |
| 1812 SmoothScrollGesture* RenderWidgetHostViewAura::CreateSmoothScrollGesture( | 1808 SmoothScrollGesture* RenderWidgetHostViewAura::CreateSmoothScrollGesture( |
| 1813 bool scroll_down, | 1809 bool scroll_down, |
| 1814 int pixels_to_scroll, | 1810 int pixels_to_scroll, |
| 1815 int mouse_event_x, | 1811 int mouse_event_x, |
| 1816 int mouse_event_y) { | 1812 int mouse_event_y) { |
| 1817 return new TouchSmoothScrollGestureAura(scroll_down, | 1813 return new TouchSmoothScrollGestureAura(scroll_down, |
| (...skipping 1198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3016 RenderWidgetHost* widget) { | 3012 RenderWidgetHost* widget) { |
| 3017 return new RenderWidgetHostViewAura(widget); | 3013 return new RenderWidgetHostViewAura(widget); |
| 3018 } | 3014 } |
| 3019 | 3015 |
| 3020 // static | 3016 // static |
| 3021 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) { | 3017 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) { |
| 3022 GetScreenInfoForWindow(results, NULL); | 3018 GetScreenInfoForWindow(results, NULL); |
| 3023 } | 3019 } |
| 3024 | 3020 |
| 3025 } // namespace content | 3021 } // namespace content |
| OLD | NEW |