Changeset 106856 in webkit

Timestamp:

Feb 6, 2012 2:54:41 PM (12 years ago)

Author:

ericu@chromium.org

Message:

[filesystem/Chromium] crackFileSystemURL needs to use innerURL
​https://bugs.webkit.org/show_bug.cgi?id=77881

Reviewed by Adam Barth.

• src/AsyncFileSystemChromium.cpp:

(WebCore::AsyncFileSystem::crackFileSystemURL):
Add the new code path, taken only if innerURL is present.

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• src/AsyncFileSystemChromium.cpp (modified) (1 diff)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-02-06  Eric Uhrhane  <ericu@chromium.org>
+
+        [filesystem/Chromium] crackFileSystemURL needs to use innerURL
+        https://bugs.webkit.org/show_bug.cgi?id=77881
+
+        Reviewed by Adam Barth.
+
+        * src/AsyncFileSystemChromium.cpp:
+        (WebCore::AsyncFileSystem::crackFileSystemURL):
+        Add the new code path, taken only if innerURL is present.
+
 2012-02-03  James Robinson  <jamesr@chromium.org>
 

trunk/Source/WebKit/chromium/src/AsyncFileSystemChromium.cpp

@@ -64 +64 @@
         return false;
 
-    KURL originURL(ParsedURLString, url.path());
-    String path = decodeURLEscapeSequences(originURL.path());
-    if (path.isEmpty() || path[0] != '/')
-        return false;
-    path = path.substring(1);
-
-    if (path.startsWith(temporaryPathPrefix)) {
-        type = Temporary;
-        path = path.substring(temporaryPathPrefixLength);
-    } else if (path.startsWith(persistentPathPrefix)) {
-        type = Persistent;
-        path = path.substring(persistentPathPrefixLength);
-    } else if (path.startsWith(externalPathPrefix)) {
-        type = externalType;
-        path = path.substring(externalPathPrefixLength);
-    } else
-        return false;
-
-    if (path.isEmpty() || path[0] != '/')
-        return false;
-
-    filePath.swap(path);
+    if (url.innerURL()) {
+        String typeString = url.innerURL()->path().substring(1);
+        if (typeString == temporaryPathPrefix)
+            type = Temporary;
+        else if (typeString == persistentPathPrefix)
+            type = Persistent;
+        else if (typeString == externalPathPrefix)
+            type = externalType;
+        else
+            return false;
+
+        filePath = decodeURLEscapeSequences(url.path());
+    } else {
+        // FIXME: Remove this clause once http://codereview.chromium.org/7811006
+        // lands, which makes this dead code.
+        KURL originURL(ParsedURLString, url.path());
+        String path = decodeURLEscapeSequences(originURL.path());
+        if (path.isEmpty() || path[0] != '/')
+            return false;
+        path = path.substring(1);
+
+        if (path.startsWith(temporaryPathPrefix)) {
+            type = Temporary;
+            path = path.substring(temporaryPathPrefixLength);
+        } else if (path.startsWith(persistentPathPrefix)) {
+            type = Persistent;
+            path = path.substring(persistentPathPrefixLength);
+        } else if (path.startsWith(externalPathPrefix)) {
+            type = externalType;
+            path = path.substring(externalPathPrefixLength);
+        } else
+            return false;
+
+        if (path.isEmpty() || path[0] != '/')
+            return false;
+
+        filePath.swap(path);
+    }
     return true;
 }