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 3749 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3760 return; | 3760 return; |
3761 | 3761 |
3762 page()->contextMenuController().clearContextMenu(); | 3762 page()->contextMenuController().clearContextMenu(); |
3763 { | 3763 { |
3764 ContextMenuAllowedScope scope; | 3764 ContextMenuAllowedScope scope; |
3765 if (LocalFrame* focusedFrame = toLocalFrame(page()->focusController().fo
cusedOrMainFrame())) | 3765 if (LocalFrame* focusedFrame = toLocalFrame(page()->focusController().fo
cusedOrMainFrame())) |
3766 focusedFrame->eventHandler().sendContextMenuEventForKey(nullptr); | 3766 focusedFrame->eventHandler().sendContextMenuEventForKey(nullptr); |
3767 } | 3767 } |
3768 } | 3768 } |
3769 | 3769 |
| 3770 void WebViewImpl::didCloseContextMenu() |
| 3771 { |
| 3772 LocalFrame* frame = m_page->focusController().focusedFrame(); |
| 3773 if (frame) |
| 3774 frame->selection().setCaretBlinkingSuspended(false); |
| 3775 } |
| 3776 |
3770 void WebViewImpl::extractSmartClipData(WebRect rectInViewport, WebString& clipTe
xt, WebString& clipHtml, WebRect& clipRectInViewport) | 3777 void WebViewImpl::extractSmartClipData(WebRect rectInViewport, WebString& clipTe
xt, WebString& clipHtml, WebRect& clipRectInViewport) |
3771 { | 3778 { |
3772 LocalFrame* localFrame = toLocalFrame(focusedCoreFrame()); | 3779 LocalFrame* localFrame = toLocalFrame(focusedCoreFrame()); |
3773 if (!localFrame) | 3780 if (!localFrame) |
3774 return; | 3781 return; |
3775 SmartClipData clipData = SmartClip(localFrame).dataForRect(rectInViewport); | 3782 SmartClipData clipData = SmartClip(localFrame).dataForRect(rectInViewport); |
3776 clipText = clipData.clipData(); | 3783 clipText = clipData.clipData(); |
3777 clipRectInViewport = clipData.rectInViewport(); | 3784 clipRectInViewport = clipData.rectInViewport(); |
3778 | 3785 |
3779 WebLocalFrameImpl* frame = mainFrameImpl(); | 3786 WebLocalFrameImpl* frame = mainFrameImpl(); |
(...skipping 678 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4458 if (m_pageColorOverlay) | 4465 if (m_pageColorOverlay) |
4459 m_pageColorOverlay->update(); | 4466 m_pageColorOverlay->update(); |
4460 if (InspectorOverlay* overlay = inspectorOverlay()) { | 4467 if (InspectorOverlay* overlay = inspectorOverlay()) { |
4461 PageOverlay* inspectorPageOverlay = overlay->pageOverlay(); | 4468 PageOverlay* inspectorPageOverlay = overlay->pageOverlay(); |
4462 if (inspectorPageOverlay) | 4469 if (inspectorPageOverlay) |
4463 inspectorPageOverlay->update(); | 4470 inspectorPageOverlay->update(); |
4464 } | 4471 } |
4465 } | 4472 } |
4466 | 4473 |
4467 } // namespace blink | 4474 } // namespace blink |
OLD | NEW |