Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1114)

Side by Side Diff: third_party/WebKit/Source/web/WebViewImpl.cpp

Issue 1471993002: Resume cursor blinking on closing context menu (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: robusted onContextMenuClosed() and fixed nits Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 3743 matching lines...) Expand 10 before | Expand all | Expand 10 after
3754 return; 3754 return;
3755 3755
3756 page()->contextMenuController().clearContextMenu(); 3756 page()->contextMenuController().clearContextMenu();
3757 { 3757 {
3758 ContextMenuAllowedScope scope; 3758 ContextMenuAllowedScope scope;
3759 if (LocalFrame* focusedFrame = toLocalFrame(page()->focusController().fo cusedOrMainFrame())) 3759 if (LocalFrame* focusedFrame = toLocalFrame(page()->focusController().fo cusedOrMainFrame()))
3760 focusedFrame->eventHandler().sendContextMenuEventForKey(nullptr); 3760 focusedFrame->eventHandler().sendContextMenuEventForKey(nullptr);
3761 } 3761 }
3762 } 3762 }
3763 3763
3764 void WebViewImpl::didCloseContextMenu()
3765 {
3766 LocalFrame* frame = m_page->focusController().focusedFrame();
3767 if (frame)
3768 frame->selection().setCaretBlinkingSuspended(false);
3769 }
3770
3764 void WebViewImpl::extractSmartClipData(WebRect rectInViewport, WebString& clipTe xt, WebString& clipHtml, WebRect& clipRectInViewport) 3771 void WebViewImpl::extractSmartClipData(WebRect rectInViewport, WebString& clipTe xt, WebString& clipHtml, WebRect& clipRectInViewport)
3765 { 3772 {
3766 LocalFrame* localFrame = toLocalFrame(focusedCoreFrame()); 3773 LocalFrame* localFrame = toLocalFrame(focusedCoreFrame());
3767 if (!localFrame) 3774 if (!localFrame)
3768 return; 3775 return;
3769 SmartClipData clipData = SmartClip(localFrame).dataForRect(rectInViewport); 3776 SmartClipData clipData = SmartClip(localFrame).dataForRect(rectInViewport);
3770 clipText = clipData.clipData(); 3777 clipText = clipData.clipData();
3771 clipRectInViewport = clipData.rectInViewport(); 3778 clipRectInViewport = clipData.rectInViewport();
3772 3779
3773 WebLocalFrameImpl* frame = mainFrameImpl(); 3780 WebLocalFrameImpl* frame = mainFrameImpl();
(...skipping 678 matching lines...) Expand 10 before | Expand all | Expand 10 after
4452 if (m_pageColorOverlay) 4459 if (m_pageColorOverlay)
4453 m_pageColorOverlay->update(); 4460 m_pageColorOverlay->update();
4454 if (InspectorOverlay* overlay = inspectorOverlay()) { 4461 if (InspectorOverlay* overlay = inspectorOverlay()) {
4455 PageOverlay* inspectorPageOverlay = overlay->pageOverlay(); 4462 PageOverlay* inspectorPageOverlay = overlay->pageOverlay();
4456 if (inspectorPageOverlay) 4463 if (inspectorPageOverlay)
4457 inspectorPageOverlay->update(); 4464 inspectorPageOverlay->update();
4458 } 4465 }
4459 } 4466 }
4460 4467
4461 } // namespace blink 4468 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/WebViewImpl.h ('k') | third_party/WebKit/Source/web/tests/WebViewTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698