2009-10-06 Adam Barth <abarth@webkit.org>

        Unreviewed build fix for Windows.

        * plugins/PluginView.cpp:
        (WebCore::PluginView::load):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@49213 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 433dac9b10fc0184abec95b5c4ad28cc550a475d..57294f74fa35e578782d9974959e73d25be4fe82 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2009-10-06  Adam Barth  <abarth@webkit.org>
+
+        Unreviewed build fix for Windows.
+
+        * plugins/PluginView.cpp:
+        (WebCore::PluginView::load):
+
 2009-10-06  Adam Barth  <abarth@webkit.org>
 
         Reviewed by Eric Seidel.

diff --git a/WebCore/plugins/PluginView.cpp b/WebCore/plugins/PluginView.cpp
index 14f70537fadabdebc4a2845f1c2ed516f7871aa4..c9019eb03bfbf71e3dfd7b968f31b73f1779d4be 100644 (file)
--- a/WebCore/plugins/PluginView.cpp
+++ b/WebCore/plugins/PluginView.cpp
@@ -53,6 +53,7 @@
 #include "JSDOMBinding.h"
 #include "ScriptController.h"
 #include "ScriptValue.h"
+#include "SecurityOrigin.h"
 #include "PluginDatabase.h"
 #include "PluginDebug.h"
 #include "PluginMainThreadScheduler.h"
@@ -516,7 +517,7 @@ 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 (!FrameLoader::canLoad(url, String(), m_parentFrame->document())) {
+    } else if (!SecurityOrigin::canLoad(url, String(), m_parentFrame->document()), 0) {
             return NPERR_GENERIC_ERROR;
     }