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

abarth at webkit.org abarth at webkit.org
Sun Feb 20 23:51:14 UTC 2011


The following commit has been merged in the webkit-1.3 branch:
commit d7652e8baa2927f2a7a494659a5d9d8d5800ea88
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 25 21:29:14 2011 +0000

    2011-01-25  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Eric Seidel.
    
            Empty URLs are never display isolated
            https://bugs.webkit.org/show_bug.cgi?id=53053
    
            This check mirrors the check in the local case.  There isn't a good way
            to test this with a LayoutTest, but it is tested in Chromium (where
            this registry is used).
    
            * platform/SchemeRegistry.cpp:
            (WebCore::SchemeRegistry::shouldTreatURLSchemeAsDisplayIsolated):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76637 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 2e80101..c32f00d 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2011-01-25  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Empty URLs are never display isolated
+        https://bugs.webkit.org/show_bug.cgi?id=53053
+
+        This check mirrors the check in the local case.  There isn't a good way
+        to test this with a LayoutTest, but it is tested in Chromium (where
+        this registry is used).
+
+        * platform/SchemeRegistry.cpp:
+        (WebCore::SchemeRegistry::shouldTreatURLSchemeAsDisplayIsolated):
+
 2011-01-25  Sam Weinig  <sam at webkit.org>
 
         Reviewed by Anders Carlsson.
diff --git a/Source/WebCore/platform/SchemeRegistry.cpp b/Source/WebCore/platform/SchemeRegistry.cpp
index 71697cb..0a7cb8c 100644
--- a/Source/WebCore/platform/SchemeRegistry.cpp
+++ b/Source/WebCore/platform/SchemeRegistry.cpp
@@ -131,6 +131,8 @@ void SchemeRegistry::registerURLSchemeAsDisplayIsolated(const String& scheme)
 
 bool SchemeRegistry::shouldTreatURLSchemeAsDisplayIsolated(const String& scheme)
 {
+    if (scheme.isEmpty())
+        return false;
     return displayIsolatedURLSchemes().contains(scheme);
 }
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list