[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[abarth at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 949b3b300e3bd5a9421ccb96de6ebdcf14f7407a
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 7 01:28:55 2009 +0000

    2009-10-06  Adam Barth  <abarth at webkit.org>
    
            Unreviewed build fix for Windows.
    
            * plugins/PluginView.cpp:
            (WebCore::PluginView::load):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49213 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 433dac9..57294f7 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,12 @@
 2009-10-06  Adam Barth  <abarth at webkit.org>
 
+        Unreviewed build fix for Windows.
+
+        * plugins/PluginView.cpp:
+        (WebCore::PluginView::load):
+
+2009-10-06  Adam Barth  <abarth at webkit.org>
+
         Reviewed by Eric Seidel.
 
         Move FrameLoader::canLoad to SecurityOrigin
diff --git a/WebCore/plugins/PluginView.cpp b/WebCore/plugins/PluginView.cpp
index 14f7053..c9019eb 100644
--- 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;
     }
 

-- 
WebKit Debian packaging