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

[darin at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 062607078ac382bcc972047a4f420769d8950035
Author: darin at apple.com <darin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 16 18:15:19 2010 +0000

    2010-11-16  Darin Adler  <darin at apple.com>
    
            Reviewed by Sam Weinig.
    
            https://bugs.webkit.org/show_bug.cgi?id=48603
            Boolean logic mistake in local file check
    
            * loader/FrameLoader.cpp:
            (WebCore::FrameLoader::loadFrameRequest): Fix logic so that both checks have to pass
            before accepting a local file load.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72115 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index ef4e476..8599ae2 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-11-16  Darin Adler  <darin at apple.com>
+
+        Reviewed by Sam Weinig.
+
+        https://bugs.webkit.org/show_bug.cgi?id=48603
+        Boolean logic mistake in local file check
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::loadFrameRequest): Fix logic so that both checks have to pass
+        before accepting a local file load.
+
 2010-11-15  Darin Adler  <darin at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebCore/loader/FrameLoader.cpp b/WebCore/loader/FrameLoader.cpp
index 58113c2..f1f70d1 100644
--- a/WebCore/loader/FrameLoader.cpp
+++ b/WebCore/loader/FrameLoader.cpp
@@ -1256,7 +1256,7 @@ void FrameLoader::loadFrameRequest(const FrameLoadRequest& request, bool lockHis
     ASSERT(frame()->document());
     // FIXME: Should we move the isFeedWithNestedProtocolInHTTPFamily logic inside SecurityOrigin::canDisplay?
     if (!isFeedWithNestedProtocolInHTTPFamily(url)) {
-        if (!frame()->document()->securityOrigin()->canDisplay(url) && !SecurityOrigin::deprecatedCanDisplay(referrer, url)) {
+        if (!(frame()->document()->securityOrigin()->canDisplay(url) && SecurityOrigin::deprecatedCanDisplay(referrer, url))) {
             reportLocalLoadFailed(m_frame, url.string());
             return;
         }

-- 
WebKit Debian packaging