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 1765 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1776 const blink::WebInputEvent& event, const ui::LatencyInfo& latency_info) { | 1776 const blink::WebInputEvent& event, const ui::LatencyInfo& latency_info) { |
1777 // Don't ignore touch cancel events, since they may be sent while input | 1777 // Don't ignore touch cancel events, since they may be sent while input |
1778 // events are being ignored in order to keep the renderer from getting | 1778 // events are being ignored in order to keep the renderer from getting |
1779 // confused about how many touches are active. | 1779 // confused about how many touches are active. |
1780 if (IgnoreInputEvents() && event.type != WebInputEvent::TouchCancel) | 1780 if (IgnoreInputEvents() && event.type != WebInputEvent::TouchCancel) |
1781 return INPUT_EVENT_ACK_STATE_NO_CONSUMER_EXISTS; | 1781 return INPUT_EVENT_ACK_STATE_NO_CONSUMER_EXISTS; |
1782 | 1782 |
1783 if (!process_->HasConnection()) | 1783 if (!process_->HasConnection()) |
1784 return INPUT_EVENT_ACK_STATE_UNKNOWN; | 1784 return INPUT_EVENT_ACK_STATE_UNKNOWN; |
1785 | 1785 |
1786 if (event.type == WebInputEvent::MouseDown) | 1786 if (event.type == WebInputEvent::MouseDown || |
| 1787 event.type == WebInputEvent::GestureTapDown) { |
1787 OnUserGesture(); | 1788 OnUserGesture(); |
| 1789 } |
1788 | 1790 |
1789 return view_ ? view_->FilterInputEvent(event) | 1791 return view_ ? view_->FilterInputEvent(event) |
1790 : INPUT_EVENT_ACK_STATE_NOT_CONSUMED; | 1792 : INPUT_EVENT_ACK_STATE_NOT_CONSUMED; |
1791 } | 1793 } |
1792 | 1794 |
1793 void RenderWidgetHostImpl::IncrementInFlightEventCount() { | 1795 void RenderWidgetHostImpl::IncrementInFlightEventCount() { |
1794 increment_in_flight_event_count(); | 1796 increment_in_flight_event_count(); |
1795 if (!is_hidden_) | 1797 if (!is_hidden_) |
1796 StartHangMonitorTimeout(hung_renderer_delay_); | 1798 StartHangMonitorTimeout(hung_renderer_delay_); |
1797 } | 1799 } |
(...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2119 } | 2121 } |
2120 #endif | 2122 #endif |
2121 | 2123 |
2122 SkColorType RenderWidgetHostImpl::PreferredReadbackFormat() { | 2124 SkColorType RenderWidgetHostImpl::PreferredReadbackFormat() { |
2123 if (view_) | 2125 if (view_) |
2124 return view_->PreferredReadbackFormat(); | 2126 return view_->PreferredReadbackFormat(); |
2125 return kN32_SkColorType; | 2127 return kN32_SkColorType; |
2126 } | 2128 } |
2127 | 2129 |
2128 } // namespace content | 2130 } // namespace content |
OLD | NEW |