| 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 | 8 |
| 9 #include <set> | 9 #include <set> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 1863 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1874 } | 1874 } |
| 1875 | 1875 |
| 1876 void RenderWidgetHostImpl::DidStopFlinging() { | 1876 void RenderWidgetHostImpl::DidStopFlinging() { |
| 1877 if (view_) | 1877 if (view_) |
| 1878 view_->DidStopFlinging(); | 1878 view_->DidStopFlinging(); |
| 1879 } | 1879 } |
| 1880 | 1880 |
| 1881 void RenderWidgetHostImpl::OnKeyboardEventAck( | 1881 void RenderWidgetHostImpl::OnKeyboardEventAck( |
| 1882 const NativeWebKeyboardEventWithLatencyInfo& event, | 1882 const NativeWebKeyboardEventWithLatencyInfo& event, |
| 1883 InputEventAckState ack_result) { | 1883 InputEventAckState ack_result) { |
| 1884 latency_tracker_.OnInputEventAck(event.event, &event.latency); | 1884 latency_tracker_.OnInputEventAck(event.event, &event.latency, ack_result); |
| 1885 |
| 1886 const bool processed = (INPUT_EVENT_ACK_STATE_CONSUMED == ack_result); |
| 1885 | 1887 |
| 1886 // We only send unprocessed key event upwards if we are not hidden, | 1888 // We only send unprocessed key event upwards if we are not hidden, |
| 1887 // because the user has moved away from us and no longer expect any effect | 1889 // because the user has moved away from us and no longer expect any effect |
| 1888 // of this key event. | 1890 // of this key event. |
| 1889 const bool processed = (INPUT_EVENT_ACK_STATE_CONSUMED == ack_result); | |
| 1890 if (delegate_ && !processed && !is_hidden() && !event.event.skip_in_browser) { | 1891 if (delegate_ && !processed && !is_hidden() && !event.event.skip_in_browser) { |
| 1891 delegate_->HandleKeyboardEvent(event.event); | 1892 delegate_->HandleKeyboardEvent(event.event); |
| 1892 | 1893 |
| 1893 // WARNING: This RenderWidgetHostImpl can be deallocated at this point | 1894 // WARNING: This RenderWidgetHostImpl can be deallocated at this point |
| 1894 // (i.e. in the case of Ctrl+W, where the call to | 1895 // (i.e. in the case of Ctrl+W, where the call to |
| 1895 // HandleKeyboardEvent destroys this RenderWidgetHostImpl). | 1896 // HandleKeyboardEvent destroys this RenderWidgetHostImpl). |
| 1896 } | 1897 } |
| 1897 } | 1898 } |
| 1898 | 1899 |
| 1899 void RenderWidgetHostImpl::OnMouseEventAck( | 1900 void RenderWidgetHostImpl::OnMouseEventAck( |
| 1900 const MouseEventWithLatencyInfo& mouse_event, | 1901 const MouseEventWithLatencyInfo& mouse_event, |
| 1901 InputEventAckState ack_result) { | 1902 InputEventAckState ack_result) { |
| 1902 latency_tracker_.OnInputEventAck(mouse_event.event, &mouse_event.latency); | 1903 latency_tracker_.OnInputEventAck(mouse_event.event, &mouse_event.latency, |
| 1904 ack_result); |
| 1903 } | 1905 } |
| 1904 | 1906 |
| 1905 void RenderWidgetHostImpl::OnWheelEventAck( | 1907 void RenderWidgetHostImpl::OnWheelEventAck( |
| 1906 const MouseWheelEventWithLatencyInfo& wheel_event, | 1908 const MouseWheelEventWithLatencyInfo& wheel_event, |
| 1907 InputEventAckState ack_result) { | 1909 InputEventAckState ack_result) { |
| 1908 latency_tracker_.OnInputEventAck(wheel_event.event, &wheel_event.latency); | 1910 latency_tracker_.OnInputEventAck(wheel_event.event, &wheel_event.latency, |
| 1911 ack_result); |
| 1909 | 1912 |
| 1910 if (!is_hidden() && view_) { | 1913 if (!is_hidden() && view_) { |
| 1911 if (ack_result != INPUT_EVENT_ACK_STATE_CONSUMED && | 1914 if (ack_result != INPUT_EVENT_ACK_STATE_CONSUMED && |
| 1912 delegate_ && delegate_->HandleWheelEvent(wheel_event.event)) { | 1915 delegate_ && delegate_->HandleWheelEvent(wheel_event.event)) { |
| 1913 ack_result = INPUT_EVENT_ACK_STATE_CONSUMED; | 1916 ack_result = INPUT_EVENT_ACK_STATE_CONSUMED; |
| 1914 } | 1917 } |
| 1915 view_->WheelEventAck(wheel_event.event, ack_result); | 1918 view_->WheelEventAck(wheel_event.event, ack_result); |
| 1916 } | 1919 } |
| 1917 } | 1920 } |
| 1918 | 1921 |
| 1919 void RenderWidgetHostImpl::OnGestureEventAck( | 1922 void RenderWidgetHostImpl::OnGestureEventAck( |
| 1920 const GestureEventWithLatencyInfo& event, | 1923 const GestureEventWithLatencyInfo& event, |
| 1921 InputEventAckState ack_result) { | 1924 InputEventAckState ack_result) { |
| 1922 latency_tracker_.OnInputEventAck(event.event, &event.latency); | 1925 latency_tracker_.OnInputEventAck(event.event, &event.latency, ack_result); |
| 1923 | 1926 |
| 1924 if (view_) | 1927 if (view_) |
| 1925 view_->GestureEventAck(event.event, ack_result); | 1928 view_->GestureEventAck(event.event, ack_result); |
| 1926 } | 1929 } |
| 1927 | 1930 |
| 1928 void RenderWidgetHostImpl::OnTouchEventAck( | 1931 void RenderWidgetHostImpl::OnTouchEventAck( |
| 1929 const TouchEventWithLatencyInfo& event, | 1932 const TouchEventWithLatencyInfo& event, |
| 1930 InputEventAckState ack_result) { | 1933 InputEventAckState ack_result) { |
| 1931 latency_tracker_.OnInputEventAck(event.event, &event.latency); | 1934 latency_tracker_.OnInputEventAck(event.event, &event.latency, ack_result); |
| 1932 | 1935 |
| 1933 if (touch_emulator_ && | 1936 if (touch_emulator_ && |
| 1934 touch_emulator_->HandleTouchEventAck(event.event, ack_result)) { | 1937 touch_emulator_->HandleTouchEventAck(event.event, ack_result)) { |
| 1935 return; | 1938 return; |
| 1936 } | 1939 } |
| 1937 | 1940 |
| 1938 if (view_) | 1941 if (view_) |
| 1939 view_->ProcessAckedTouchEvent(event, ack_result); | 1942 view_->ProcessAckedTouchEvent(event, ack_result); |
| 1940 } | 1943 } |
| 1941 | 1944 |
| (...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2151 return delegate_ ? delegate_->GetRootBrowserAccessibilityManager() : NULL; | 2154 return delegate_ ? delegate_->GetRootBrowserAccessibilityManager() : NULL; |
| 2152 } | 2155 } |
| 2153 | 2156 |
| 2154 BrowserAccessibilityManager* | 2157 BrowserAccessibilityManager* |
| 2155 RenderWidgetHostImpl::GetOrCreateRootBrowserAccessibilityManager() { | 2158 RenderWidgetHostImpl::GetOrCreateRootBrowserAccessibilityManager() { |
| 2156 return delegate_ ? | 2159 return delegate_ ? |
| 2157 delegate_->GetOrCreateRootBrowserAccessibilityManager() : NULL; | 2160 delegate_->GetOrCreateRootBrowserAccessibilityManager() : NULL; |
| 2158 } | 2161 } |
| 2159 | 2162 |
| 2160 } // namespace content | 2163 } // namespace content |
| OLD | NEW |