diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-22 09:09:45 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-22 09:10:13 +0100 |
| commit | 470286ecfe79d59df14944e5b5d34630fc739391 (patch) | |
| tree | 43983212872e06cebefd2ae474418fa2908ca54c /Source/WebKit/win/WebView.cpp | |
| parent | 23037105e948c2065da5a937d3a2396b0ff45c1e (diff) | |
| download | qtwebkit-470286ecfe79d59df14944e5b5d34630fc739391.tar.gz | |
Imported WebKit commit e89504fa9195b2063b2530961d4b73dd08de3242 (http://svn.webkit.org/repository/webkit/trunk@135485)
Change-Id: I03774e5ac79721c13ffa30d152537a74d0b12e66
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'Source/WebKit/win/WebView.cpp')
| -rw-r--r-- | Source/WebKit/win/WebView.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/Source/WebKit/win/WebView.cpp b/Source/WebKit/win/WebView.cpp index dd7008eb3..38d2e515e 100644 --- a/Source/WebKit/win/WebView.cpp +++ b/Source/WebKit/win/WebView.cpp @@ -45,6 +45,7 @@ #include "WebEditorClient.h" #include "WebElementPropertyBag.h" #include "WebFrame.h" +#include "WebFrameNetworkingContext.h" #include "WebGeolocationClient.h" #include "WebGeolocationPosition.h" #include "WebIconDatabase.h" @@ -1349,11 +1350,7 @@ bool WebView::handleContextMenuEvent(WPARAM wParam, LPARAM lParam) if (!coreMenu) return false; - Node* node = contextMenuController->hitTestResult().innerNonSharedNode(); - if (!node) - return false; - - Frame* frame = node->document()->frame(); + Frame* frame = contextMenuController->hitTestResult().innerNodeFrame(); if (!frame) return false; @@ -1361,7 +1358,7 @@ bool WebView::handleContextMenuEvent(WPARAM wParam, LPARAM lParam) if (!view) return false; - POINT point(view->contentsToWindow(contextMenuController->hitTestResult().roundedPoint())); + POINT point(view->contentsToWindow(contextMenuController->hitTestResult().roundedPointInInnerNodeFrame())); // Translate the point to screen coordinates if (!::ClientToScreen(m_viewWindow, &point)) @@ -4960,9 +4957,7 @@ HRESULT updateSharedSettingsFromPreferencesIfNeeded(IWebPreferences* preferences return hr; #if USE(CFNETWORK) - // Set cookie storage accept policy - if (RetainPtr<CFHTTPCookieStorageRef> cookieStorage = currentCFHTTPCookieStorage()) - CFHTTPCookieStorageSetCookieAcceptPolicy(cookieStorage.get(), acceptPolicy); + WebFrameNetworkingContext::setCookieAcceptPolicyForAllContexts(acceptPolicy); #endif return S_OK; |