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_impl.h" | 5 #include "content/browser/renderer_host/render_widget_host_impl.h" |
6 | 6 |
7 #include <math.h> | 7 #include <math.h> |
8 #include <set> | 8 #include <set> |
9 #include <utility> | 9 #include <utility> |
10 | 10 |
(...skipping 1840 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1851 return INPUT_EVENT_ACK_STATE_NO_CONSUMER_EXISTS; | 1851 return INPUT_EVENT_ACK_STATE_NO_CONSUMER_EXISTS; |
1852 | 1852 |
1853 if (!process_->HasConnection()) | 1853 if (!process_->HasConnection()) |
1854 return INPUT_EVENT_ACK_STATE_UNKNOWN; | 1854 return INPUT_EVENT_ACK_STATE_UNKNOWN; |
1855 | 1855 |
1856 if (event.type == WebInputEvent::MouseDown || | 1856 if (event.type == WebInputEvent::MouseDown || |
1857 event.type == WebInputEvent::GestureTapDown) { | 1857 event.type == WebInputEvent::GestureTapDown) { |
1858 OnUserGesture(); | 1858 OnUserGesture(); |
1859 } | 1859 } |
1860 | 1860 |
| 1861 if (event.type == WebInputEvent::MouseDown || |
| 1862 event.type == WebInputEvent::GestureTapDown || |
| 1863 event.type == WebInputEvent::RawKeyDown || |
| 1864 event.type == WebInputEvent::MouseWheel) { |
| 1865 OnUserInteraction(event.type); |
| 1866 } |
| 1867 |
1861 return view_ ? view_->FilterInputEvent(event) | 1868 return view_ ? view_->FilterInputEvent(event) |
1862 : INPUT_EVENT_ACK_STATE_NOT_CONSUMED; | 1869 : INPUT_EVENT_ACK_STATE_NOT_CONSUMED; |
1863 } | 1870 } |
1864 | 1871 |
1865 void RenderWidgetHostImpl::IncrementInFlightEventCount() { | 1872 void RenderWidgetHostImpl::IncrementInFlightEventCount() { |
1866 increment_in_flight_event_count(); | 1873 increment_in_flight_event_count(); |
1867 if (!is_hidden_) | 1874 if (!is_hidden_) |
1868 StartHangMonitorTimeout(hung_renderer_delay_); | 1875 StartHangMonitorTimeout(hung_renderer_delay_); |
1869 } | 1876 } |
1870 | 1877 |
(...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2186 } | 2193 } |
2187 | 2194 |
2188 #if defined(OS_WIN) | 2195 #if defined(OS_WIN) |
2189 gfx::NativeViewAccessible | 2196 gfx::NativeViewAccessible |
2190 RenderWidgetHostImpl::GetParentNativeViewAccessible() { | 2197 RenderWidgetHostImpl::GetParentNativeViewAccessible() { |
2191 return delegate_ ? delegate_->GetParentNativeViewAccessible() : NULL; | 2198 return delegate_ ? delegate_->GetParentNativeViewAccessible() : NULL; |
2192 } | 2199 } |
2193 #endif | 2200 #endif |
2194 | 2201 |
2195 } // namespace content | 2202 } // namespace content |
OLD | NEW |