Changeset 49213 in webkit

Timestamp:

Oct 6, 2009 6:28:55 PM (15 years ago)

Author:

abarth@webkit.org

Message:

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

Unreviewed build fix for Windows.

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

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• plugins/PluginView.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+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>
 

trunk/WebCore/plugins/PluginView.cpp

@@ -54 +54 @@
 #include "ScriptController.h"
 #include "ScriptValue.h"
+#include "SecurityOrigin.h"
 #include "PluginDatabase.h"
 #include "PluginDebug.h"
@@ -517 +518 @@
         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;
     }