diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-24 11:24:40 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-02 09:53:15 +0100 |
| commit | 81bc750723a18f21cd17d1b173cd2a4dda9cea6e (patch) | |
| tree | 7a9e5ed86ff429fd347a25153107221543909b19 /Source/WebKit/win/WebFrame.cpp | |
| parent | 94088a6d336c1dd80a1e734af51e96abcbb689a7 (diff) | |
| download | external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.zip external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.gz external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.bz2 | |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
Diffstat (limited to 'Source/WebKit/win/WebFrame.cpp')
| -rw-r--r-- | Source/WebKit/win/WebFrame.cpp | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/Source/WebKit/win/WebFrame.cpp b/Source/WebKit/win/WebFrame.cpp index 80b91cd..e412543 100644 --- a/Source/WebKit/win/WebFrame.cpp +++ b/Source/WebKit/win/WebFrame.cpp @@ -1033,6 +1033,15 @@ HRESULT STDMETHODCALLTYPE WebFrame::hasSpellingMarker( return S_OK; } +HRESULT STDMETHODCALLTYPE WebFrame::clearOpener() +{ + HRESULT hr = S_OK; + if (Frame* coreFrame = core(this)) + coreFrame->loader()->setOpener(0); + + return hr; +} + // IWebDocumentText ----------------------------------------------------------- HRESULT STDMETHODCALLTYPE WebFrame::supportsTextEncoding( @@ -1755,7 +1764,7 @@ void WebFrame::receivedPolicyDecision(PolicyAction action) (coreFrame->loader()->policyChecker()->*function)(action); } -void WebFrame::dispatchDecidePolicyForMIMEType(FramePolicyFunction function, const String& mimeType, const ResourceRequest& request) +void WebFrame::dispatchDecidePolicyForResponse(FramePolicyFunction function, const ResourceResponse& response, const ResourceRequest& request) { Frame* coreFrame = core(this); ASSERT(coreFrame); @@ -1766,7 +1775,7 @@ void WebFrame::dispatchDecidePolicyForMIMEType(FramePolicyFunction function, con COMPtr<IWebURLRequest> urlRequest(AdoptCOM, WebMutableURLRequest::createInstance(request)); - if (SUCCEEDED(policyDelegate->decidePolicyForMIMEType(d->webView, BString(mimeType), urlRequest.get(), this, setUpPolicyListener(function).get()))) + if (SUCCEEDED(policyDelegate->decidePolicyForMIMEType(d->webView, BString(response.mimeType()), urlRequest.get(), this, setUpPolicyListener(function).get()))) return; (coreFrame->loader()->policyChecker()->*function)(PolicyUse); @@ -2167,8 +2176,8 @@ static float scaleFactor(HDC printDC, const IntRect& marginRect, const IntRect& IntRect adjustedRect = IntRect( printRect.x() + marginRect.x(), printRect.y() + marginRect.y(), - printRect.width() - marginRect.x() - marginRect.right(), - printRect.height() - marginRect.y() - marginRect.bottom()); + printRect.width() - marginRect.x() - marginRect.maxX(), + printRect.height() - marginRect.y() - marginRect.maxY()); float scale = static_cast<float>(adjustedRect.width()) / static_cast<float>(pageRect.width()); if (!scale) |