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 1881 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1892 void RenderWidgetHostImpl::DidStopFlinging() { | 1892 void RenderWidgetHostImpl::DidStopFlinging() { |
1893 if (view_) | 1893 if (view_) |
1894 view_->DidStopFlinging(); | 1894 view_->DidStopFlinging(); |
1895 } | 1895 } |
1896 | 1896 |
1897 void RenderWidgetHostImpl::OnKeyboardEventAck( | 1897 void RenderWidgetHostImpl::OnKeyboardEventAck( |
1898 const NativeWebKeyboardEventWithLatencyInfo& event, | 1898 const NativeWebKeyboardEventWithLatencyInfo& event, |
1899 InputEventAckState ack_result) { | 1899 InputEventAckState ack_result) { |
1900 latency_tracker_.OnInputEventAck(event.event, &event.latency); | 1900 latency_tracker_.OnInputEventAck(event.event, &event.latency); |
1901 | 1901 |
1902 #if defined(OS_MACOSX) | |
1903 if (!is_hidden() && view_ && view_->PostProcessEventForPluginIme(event.event)) | |
1904 return; | |
1905 #endif | |
1906 | |
1907 // We only send unprocessed key event upwards if we are not hidden, | 1902 // We only send unprocessed key event upwards if we are not hidden, |
1908 // because the user has moved away from us and no longer expect any effect | 1903 // because the user has moved away from us and no longer expect any effect |
1909 // of this key event. | 1904 // of this key event. |
1910 const bool processed = (INPUT_EVENT_ACK_STATE_CONSUMED == ack_result); | 1905 const bool processed = (INPUT_EVENT_ACK_STATE_CONSUMED == ack_result); |
1911 if (delegate_ && !processed && !is_hidden() && !event.event.skip_in_browser) { | 1906 if (delegate_ && !processed && !is_hidden() && !event.event.skip_in_browser) { |
1912 delegate_->HandleKeyboardEvent(event.event); | 1907 delegate_->HandleKeyboardEvent(event.event); |
1913 | 1908 |
1914 // WARNING: This RenderWidgetHostImpl can be deallocated at this point | 1909 // WARNING: This RenderWidgetHostImpl can be deallocated at this point |
1915 // (i.e. in the case of Ctrl+W, where the call to | 1910 // (i.e. in the case of Ctrl+W, where the call to |
1916 // HandleKeyboardEvent destroys this RenderWidgetHostImpl). | 1911 // HandleKeyboardEvent destroys this RenderWidgetHostImpl). |
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2172 return delegate_ ? delegate_->GetRootBrowserAccessibilityManager() : NULL; | 2167 return delegate_ ? delegate_->GetRootBrowserAccessibilityManager() : NULL; |
2173 } | 2168 } |
2174 | 2169 |
2175 BrowserAccessibilityManager* | 2170 BrowserAccessibilityManager* |
2176 RenderWidgetHostImpl::GetOrCreateRootBrowserAccessibilityManager() { | 2171 RenderWidgetHostImpl::GetOrCreateRootBrowserAccessibilityManager() { |
2177 return delegate_ ? | 2172 return delegate_ ? |
2178 delegate_->GetOrCreateRootBrowserAccessibilityManager() : NULL; | 2173 delegate_->GetOrCreateRootBrowserAccessibilityManager() : NULL; |
2179 } | 2174 } |
2180 | 2175 |
2181 } // namespace content | 2176 } // namespace content |
OLD | NEW |