[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

[darin at apple.com]

The following commit has been merged in the debian/experimental branch:
commit ff05ba76613fdf40bd0d86fb51b65f9cdb6b89d0
Author: darin at apple.com <darin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 7 16:33:38 2010 +0000

    Try to fix build.
    
    * plugins/PluginView.cpp:
    (WebCore::PluginView::start): Pass security origin.
    (WebCore::PluginView::getURLNotify): Ditto.
    (WebCore::PluginView::getURL): Ditto.
    (WebCore::PluginView::handlePost): Ditto.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73446 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 3945367..561b328 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-12-07  Darin Adler  <darin at apple.com>
+
+        Try to fix build.
+
+        * plugins/PluginView.cpp:
+        (WebCore::PluginView::start): Pass security origin.
+        (WebCore::PluginView::getURLNotify): Ditto.
+        (WebCore::PluginView::getURL): Ditto.
+        (WebCore::PluginView::handlePost): Ditto.
+
 2010-12-06  Darin Adler  <darin at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebCore/page/SecurityOrigin.cpp b/WebCore/page/SecurityOrigin.cpp
index 82af42a..a753c6d 100644
--- a/WebCore/page/SecurityOrigin.cpp
+++ b/WebCore/page/SecurityOrigin.cpp
@@ -319,17 +319,6 @@ bool SecurityOrigin::canDisplay(const KURL& url) const
     return canLoadLocalResources();
 }
 
-bool SecurityOrigin::deprecatedCanDisplay(const String& referrer, const KURL& url)
-{
-    if (!restrictAccessToLocal())
-        return true;
-
-    if (!SchemeRegistry::shouldTreatURLAsLocal(url.string()))
-        return true;
-
-    return SchemeRegistry::shouldTreatURLAsLocal(referrer);
-}
-
 void SecurityOrigin::grantLoadLocalResources()
 {
     // This function exists only to support backwards compatibility with older
diff --git a/WebCore/page/SecurityOrigin.h b/WebCore/page/SecurityOrigin.h
index db6c44e..6bdb28c 100644
--- a/WebCore/page/SecurityOrigin.h
+++ b/WebCore/page/SecurityOrigin.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007,2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -29,14 +29,9 @@
 #ifndef SecurityOrigin_h
 #define SecurityOrigin_h
 
-#include <wtf/HashSet.h>
-#include <wtf/RefCounted.h>
-#include <wtf/PassRefPtr.h>
-#include <wtf/Threading.h>
-#include <wtf/text/StringHash.h>
-
 #include "FrameLoaderTypes.h"
 #include "PlatformString.h"
+#include <wtf/ThreadSafeShared.h>
 
 namespace WebCore {
 
@@ -94,9 +89,6 @@ public:
     // display content from the user's files system.
     bool canDisplay(const KURL&) const;
 
-    // FIXME: Remove this function. This function exists only to service FrameLoader.
-    static bool deprecatedCanDisplay(const String& referrer, const KURL& targetURL);
-
     // Returns true if this SecurityOrigin can load local resources, such
     // as images, iframes, and style sheets, and can link to local URLs.
     // For example, call this function before creating an iframe to a
diff --git a/WebCore/plugins/PluginView.cpp b/WebCore/plugins/PluginView.cpp
index 62616bb..9e19e3e 100644
--- a/WebCore/plugins/PluginView.cpp
+++ b/WebCore/plugins/PluginView.cpp
@@ -258,7 +258,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);
         load(frameLoadRequest, false, 0);
@@ -563,7 +563,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");
@@ -574,7 +574,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");
@@ -1168,7 +1168,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;

-- 
WebKit Debian packaging