[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[antonm at chromium.org]

The following commit has been merged in the webkit-1.3 branch:
commit 86fddb96c952dee4e27e94aac0b7ff07594010ff
Author: antonm at chromium.org <antonm at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Feb 1 20:27:01 2011 +0000

    2011-02-01  Anton Muhin  <antonm at chromium.org>
    
            Reviewed by Adam Barth.
    
            Allow access for security origin same as this.
            https://bugs.webkit.org/show_bug.cgi?id=53440
    
            Hard to test as newly added path currently is never hit.
    
            * page/SecurityOrigin.cpp:
            (WebCore::SecurityOrigin::canAccess): allow access if this == other
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77272 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 4f86f97..115d60d 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2011-02-01  Anton Muhin  <antonm at chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Allow access for security origin same as this.
+        https://bugs.webkit.org/show_bug.cgi?id=53440
+
+        Hard to test as newly added path currently is never hit.
+
+        * page/SecurityOrigin.cpp:
+        (WebCore::SecurityOrigin::canAccess): allow access if this == other
+
 2011-01-31  Oliver Hunt  <oliver at apple.com>
 
         Reviewed by Geoffrey Garen.
diff --git a/Source/WebCore/page/SecurityOrigin.cpp b/Source/WebCore/page/SecurityOrigin.cpp
index 789fdf9..c7505f3 100644
--- a/Source/WebCore/page/SecurityOrigin.cpp
+++ b/Source/WebCore/page/SecurityOrigin.cpp
@@ -178,6 +178,9 @@ bool SecurityOrigin::canAccess(const SecurityOrigin* other) const
     if (m_universalAccess)
         return true;
 
+    if (this == other)
+        return true;
+
     if (isUnique() || other->isUnique())
         return false;
 

-- 
WebKit Debian packaging