Changeset 28343 in webkit

Timestamp:

Dec 3, 2007 2:36:03 AM (16 years ago)

Author:

zecke@webkit.org

Message:

2007-12-02 Holger Hans Peter Freyther <​holger.freyther@trolltech.com>

Reviewed by Sam Weinig.

• Add FrameLoader::shouldTreatSchemeAsLocal which is similar to shouldTreatURLAsLocal.
• Make use of FrameLoader::shouldTreatSchemeAsLocal in SecurityOrigin and do not hardcode "file". This is needed for the WebKit/qt port to make the Web Inspector work as it using the qrc protocol instead of file.

• loader/FrameLoader.cpp: (WebCore::FrameLoader::shouldTreatSchemeAsLocal):
• loader/FrameLoader.h:
• platform/SecurityOrigin.cpp: (WebCore::SecurityOrigin::isSecureTransitionTo):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/FrameLoader.cpp (modified) (1 diff)
• loader/FrameLoader.h (modified) (1 diff)
• platform/SecurityOrigin.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-12-02  Holger Hans Peter Freyther  <holger.freyther@trolltech.com>
+
+        Reviewed by Sam Weinig.
+
+        * Add FrameLoader::shouldTreatSchemeAsLocal which is similar to
+        shouldTreatURLAsLocal.
+        * Make use of FrameLoader::shouldTreatSchemeAsLocal in SecurityOrigin
+        and do not hardcode "file". This is needed for the WebKit/qt port to make
+        the Web Inspector work as it using the qrc protocol instead of file.
+
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::shouldTreatSchemeAsLocal):
+        * loader/FrameLoader.h:
+        * platform/SecurityOrigin.cpp:
+        (WebCore::SecurityOrigin::isSecureTransitionTo):
+
 2007-12-02  Holger Hans Peter Freyther  <holger.freyther@trolltech.com>
 

trunk/WebCore/loader/FrameLoader.cpp

@@ -4634 +4634 @@
 }
 
+bool FrameLoader::shouldTreatSchemeAsLocal(const String& scheme)
+{
+    // This avoids an allocation of another String and the HashSet contains()
+    // call for the file: and http: schemes.
+    if (scheme.length() == 4) {
+        const UChar* s = scheme.characters();
+        if (s[0] == 'h' && s[1] == 't' && s[2] == 't' && s[3] == 'p')
+            return false;
+        if (s[0] == 'f' && s[1] == 'i' && s[2] == 'l' && s[3] == 'e')
+            return true;
+    }
+
+    if (scheme.isEmpty())
+        return false;
+
+    return localSchemes().contains(scheme);
+}
+
 void FrameLoader::dispatchDidCommitLoad()
 {

trunk/WebCore/loader/FrameLoader.h

@@ -422 +422 @@
         static bool restrictAccessToLocal();
         static void setRestrictAccessToLocal(bool);
-        static bool shouldTreatURLAsLocal(const String& url);
+        static bool shouldTreatURLAsLocal(const String&);
+        static bool shouldTreatSchemeAsLocal(const String&);
 
 #if USE(LOW_BANDWIDTH_DISPLAY)    

trunk/WebCore/platform/SecurityOrigin.cpp

@@ -111 +111 @@
 bool SecurityOrigin::canAccess(const SecurityOrigin& other) const
 {
-    if (m_protocol == "file")
+    if (FrameLoader::shouldTreatSchemeAsLocal(m_protocol))
         return true;
 
@@ -129 +129 @@
         return true;
 
-    if (m_protocol == "file")
+    if (FrameLoader::shouldTreatSchemeAsLocal(m_protocol))
         return true;