Changeset 192458 in webkit

Timestamp:

Nov 14, 2015 9:23:08 PM (8 years ago)

Author:

Antti Koivisto

Message:

Regression(r188820): Downloads of data URLs is broken
​https://bugs.webkit.org/show_bug.cgi?id=150900
rdar://problem/23399223

Reviewed by Darin Adler.

No test, the current test infrastructure only allows testing policy decisions, not the actual download.

• loader/DocumentLoader.cpp:

(WebCore::DocumentLoader::continueAfterContentPolicy):

Use normal download path for data URLs instead of trying to convert the main resource load.
Since we decode data URLs locally there is no associated resource load on WebKit side.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/DocumentLoader.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-11-14  Antti Koivisto  <antti@apple.com>
+
+        Regression(r188820): Downloads of data URLs is broken
+        https://bugs.webkit.org/show_bug.cgi?id=150900
+        rdar://problem/23399223
+
+        Reviewed by Darin Adler.
+
+        No test, the current test infrastructure only allows testing policy decisions, not the actual download.
+
+        * loader/DocumentLoader.cpp:
+        (WebCore::DocumentLoader::continueAfterContentPolicy):
+
+        Use normal download path for data URLs instead of trying to convert the main resource load.
+        Since we decode data URLs locally there is no associated resource load on WebKit side.
+
 2015-11-14  Nan Wang  <n_wang@apple.com>
 

trunk/Source/WebCore/loader/DocumentLoader.cpp

@@ -728 +728 @@
         // Download may use this knowledge for purposes unrelated to cookies, notably for setting file quarantine data.
         frameLoader()->setOriginalURLForDownloadRequest(m_request);
-        frameLoader()->client().convertMainResourceLoadToDownload(this, m_request, m_response);
+
+        if (m_request.url().protocolIsData()) {
+            // We decode data URL internally, there is no resource load to convert.
+            frameLoader()->client().startDownload(m_request);
+        } else
+            frameLoader()->client().convertMainResourceLoadToDownload(this, m_request, m_response);
 
         // It might have gone missing