diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-02-03 09:55:33 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-02-03 09:55:33 +0100 |
| commit | cd44dc59cdfc39534aef4d417e9f3c412e3be139 (patch) | |
| tree | 8d89889ba95ed6ec9322e733846cc9cce9d7dff1 /Source/WebCore/plugins/PluginView.cpp | |
| parent | d11f84f5b5cdc0d92a08af01b13472fdd5f9acb9 (diff) | |
| download | qtwebkit-cd44dc59cdfc39534aef4d417e9f3c412e3be139.tar.gz | |
Imported WebKit commit fce473cb4d55aa9fe9d0b0322a2fffecb731b961 (http://svn.webkit.org/repository/webkit/trunk@106560)
Diffstat (limited to 'Source/WebCore/plugins/PluginView.cpp')
| -rw-r--r-- | Source/WebCore/plugins/PluginView.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/Source/WebCore/plugins/PluginView.cpp b/Source/WebCore/plugins/PluginView.cpp index 81bbcc283..749f60979 100644 --- a/Source/WebCore/plugins/PluginView.cpp +++ b/Source/WebCore/plugins/PluginView.cpp @@ -562,7 +562,7 @@ NPError PluginView::getURLNotify(const char* url, const char* target, void* noti frameLoadRequest.setFrameName(target); frameLoadRequest.resourceRequest().setHTTPMethod("GET"); - frameLoadRequest.resourceRequest().setURL(makeURL(m_baseURL, url)); + frameLoadRequest.resourceRequest().setURL(makeURL(m_parentFrame->document()->baseURL(), url)); return load(frameLoadRequest, true, notifyData); } @@ -573,7 +573,7 @@ NPError PluginView::getURL(const char* url, const char* target) frameLoadRequest.setFrameName(target); frameLoadRequest.resourceRequest().setHTTPMethod("GET"); - frameLoadRequest.resourceRequest().setURL(makeURL(m_baseURL, url)); + frameLoadRequest.resourceRequest().setURL(makeURL(m_parentFrame->document()->baseURL(), url)); return load(frameLoadRequest, false, 0); } @@ -819,7 +819,6 @@ PluginView::PluginView(Frame* parentFrame, const IntSize& size, PluginPackage* p , m_element(element) , m_isStarted(false) , m_url(url) - , m_baseURL(m_parentFrame->document()->baseURL()) // FIXME: No need for this member variable! , m_status(PluginStatusLoadedSuccessfully) , m_requestTimer(this, &PluginView::requestTimerFired) , m_invalidateTimer(this, &PluginView::invalidateTimerFired) @@ -1200,7 +1199,7 @@ NPError PluginView::handlePost(const char* url, const char* target, uint32_t len } frameLoadRequest.resourceRequest().setHTTPMethod("POST"); - frameLoadRequest.resourceRequest().setURL(makeURL(m_baseURL, url)); + frameLoadRequest.resourceRequest().setURL(makeURL(m_parentFrame->document()->baseURL(), url)); frameLoadRequest.resourceRequest().addHTTPHeaderFields(headerFields); frameLoadRequest.resourceRequest().setHTTPBody(FormData::create(postData, postDataLength)); frameLoadRequest.setFrameName(target); @@ -1395,7 +1394,7 @@ NPError PluginView::getValueForURL(NPNURLVariable variable, const char* url, cha switch (variable) { case NPNURLVCookie: { - KURL u(m_baseURL, url); + KURL u(m_parentFrame->document()->baseURL(), url); if (u.isValid()) { Frame* frame = getFrame(parentFrame(), m_element); if (frame) { @@ -1417,7 +1416,7 @@ NPError PluginView::getValueForURL(NPNURLVariable variable, const char* url, cha break; } case NPNURLVProxy: { - KURL u(m_baseURL, url); + KURL u(m_parentFrame->document()->baseURL(), url); if (u.isValid()) { Frame* frame = getFrame(parentFrame(), m_element); const FrameLoader* frameLoader = frame ? frame->loader() : 0; @@ -1456,7 +1455,7 @@ NPError PluginView::setValueForURL(NPNURLVariable variable, const char* url, con switch (variable) { case NPNURLVCookie: { - KURL u(m_baseURL, url); + KURL u(m_parentFrame->document()->baseURL(), url); if (u.isValid()) { const String cookieStr = String::fromUTF8(value, len); Frame* frame = getFrame(parentFrame(), m_element); |