diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-05 14:36:32 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-05-10 15:38:30 +0100 |
| commit | f05b935882198ccf7d81675736e3aeb089c5113a (patch) | |
| tree | 4ea0ca838d9ef1b15cf17ddb3928efb427c7e5a1 /WebCore/plugins/PluginView.cpp | |
| parent | 60fbdcc62bced8db2cb1fd233cc4d1e4ea17db1b (diff) | |
| download | external_webkit-f05b935882198ccf7d81675736e3aeb089c5113a.zip external_webkit-f05b935882198ccf7d81675736e3aeb089c5113a.tar.gz external_webkit-f05b935882198ccf7d81675736e3aeb089c5113a.tar.bz2 | |
Merge WebKit at r74534: Initial merge by git.
Change-Id: I6ccd1154fa1b19c2ec2a66878eb675738735f1eb
Diffstat (limited to 'WebCore/plugins/PluginView.cpp')
| -rw-r--r-- | WebCore/plugins/PluginView.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/WebCore/plugins/PluginView.cpp b/WebCore/plugins/PluginView.cpp index ef35579..f06daf4 100644 --- a/WebCore/plugins/PluginView.cpp +++ b/WebCore/plugins/PluginView.cpp @@ -272,7 +272,7 @@ bool PluginView::start() m_isStarted = true; if (!m_url.isEmpty() && !m_loadManually) { - FrameLoadRequest frameLoadRequest; + FrameLoadRequest frameLoadRequest(m_parentFrame->document()->securityOrigin()); frameLoadRequest.resourceRequest().setHTTPMethod("GET"); frameLoadRequest.resourceRequest().setURL(m_url); #ifdef ANDROID_PLUGINS @@ -588,7 +588,7 @@ static KURL makeURL(const KURL& baseURL, const char* relativeURLString) NPError PluginView::getURLNotify(const char* url, const char* target, void* notifyData) { - FrameLoadRequest frameLoadRequest; + FrameLoadRequest frameLoadRequest(m_parentFrame->document()->securityOrigin()); frameLoadRequest.setFrameName(target); frameLoadRequest.resourceRequest().setHTTPMethod("GET"); @@ -604,7 +604,7 @@ NPError PluginView::getURLNotify(const char* url, const char* target, void* noti NPError PluginView::getURL(const char* url, const char* target) { - FrameLoadRequest frameLoadRequest; + FrameLoadRequest frameLoadRequest(m_parentFrame->document()->securityOrigin()); frameLoadRequest.setFrameName(target); frameLoadRequest.resourceRequest().setHTTPMethod("GET"); @@ -1242,7 +1242,7 @@ NPError PluginView::handlePost(const char* url, const char* target, uint32_t len if (!url || !len || !buf) return NPERR_INVALID_PARAM; - FrameLoadRequest frameLoadRequest; + FrameLoadRequest frameLoadRequest(m_parentFrame->document()->securityOrigin()); HTTPHeaderMap headerFields; Vector<char> buffer; |