diff options
| author | Zeno Albisser <zeno.albisser@digia.com> | 2013-11-21 14:09:57 +0100 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@digia.com> | 2013-11-29 15:14:36 +0100 |
| commit | eb32ba6f51d0c21d58cd7d89785285ff8fa64624 (patch) | |
| tree | 2c7c940e1dbee81b89d935626110816b494aa32c /chromium/third_party/WebKit/Source/web/ContextMenuClientImpl.cpp | |
| parent | 9427c1a0222ebd67efef1a2c7990a0fa5c9aac84 (diff) | |
Update chromium to branch 1599.
Change-Id: I04e775a946a208bb4500d3b722bcb05c82b9d7cb
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'chromium/third_party/WebKit/Source/web/ContextMenuClientImpl.cpp')
| -rw-r--r-- | chromium/third_party/WebKit/Source/web/ContextMenuClientImpl.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/chromium/third_party/WebKit/Source/web/ContextMenuClientImpl.cpp b/chromium/third_party/WebKit/Source/web/ContextMenuClientImpl.cpp index c8f36925cf7..a44c87d653e 100644 --- a/chromium/third_party/WebKit/Source/web/ContextMenuClientImpl.cpp +++ b/chromium/third_party/WebKit/Source/web/ContextMenuClientImpl.cpp @@ -122,7 +122,7 @@ static String selectMisspelledWord(Frame* selectedFrame) // Selection is empty, so change the selection to the word under the cursor. HitTestResult hitTestResult = selectedFrame->eventHandler()-> - hitTestResultAtPoint(selectedFrame->page()->contextMenuController().hitTestResult().pointInInnerNodeFrame()); + hitTestResultAtPoint(selectedFrame->page()->contextMenuController()->hitTestResult().pointInInnerNodeFrame()); Node* innerNode = hitTestResult.innerNode(); VisiblePosition pos(innerNode->renderer()->positionForPoint( hitTestResult.localPoint())); @@ -184,7 +184,7 @@ void ContextMenuClientImpl::showContextMenu(const WebCore::ContextMenu* defaultM if (!m_webView->contextMenuAllowed()) return; - HitTestResult r = m_webView->page()->contextMenuController().hitTestResult(); + HitTestResult r = m_webView->page()->contextMenuController()->hitTestResult(); Frame* selectedFrame = r.innerNodeFrame(); WebContextMenuData data; @@ -368,12 +368,6 @@ void ContextMenuClientImpl::showContextMenu(const WebCore::ContextMenu* defaultM m_webView->client()->showContextMenu(selected_web_frame, data); } -void ContextMenuClientImpl::clearContextMenu() -{ - if (m_webView->client()) - m_webView->client()->clearContextMenu(); -} - static void populateSubMenuItems(const Vector<ContextMenuItem>& inputMenu, WebVector<WebMenuItemInfo>& subMenuItems) { Vector<WebMenuItemInfo> subItems; |