Changeset 69183 in webkit

Timestamp:

Oct 6, 2010 3:59:43 AM (14 years ago)

Author:

Patrick Gansterer

Message:

2010-10-06 Patrick Gansterer <Patrick Gansterer>

Reviewed by Darin Adler.

Move parseDataUrl() from CURL into own file
​https://bugs.webkit.org/show_bug.cgi?id=41462

Move the data URL parsing algorithm into a new file to use it in ResourceHandleWin too.

• CMakeLists.txt:
• WebCore.gypi:
• WebCore.vcproj/WebCore.vcproj:
• platform/network/DataURL.cpp: Added. (WebCore::handleDataURL):
• platform/network/DataURL.h: Added.
• platform/network/curl/ResourceHandleManager.cpp: (WebCore::ResourceHandleManager::dispatchSynchronousJob): (WebCore::ResourceHandleManager::startJob):
• platform/network/win/ResourceHandleWin.cpp: (WebCore::ResourceHandle::start): (WebCore::ResourceHandle::fileLoadTimer):

Location:

trunk/WebCore

Files:

• CMakeLists.txt (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• WebCore.gypi (modified) (1 diff)
• WebCore.vcproj/WebCore.vcproj (modified) (1 diff)
• platform/network/DataURL.cpp (added)
• platform/network/DataURL.h (added)
• platform/network/curl/ResourceHandleManager.cpp (modified) (5 diffs)
• platform/network/win/ResourceHandleWin.cpp (modified) (3 diffs)

trunk/WebCore/CMakeLists.txt

@@ -1339 +1339 @@
     platform/network/BlobResourceHandle.cpp
     platform/network/Credential.cpp
+    platform/network/DataURL.cpp
     platform/network/FormDataBuilder.cpp
     platform/network/FormData.cpp

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-10-06  Patrick Gansterer  <paroga@webkit.org>
+
+        Reviewed by Darin Adler.
+
+        Move parseDataUrl() from CURL into own file
+        https://bugs.webkit.org/show_bug.cgi?id=41462
+
+        Move the data URL parsing algorithm into a new file to use it in ResourceHandleWin too.
+
+        * CMakeLists.txt:
+        * WebCore.gypi:
+        * WebCore.vcproj/WebCore.vcproj:
+        * platform/network/DataURL.cpp: Added.
+        (WebCore::handleDataURL):
+        * platform/network/DataURL.h: Added.
+        * platform/network/curl/ResourceHandleManager.cpp:
+        (WebCore::ResourceHandleManager::dispatchSynchronousJob):
+        (WebCore::ResourceHandleManager::startJob):
+        * platform/network/win/ResourceHandleWin.cpp:
+        (WebCore::ResourceHandle::start):
+        (WebCore::ResourceHandle::fileLoadTimer):
+
 2010-10-06  Dirk Schulze  <krit@webkit.org>
 

trunk/WebCore/WebCore.gypi

@@ -3007 +3007 @@
             'platform/network/Credential.h',
             'platform/network/DNS.h',
+            'platform/network/DataURL.cpp',
+            'platform/network/DataURL.h',
             'platform/network/FormData.cpp',
             'platform/network/FormData.h',

trunk/WebCore/WebCore.vcproj/WebCore.vcproj

@@ -27427 +27427 @@
                                 </File>
                                 <File
+                                        RelativePath="..\platform\network\DataURL.cpp"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\platform\network\DataURL.h"
+                                        >
+                                </File>
+                                <File
                                         RelativePath="..\platform\network\FormData.cpp"
                                         >

trunk/WebCore/platform/network/curl/ResourceHandleManager.cpp

@@ -35 +35 @@
 #include "ResourceHandleManager.h"
 
-#include "Base64.h"
+#include "DataURL.h"
 #include "HTTPParsers.h"
 #include "MIMETypeRegistry.h"
@@ -42 +42 @@
 #include "ResourceHandle.h"
 #include "ResourceHandleInternal.h"
-#include "TextEncoding.h"
 
 #include <errno.h>
@@ -574 +573 @@
 }
 
-static void parseDataUrl(ResourceHandle* handle)
-{
-    ResourceHandleClient* client = handle->client();
-
-    ASSERT(client);
-    if (!client)
-        return;
-
-    String url = handle->firstRequest().url().string();
-    ASSERT(url.startsWith("data:", false));
-
-    int index = url.find(',');
-    if (index == -1) {
-        client->cannotShowURL(handle);
-        return;
-    }
-
-    String mediaType = url.substring(5, index - 5);
-    String data = url.substring(index + 1);
-
-    bool base64 = mediaType.endsWith(";base64", false);
-    if (base64)
-        mediaType = mediaType.left(mediaType.length() - 7);
-
-    if (mediaType.isEmpty())
-        mediaType = "text/plain;charset=US-ASCII";
-
-    String mimeType = extractMIMETypeFromMediaType(mediaType);
-    String charset = extractCharsetFromMediaType(mediaType);
-
-    ResourceResponse response;
-    response.setMimeType(mimeType);
-
-    if (base64) {
-        data = decodeURLEscapeSequences(data);
-        response.setTextEncodingName(charset);
-        client->didReceiveResponse(handle, response);
-
-        // WebCore's decoder fails on Acid3 test 97 (whitespace).
-        Vector<char> out;
-        CString latin1 = data.latin1();
-        if (base64Decode(latin1.data(), latin1.length(), out) && out.size() > 0)
-            client->didReceiveData(handle, out.data(), out.size(), 0);
-    } else {
-        // We have to convert to UTF-16 early due to limitations in KURL
-        data = decodeURLEscapeSequences(data, TextEncoding(charset));
-        response.setTextEncodingName("UTF-16");
-        client->didReceiveResponse(handle, response);
-        if (data.length() > 0)
-            client->didReceiveData(handle, reinterpret_cast<const char*>(data.characters()), data.length() * sizeof(UChar), 0);
-    }
-
-    client->didFinishLoading(handle, 0);
-}
-
 void ResourceHandleManager::dispatchSynchronousJob(ResourceHandle* job)
 {
@@ -634 +578 @@
 
     if (kurl.protocolIs("data")) {
-        parseDataUrl(job);
+        handleDataURL(job);
         return;
     }
@@ -665 +609 @@
 
     if (kurl.protocolIs("data")) {
-        parseDataUrl(job);
+        handleDataURL(job);
         return;
     }

trunk/WebCore/platform/network/win/ResourceHandleWin.cpp

@@ -28 +28 @@
 #include "ResourceHandle.h"
 
+#include "DataURL.h"
 #include "HTTPParsers.h"
 #include "MIMETypeRegistry.h"
@@ -260 +261 @@
 bool ResourceHandle::start(NetworkingContext* context)
 {
-    if (request().url().isLocalFile()) {
+    if (firstRequest().url().isLocalFile() || firstRequest().url().protocolIs("data")) {
         ref(); // balanced by deref in fileLoadTimer
         if (d->m_loadSynchronously)
@@ -349 +350 @@
     RefPtr<ResourceHandle> protector(this);
     deref(); // balances ref in start
+
+    if (firstRequest().url().protocolIs("data")) {
+        handleDataURL(this);
+        return;
+    }
 
     String fileName = firstRequest().url().fileSystemPath();