OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 2131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2142 if (InspectorOverlay* overlay = inspectorOverlay()) { | 2142 if (InspectorOverlay* overlay = inspectorOverlay()) { |
2143 if (overlay->handleInputEvent(inputEvent)) | 2143 if (overlay->handleInputEvent(inputEvent)) |
2144 return WebInputEventResult::HandledSuppressed; | 2144 return WebInputEventResult::HandledSuppressed; |
2145 } | 2145 } |
2146 | 2146 |
2147 // Report the event to be NOT processed by WebKit, so that the browser can | 2147 // Report the event to be NOT processed by WebKit, so that the browser can |
2148 // handle it appropriately. | 2148 // handle it appropriately. |
2149 if (m_ignoreInputEvents) | 2149 if (m_ignoreInputEvents) |
2150 return WebInputEventResult::NotHandled; | 2150 return WebInputEventResult::NotHandled; |
2151 | 2151 |
| 2152 // Speculatively schedule an animation for this input event with the |
| 2153 // assumption that it will trigger one after being handled. |
| 2154 // TODO(skyostil): Only do this for certain types of input. |
| 2155 scheduleAnimationForWidget(); |
| 2156 |
2152 AutoReset<const WebInputEvent*> currentEventChange(&m_currentInputEvent, | 2157 AutoReset<const WebInputEvent*> currentEventChange(&m_currentInputEvent, |
2153 &inputEvent); | 2158 &inputEvent); |
2154 UIEventWithKeyState::clearNewTabModifierSetFromIsolatedWorld(); | 2159 UIEventWithKeyState::clearNewTabModifierSetFromIsolatedWorld(); |
2155 | 2160 |
2156 bool isPointerLocked = false; | 2161 bool isPointerLocked = false; |
2157 if (WebFrameWidgetBase* widget = mainFrameImpl()->frameWidget()) { | 2162 if (WebFrameWidgetBase* widget = mainFrameImpl()->frameWidget()) { |
2158 if (WebWidgetClient* client = widget->client()) | 2163 if (WebWidgetClient* client = widget->client()) |
2159 isPointerLocked = client->isPointerLocked(); | 2164 isPointerLocked = client->isPointerLocked(); |
2160 } | 2165 } |
2161 | 2166 |
(...skipping 2042 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4204 if (focusedFrame->localFrameRoot() != mainFrameImpl()->frame()) | 4209 if (focusedFrame->localFrameRoot() != mainFrameImpl()->frame()) |
4205 return nullptr; | 4210 return nullptr; |
4206 return focusedFrame; | 4211 return focusedFrame; |
4207 } | 4212 } |
4208 | 4213 |
4209 LocalFrame* WebViewImpl::focusedLocalFrameAvailableForIme() const { | 4214 LocalFrame* WebViewImpl::focusedLocalFrameAvailableForIme() const { |
4210 return m_imeAcceptEvents ? focusedLocalFrameInWidget() : nullptr; | 4215 return m_imeAcceptEvents ? focusedLocalFrameInWidget() : nullptr; |
4211 } | 4216 } |
4212 | 4217 |
4213 } // namespace blink | 4218 } // namespace blink |
OLD | NEW |