Changeset 66815 in webkit

Timestamp:

Sep 6, 2010 12:59:30 AM (14 years ago)

Author:

abarth@webkit.org

Message:

2010-09-06 Adam Barth <​abarth@webkit.org>

Reviewed by Darin Adler.

Rename SecurityOrigin::canLoad to canDisplay
​https://bugs.webkit.org/show_bug.cgi?id=45214

canLoad is a pretty opaque name. This function is really about whether
you can display the contents of the URL in an iframe, an image, or a
plugin.

• WebCore.exp.in:
• html/HTMLMediaElement.cpp: (WebCore::HTMLMediaElement::isSafeToLoadURL):
• loader/Cache.cpp: (WebCore::Cache::requestResource):
• loader/FrameLoader.cpp: (WebCore::FrameLoader::loadFrameRequest):
• loader/PingLoader.cpp: (WebCore::PingLoader::loadImage):
• loader/SubframeLoader.cpp: (WebCore::SubframeLoader::loadMediaPlayerProxyPlugin): (WebCore::SubframeLoader::createJavaAppletWidget): (WebCore::SubframeLoader::loadSubframe): (WebCore::SubframeLoader::loadPlugin):
• loader/SubresourceLoader.cpp: (WebCore::SubresourceLoader::create):
• page/SecurityOrigin.cpp: (WebCore::SecurityOrigin::canDisplay):
• page/SecurityOrigin.h:
• plugins/PluginView.cpp: (WebCore::PluginView::load):

2010-09-06 Adam Barth <​abarth@webkit.org>

Reviewed by Darin Adler.

Rename SecurityOrigin::canLoad to canDisplay
​https://bugs.webkit.org/show_bug.cgi?id=45214

Propagate name change.

• Plugins/Hosted/NetscapePluginInstanceProxy.mm: (WebKit::NetscapePluginInstanceProxy::loadRequest):
• Plugins/WebNetscapePluginStream.mm: (WebNetscapePluginStream::WebNetscapePluginStream):
• Plugins/WebNetscapePluginView.mm: (-[WebNetscapePluginView loadRequest:inTarget:withNotifyData:sendNotification:]):
• Plugins/WebPluginContainerCheck.mm: (-[WebPluginContainerCheck _isForbiddenFileLoad]):
• WebView/WebFrame.mm: (-[WebFrame _allowsFollowingLink:]):

2010-09-06 Adam Barth <​abarth@webkit.org>

Reviewed by Darin Adler.

Rename SecurityOrigin::canLoad to canDisplay
​https://bugs.webkit.org/show_bug.cgi?id=45214

Propagate name change.

• WebFrame.cpp: (WebFrame::allowsFollowingLink):

2010-09-06 Adam Barth <​abarth@webkit.org>

Reviewed by Darin Adler.

Rename SecurityOrigin::canLoad to canDisplay
​https://bugs.webkit.org/show_bug.cgi?id=45214

Propagate name change.

• WebProcess/Plugins/PluginView.cpp: (WebKit::PluginView::performFrameLoadURLRequest):

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.exp.in (modified) (2 diffs)
• WebCore/html/HTMLMediaElement.cpp (modified) (1 diff)
• WebCore/loader/Cache.cpp (modified) (1 diff)
• WebCore/loader/FrameLoader.cpp (modified) (1 diff)
• WebCore/loader/PingLoader.cpp (modified) (1 diff)
• WebCore/loader/SubframeLoader.cpp (modified) (4 diffs)
• WebCore/loader/SubresourceLoader.cpp (modified) (1 diff)
• WebCore/page/SecurityOrigin.cpp (modified) (1 diff)
• WebCore/page/SecurityOrigin.h (modified) (1 diff)
• WebCore/plugins/PluginView.cpp (modified) (1 diff)
• WebKit/mac/ChangeLog (modified) (1 diff)
• WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm (modified) (1 diff)
• WebKit/mac/Plugins/WebNetscapePluginStream.mm (modified) (1 diff)
• WebKit/mac/Plugins/WebNetscapePluginView.mm (modified) (1 diff)
• WebKit/mac/Plugins/WebPluginContainerCheck.mm (modified) (1 diff)
• WebKit/mac/WebView/WebFrame.mm (modified) (1 diff)
• WebKit/win/ChangeLog (modified) (1 diff)
• WebKit/win/WebFrame.cpp (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/WebProcess/Plugins/PluginView.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-09-06  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Darin Adler.
+
+        Rename SecurityOrigin::canLoad to canDisplay
+        https://bugs.webkit.org/show_bug.cgi?id=45214
+
+        canLoad is a pretty opaque name.  This function is really about whether
+        you can display the contents of the URL in an iframe, an image, or a
+        plugin.
+
+        * WebCore.exp.in:
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::isSafeToLoadURL):
+        * loader/Cache.cpp:
+        (WebCore::Cache::requestResource):
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::loadFrameRequest):
+        * loader/PingLoader.cpp:
+        (WebCore::PingLoader::loadImage):
+        * loader/SubframeLoader.cpp:
+        (WebCore::SubframeLoader::loadMediaPlayerProxyPlugin):
+        (WebCore::SubframeLoader::createJavaAppletWidget):
+        (WebCore::SubframeLoader::loadSubframe):
+        (WebCore::SubframeLoader::loadPlugin):
+        * loader/SubresourceLoader.cpp:
+        (WebCore::SubresourceLoader::create):
+        * page/SecurityOrigin.cpp:
+        (WebCore::SecurityOrigin::canDisplay):
+        * page/SecurityOrigin.h:
+        * plugins/PluginView.cpp:
+        (WebCore::PluginView::load):
+
 2010-08-31  Yury Semikhatsky  <yurys@chromium.org>
 

trunk/WebCore/WebCore.exp.in

@@ -315 +315 @@
 __ZN7WebCore14SchemeRegistry25registerURLSchemeAsSecureERKN3WTF6StringE
 __ZN7WebCore14SchemeRegistry32registerURLSchemeAsEmptyDocumentERKN3WTF6StringE
+__ZN7WebCore14SecurityOrigin10canDisplayERKNS_4KURLERKN3WTF6StringEPNS_8DocumentE
 __ZN7WebCore14SecurityOrigin16createFromStringERKN3WTF6StringE
 __ZN7WebCore14SecurityOrigin18setLocalLoadPolicyENS0_15LocalLoadPolicyE
@@ -323 +324 @@
 __ZN7WebCore14SecurityOrigin40setDomainRelaxationForbiddenForURLSchemeEbRKN3WTF6StringE
 __ZN7WebCore14SecurityOrigin6createERKNS_4KURLEi
-__ZN7WebCore14SecurityOrigin7canLoadERKNS_4KURLERKN3WTF6StringEPNS_8DocumentE
 __ZN7WebCore15ArchiveResource6createEN3WTF10PassRefPtrINS_12SharedBufferEEERKNS_4KURLERKNS1_6StringESA_SA_RKNS_16ResourceResponseE
 __ZN7WebCore15DOMWrapperWorld15unregisterWorldEv

trunk/WebCore/html/HTMLMediaElement.cpp

@@ -700 +700 @@
 
     // don't allow remote to local urls, and check with the frame loader client.
-    if (!loader || !SecurityOrigin::canLoad(url, String(), document())) {
+    if (!loader || !SecurityOrigin::canDisplay(url, String(), document())) {
         if (actionIfInvalid == Complain)
             FrameLoader::reportLocalLoadFailed(frame, url.string());

trunk/WebCore/loader/Cache.cpp

@@ -107 +107 @@
         return 0;
     
-    if (SecurityOrigin::restrictAccessToLocal() && !SecurityOrigin::canLoad(url, String(), docLoader->doc())) {
+    if (SecurityOrigin::restrictAccessToLocal() && !SecurityOrigin::canDisplay(url, String(), docLoader->doc())) {
         Document* doc = docLoader->doc();
         if (doc && !requestIsPreload)

trunk/WebCore/loader/FrameLoader.cpp

@@ -1262 +1262 @@
     ASSERT(frame()->document());
     if (SchemeRegistry::shouldTreatURLAsLocal(url.string()) && !isFeedWithNestedProtocolInHTTPFamily(url)) {
-        if (!SecurityOrigin::canLoad(url, String(), frame()->document()) && !SecurityOrigin::canLoad(url, referrer, 0)) {
+        if (!SecurityOrigin::canDisplay(url, String(), frame()->document()) && !SecurityOrigin::canDisplay(url, referrer, 0)) {
             FrameLoader::reportLocalLoadFailed(m_frame, url.string());
             return;

trunk/WebCore/loader/PingLoader.cpp

@@ -43 +43 @@
 void PingLoader::loadImage(Frame* frame, const KURL& url)
 {
-    if (SecurityOrigin::restrictAccessToLocal() && !SecurityOrigin::canLoad(url, String(), frame->document())) {
+    if (SecurityOrigin::restrictAccessToLocal() && !SecurityOrigin::canDisplay(url, String(), frame->document())) {
         FrameLoader::reportLocalLoadFailed(frame, url);
         return;

trunk/WebCore/loader/SubframeLoader.cpp

@@ -148 +148 @@
         completedURL = completeURL(url);
 
-    if (!SecurityOrigin::canLoad(completedURL, String(), m_frame->document())) {
+    if (!SecurityOrigin::canDisplay(completedURL, String(), m_frame->document())) {
         FrameLoader::reportLocalLoadFailed(m_frame, completedURL.string());
         return 0;
@@ -206 +206 @@
     if (!codeBaseURLString.isEmpty()) {
         KURL codeBaseURL = completeURL(codeBaseURLString);
-        if (!SecurityOrigin::canLoad(codeBaseURL, String(), element->document())) {
+        if (!SecurityOrigin::canDisplay(codeBaseURL, String(), element->document())) {
             FrameLoader::reportLocalLoadFailed(m_frame, codeBaseURL.string());
             return 0;
@@ -248 +248 @@
     }
 
-    if (!SecurityOrigin::canLoad(url, String(), ownerElement->document())) {
+    if (!SecurityOrigin::canDisplay(url, String(), ownerElement->document())) {
         FrameLoader::reportLocalLoadFailed(m_frame, url.string());
         return 0;
@@ -337 +337 @@
         return false;
 
-    if (!SecurityOrigin::canLoad(url, String(), document())) {
+    if (!SecurityOrigin::canDisplay(url, String(), document())) {
         FrameLoader::reportLocalLoadFailed(m_frame, url.string());
         return false;

trunk/WebCore/loader/SubresourceLoader.cpp

@@ -74 +74 @@
     if (securityCheck == DoSecurityCheck
             && SecurityOrigin::restrictAccessToLocal()
-            && !SecurityOrigin::canLoad(request.url(), String(), frame->document())) {
+            && !SecurityOrigin::canDisplay(request.url(), String(), frame->document())) {
         FrameLoader::reportLocalLoadFailed(frame, request.url().string());
         return 0;

trunk/WebCore/page/SecurityOrigin.cpp

@@ -285 +285 @@
 }
   
-bool SecurityOrigin::canLoad(const KURL& url, const String& referrer, Document* document)
+bool SecurityOrigin::canDisplay(const KURL& url, const String& referrer, Document* document)
 {
 #if ENABLE(BLOB)

trunk/WebCore/page/SecurityOrigin.h

@@ -85 +85 @@
     bool taintsCanvas(const KURL&) const;
 
-    // Returns true for any non-local URL. If document parameter is supplied,
-    // its local load policy dictates, otherwise if referrer is non-empty and
-    // represents a local file, then the local load is allowed.
-    static bool canLoad(const KURL&, const String& referrer, Document* document);
+    // Returns true if |document| can display content from the given URL (e.g.,
+    // in an iframe or as an image). For example, web sites generally cannot
+    // display content from the user's files system. If |document| is 0,
+    // |referrer| is used to make this determination.
+    static bool canDisplay(const KURL&, const String& referrer, Document* document);
 
     // Returns true if this SecurityOrigin can load local resources, such

trunk/WebCore/plugins/PluginView.cpp

@@ -538 +538 @@
         if (!targetFrameName.isNull() && m_parentFrame->tree()->find(targetFrameName) != m_parentFrame)
             return NPERR_INVALID_PARAM;
-    } else if (!SecurityOrigin::canLoad(url, String(), m_parentFrame->document()))
+    } else if (!SecurityOrigin::canDisplay(url, String(), m_parentFrame->document()))
             return NPERR_GENERIC_ERROR;
 

trunk/WebKit/mac/ChangeLog

@@ +1 @@
+2010-09-06  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Darin Adler.
+
+        Rename SecurityOrigin::canLoad to canDisplay
+        https://bugs.webkit.org/show_bug.cgi?id=45214
+
+        Propagate name change.
+
+        * Plugins/Hosted/NetscapePluginInstanceProxy.mm:
+        (WebKit::NetscapePluginInstanceProxy::loadRequest):
+        * Plugins/WebNetscapePluginStream.mm:
+        (WebNetscapePluginStream::WebNetscapePluginStream):
+        * Plugins/WebNetscapePluginView.mm:
+        (-[WebNetscapePluginView loadRequest:inTarget:withNotifyData:sendNotification:]):
+        * Plugins/WebPluginContainerCheck.mm:
+        (-[WebPluginContainerCheck _isForbiddenFileLoad]):
+        * WebView/WebFrame.mm:
+        (-[WebFrame _allowsFollowingLink:]):
+
 2010-09-03  Jesus Sanchez-Palencia  <jesus.palencia@openbossa.org>
 

trunk/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm

@@ -763 +763 @@
         }
     } else {
-        if (!SecurityOrigin::canLoad(URL, String(), core([m_pluginView webFrame])->document()))
+        if (!SecurityOrigin::canDisplay(URL, String(), core([m_pluginView webFrame])->document()))
             return NPERR_GENERIC_ERROR;
     }

trunk/WebKit/mac/Plugins/WebNetscapePluginStream.mm

@@ -162 +162 @@
     
     // This check has already been done by the plug-in view.
-    ASSERT(SecurityOrigin::canLoad([request URL], String(), core([view webFrame])->document()));
+    ASSERT(SecurityOrigin::canDisplay([request URL], String(), core([view webFrame])->document()));
     
     ASSERT([request URL]);

trunk/WebKit/mac/Plugins/WebNetscapePluginView.mm

@@ -1729 +1729 @@
         }
     } else {
-        if (!SecurityOrigin::canLoad(URL, String(), core([self webFrame])->document()))
+        if (!SecurityOrigin::canDisplay(URL, String(), core([self webFrame])->document()))
             return NPERR_GENERIC_ERROR;
     }

trunk/WebKit/mac/Plugins/WebPluginContainerCheck.mm

@@ -100 +100 @@
    Frame* coreFrame = core([_controller webFrame]);
    ASSERT(coreFrame);
-   if (!SecurityOrigin::canLoad([_request URL], String(), coreFrame->document())) {
+   if (!SecurityOrigin::canDisplay([_request URL], String(), coreFrame->document())) {
        [self _continueWithPolicy:PolicyIgnore];
        return YES;

trunk/WebKit/mac/WebView/WebFrame.mm

@@ -1283 +1283 @@
     if (!_private->coreFrame)
         return YES;
-    return SecurityOrigin::canLoad(URL, String(), _private->coreFrame->document());
+    return SecurityOrigin::canDisplay(URL, String(), _private->coreFrame->document());
 }
 

trunk/WebKit/win/ChangeLog

@@ +1 @@
+2010-09-06  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Darin Adler.
+
+        Rename SecurityOrigin::canLoad to canDisplay
+        https://bugs.webkit.org/show_bug.cgi?id=45214
+
+        Propagate name change.
+
+        * WebFrame.cpp:
+        (WebFrame::allowsFollowingLink):
+
 2010-09-03  Jesus Sanchez-Palencia  <jesus.palencia@openbossa.org>
 

trunk/WebKit/win/WebFrame.cpp

@@ -1354 +1354 @@
         return E_FAIL;
 
-    *result = SecurityOrigin::canLoad(MarshallingHelpers::BSTRToKURL(url), String(), frame->document());
+    *result = SecurityOrigin::canDisplay(MarshallingHelpers::BSTRToKURL(url), String(), frame->document());
     return S_OK;
 }

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-09-06  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Darin Adler.
+
+        Rename SecurityOrigin::canLoad to canDisplay
+        https://bugs.webkit.org/show_bug.cgi?id=45214
+
+        Propagate name change.
+
+        * WebProcess/Plugins/PluginView.cpp:
+        (WebKit::PluginView::performFrameLoadURLRequest):
+
 2010-09-04  Sam Weinig  <sam@webkit.org>
 

trunk/WebKit2/WebProcess/Plugins/PluginView.cpp

@@ -516 +516 @@
 
     // Check if this is URL can be loaded.
-    if (!SecurityOrigin::canLoad(request->request().url(), String(), m_pluginElement->document())) {
+    if (!SecurityOrigin::canDisplay(request->request().url(), String(), m_pluginElement->document())) {
         // We can't load the request, send back a reply to the plug-in.
         m_plugin->frameDidFail(request->requestID(), false);