Commit 30a07f5d authored by aroben@apple.com's avatar aroben@apple.com
Browse files

Fix typo in PluginView::load that was causing cross-origin loads to be allowed

This typo was introduced in the build fix in r49213.

Fixes <http://webkit.org/b/30168> REGRESSION (r49213):
http/tests/plugins/local-geturl-from-remote.html is failing on Windows

Reviewed by Sam Weinig.

* plugins/PluginView.cpp:
(WebCore::PluginView::load): Removed a comma operator that was making
a condition always evaluate to true.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49244 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 1d2e1452
2009-10-07 Adam Roben <aroben@apple.com>
Fix typo in PluginView::load that was causing cross-origin loads to
be allowed
This typo was introduced in the build fix in r49213.
Fixes <http://webkit.org/b/30168> REGRESSION (r49213):
http/tests/plugins/local-geturl-from-remote.html is failing on Windows
Reviewed by Sam Weinig.
* plugins/PluginView.cpp:
(WebCore::PluginView::load): Removed a comma operator that was making
a condition always evaluate to true.
2009-10-07 Kenneth Rohde Christiansen <kenneth@webkit.org>
 
Reviewed by Simon Hausmann.
......@@ -517,9 +517,8 @@ NPError PluginView::load(const FrameLoadRequest& frameLoadRequest, bool sendNoti
// For security reasons, only allow JS requests to be made on the frame that contains the plug-in.
if (!targetFrameName.isNull() && m_parentFrame->tree()->find(targetFrameName) != m_parentFrame)
return NPERR_INVALID_PARAM;
} else if (!SecurityOrigin::canLoad(url, String(), m_parentFrame->document()), 0) {
} else if (!SecurityOrigin::canLoad(url, String(), m_parentFrame->document()))
return NPERR_GENERIC_ERROR;
}
PluginRequest* request = new PluginRequest(frameLoadRequest, sendNotification, notifyData, arePopupsAllowed());
scheduleRequest(request);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment