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 886 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
897 eventResult = | 897 eventResult = |
898 mainFrameImpl()->frame()->eventHandler().handleGestureEvent( | 898 mainFrameImpl()->frame()->eventHandler().handleGestureEvent( |
899 targetedEvent); | 899 targetedEvent); |
900 } | 900 } |
901 | 901 |
902 break; | 902 break; |
903 } | 903 } |
904 case WebInputEvent::GestureShowPress: | 904 case WebInputEvent::GestureShowPress: |
905 m_client->cancelScheduledContentIntents(); | 905 m_client->cancelScheduledContentIntents(); |
906 case WebInputEvent::GestureTapDown: | 906 case WebInputEvent::GestureTapDown: |
| 907 // Touch pinch zoom and scroll must hide the popup. In case of a touch |
| 908 // scroll or pinch zoom, this function is called with GestureTapDown |
| 909 // rather than a GSB/GSU/GSE or GPB/GPU/GPE. |
| 910 hidePopups(); |
907 case WebInputEvent::GestureTapCancel: | 911 case WebInputEvent::GestureTapCancel: |
908 case WebInputEvent::GestureTapUnconfirmed: { | 912 case WebInputEvent::GestureTapUnconfirmed: { |
909 eventResult = mainFrameImpl()->frame()->eventHandler().handleGestureEvent( | 913 eventResult = mainFrameImpl()->frame()->eventHandler().handleGestureEvent( |
910 targetedEvent); | 914 targetedEvent); |
911 break; | 915 break; |
912 } | 916 } |
913 default: | 917 default: |
914 NOTREACHED(); | 918 NOTREACHED(); |
915 } | 919 } |
916 m_client->didHandleGestureEvent(event, eventCancelled); | 920 m_client->didHandleGestureEvent(event, eventCancelled); |
(...skipping 3281 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4198 if (focusedFrame->localFrameRoot() != mainFrameImpl()->frame()) | 4202 if (focusedFrame->localFrameRoot() != mainFrameImpl()->frame()) |
4199 return nullptr; | 4203 return nullptr; |
4200 return focusedFrame; | 4204 return focusedFrame; |
4201 } | 4205 } |
4202 | 4206 |
4203 LocalFrame* WebViewImpl::focusedLocalFrameAvailableForIme() const { | 4207 LocalFrame* WebViewImpl::focusedLocalFrameAvailableForIme() const { |
4204 return m_imeAcceptEvents ? focusedLocalFrameInWidget() : nullptr; | 4208 return m_imeAcceptEvents ? focusedLocalFrameInWidget() : nullptr; |
4205 } | 4209 } |
4206 | 4210 |
4207 } // namespace blink | 4211 } // namespace blink |
OLD | NEW |