<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[189718] releases/WebKitGTK/webkit-2.10/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/189718">189718</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-09-14 05:42:48 -0700 (Mon, 14 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/189043">r189043</a> - Decode redirected data URLs in web process
https://bugs.webkit.org/show_bug.cgi?id=148386
Reviewed by Zalan Bujtas.
Redirected data URLs still end up to networking layer for decoding. Handle them locally as well.
Covered by existing tests.
* loader/ResourceLoader.cpp:
(WebCore::ResourceLoader::~ResourceLoader):
(WebCore::ResourceLoader::finishNetworkLoad):
Factor to a function.
(WebCore::ResourceLoader::releaseResources):
(WebCore::ResourceLoader::willSendRequestInternal):
When receiving redirect to a data URL end the network load and decode it locally.
(WebCore::ResourceLoader::willSendRequest):
* loader/ResourceLoader.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreloaderResourceLoadercpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/loader/ResourceLoader.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreloaderResourceLoaderh">releases/WebKitGTK/webkit-2.10/Source/WebCore/loader/ResourceLoader.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit210SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog (189717 => 189718)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2015-09-14 12:37:10 UTC (rev 189717)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2015-09-14 12:42:48 UTC (rev 189718)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2015-08-27 Antti Koivisto <antti@apple.com>
+
+ Decode redirected data URLs in web process
+ https://bugs.webkit.org/show_bug.cgi?id=148386
+
+ Reviewed by Zalan Bujtas.
+
+ Redirected data URLs still end up to networking layer for decoding. Handle them locally as well.
+
+ Covered by existing tests.
+
+ * loader/ResourceLoader.cpp:
+ (WebCore::ResourceLoader::~ResourceLoader):
+ (WebCore::ResourceLoader::finishNetworkLoad):
+
+ Factor to a function.
+
+ (WebCore::ResourceLoader::releaseResources):
+ (WebCore::ResourceLoader::willSendRequestInternal):
+
+ When receiving redirect to a data URL end the network load and decode it locally.
+
+ (WebCore::ResourceLoader::willSendRequest):
+ * loader/ResourceLoader.h:
+
</ins><span class="cx"> 2015-08-27 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Simple line layout: Use float types wherever possible to match line tree.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCoreloaderResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/loader/ResourceLoader.cpp (189717 => 189718)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/loader/ResourceLoader.cpp 2015-09-14 12:37:10 UTC (rev 189717)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/loader/ResourceLoader.cpp 2015-09-14 12:42:48 UTC (rev 189718)
</span><span class="lines">@@ -81,6 +81,17 @@
</span><span class="cx"> ASSERT(m_reachedTerminalState);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void ResourceLoader::finishNetworkLoad()
+{
+ platformStrategies()->loaderStrategy()->resourceLoadScheduler()->remove(this);
+
+ if (m_handle) {
+ ASSERT(m_handle->client() == this);
+ m_handle->clearClient();
+ m_handle = nullptr;
+ }
+}
+
</ins><span class="cx"> void ResourceLoader::releaseResources()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!m_reachedTerminalState);
</span><span class="lines">@@ -98,17 +109,10 @@
</span><span class="cx"> // the resources to prevent a double dealloc of WebView <rdar://problem/4372628>
</span><span class="cx"> m_reachedTerminalState = true;
</span><span class="cx">
</span><del>- platformStrategies()->loaderStrategy()->resourceLoadScheduler()->remove(this);
</del><ins>+ finishNetworkLoad();
+
</ins><span class="cx"> m_identifier = 0;
</span><span class="cx">
</span><del>- if (m_handle) {
- // Clear out the ResourceHandle's client so that it doesn't try to call
- // us back after we release it, unless it has been replaced by someone else.
- if (m_handle->client() == this)
- m_handle->clearClient();
- m_handle = nullptr;
- }
-
</del><span class="cx"> m_resourceData = nullptr;
</span><span class="cx"> m_deferredRequest = ResourceRequest();
</span><span class="cx"> }
</span><span class="lines">@@ -359,13 +363,23 @@
</span><span class="cx"> else
</span><span class="cx"> InspectorInstrumentation::willSendRequest(m_frame.get(), m_identifier, m_frame->loader().documentLoader(), request, redirectResponse);
</span><span class="cx">
</span><del>- if (!redirectResponse.isNull())
</del><ins>+ bool isRedirect = !redirectResponse.isNull();
+ if (isRedirect)
</ins><span class="cx"> platformStrategies()->loaderStrategy()->resourceLoadScheduler()->crossOriginRedirectReceived(this, request.url());
</span><span class="cx">
</span><span class="cx"> m_request = request;
</span><span class="cx">
</span><del>- if (!redirectResponse.isNull() && !m_documentLoader->isCommitted())
- frameLoader()->client().dispatchDidReceiveServerRedirectForProvisionalLoad();
</del><ins>+ if (isRedirect) {
+ auto& redirectURL = request.url();
+ if (!m_documentLoader->isCommitted())
+ frameLoader()->client().dispatchDidReceiveServerRedirectForProvisionalLoad();
+
+ if (redirectURL.protocolIsData()) {
+ // Handle data URL decoding locally.
+ finishNetworkLoad();
+ loadDataURL();
+ }
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ResourceLoader::willSendRequest(ResourceRequest&& request, const ResourceResponse& redirectResponse, std::function<void(ResourceRequest&&)>&& callback)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCoreloaderResourceLoaderh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/loader/ResourceLoader.h (189717 => 189718)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/loader/ResourceLoader.h 2015-09-14 12:37:10 UTC (rev 189717)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/loader/ResourceLoader.h 2015-09-14 12:42:48 UTC (rev 189718)
</span><span class="lines">@@ -177,6 +177,7 @@
</span><span class="cx">
</span><span class="cx"> void addDataOrBuffer(const char*, unsigned, SharedBuffer*, DataPayloadType);
</span><span class="cx"> void loadDataURL();
</span><ins>+ void finishNetworkLoad();
</ins><span class="cx">
</span><span class="cx"> // ResourceHandleClient
</span><span class="cx"> virtual void willSendRequest(ResourceHandle*, ResourceRequest&, const ResourceResponse& redirectResponse) override;
</span></span></pre>
</div>
</div>
</body>
</html>