<!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>[201946] trunk/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/201946">201946</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2016-06-10 15:26:34 -0700 (Fri, 10 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>handleDataURL is only used by curl
https://bugs.webkit.org/show_bug.cgi?id=158636
Reviewed by Tim Horton.
* CMakeLists.txt:
* platform/network/DataURL.cpp: Removed.
* platform/network/DataURL.h: Removed.
* platform/network/curl/ResourceHandleManager.cpp:
(WebCore::ResourceHandleManager::startScheduledJobs):
(WebCore::handleDataURL):
(WebCore::ResourceHandleManager::dispatchSynchronousJob):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcurlResourceHandleManagercpp">trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformnetworkDataURLcpp">trunk/Source/WebCore/platform/network/DataURL.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkDataURLh">trunk/Source/WebCore/platform/network/DataURL.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (201945 => 201946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2016-06-10 22:18:04 UTC (rev 201945)
+++ trunk/Source/WebCore/CMakeLists.txt 2016-06-10 22:26:34 UTC (rev 201946)
</span><span class="lines">@@ -2331,7 +2331,6 @@
</span><span class="cx"> platform/network/CredentialBase.cpp
</span><span class="cx"> platform/network/CredentialStorage.cpp
</span><span class="cx"> platform/network/DNSResolveQueue.cpp
</span><del>- platform/network/DataURL.cpp
</del><span class="cx"> platform/network/DataURLDecoder.cpp
</span><span class="cx"> platform/network/FormData.cpp
</span><span class="cx"> platform/network/FormDataBuilder.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (201945 => 201946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-06-10 22:18:04 UTC (rev 201945)
+++ trunk/Source/WebCore/ChangeLog 2016-06-10 22:26:34 UTC (rev 201946)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2016-06-10 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><ins>+ handleDataURL is only used by curl
+ https://bugs.webkit.org/show_bug.cgi?id=158636
+
+ Reviewed by Tim Horton.
+
+ * CMakeLists.txt:
+ * platform/network/DataURL.cpp: Removed.
+ * platform/network/DataURL.h: Removed.
+ * platform/network/curl/ResourceHandleManager.cpp:
+ (WebCore::ResourceHandleManager::startScheduledJobs):
+ (WebCore::handleDataURL):
+ (WebCore::ResourceHandleManager::dispatchSynchronousJob):
+
+2016-06-10 Alex Christensen <achristensen@webkit.org>
+
</ins><span class="cx"> Reduce ResourceResponse copying
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=158232
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkDataURLcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/network/DataURL.cpp (201945 => 201946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/DataURL.cpp 2016-06-10 22:18:04 UTC (rev 201945)
+++ trunk/Source/WebCore/platform/network/DataURL.cpp 2016-06-10 22:26:34 UTC (rev 201946)
</span><span class="lines">@@ -1,104 +0,0 @@
</span><del>-/*
- * Copyright (C) 2007 Alp Toker <alp@atoker.com>
- * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "DataURL.h"
-
-#include "HTTPParsers.h"
-#include "ResourceHandle.h"
-#include "ResourceHandleClient.h"
-#include "ResourceRequest.h"
-#include "ResourceResponse.h"
-#include "TextEncoding.h"
-#include <wtf/text/Base64.h>
-#include <wtf/text/CString.h>
-#include <wtf/text/StringView.h>
-
-namespace WebCore {
-
-void handleDataURL(ResourceHandle* handle)
-{
- ASSERT(handle->firstRequest().url().protocolIsData());
- String url = handle->firstRequest().url().string();
-
- ASSERT(handle);
- ASSERT(handle->client());
-
- int index = url.find(',');
- if (index == -1) {
- handle->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";
-
- String mimeType = extractMIMETypeFromMediaType(mediaType);
- String charset = extractCharsetFromMediaType(mediaType);
-
- if (charset.isEmpty())
- charset = "US-ASCII";
-
- ResourceResponse response;
- response.setMimeType(mimeType);
- response.setTextEncodingName(charset);
- response.setURL(handle->firstRequest().url());
-
- if (base64) {
- data = decodeURLEscapeSequences(data);
- handle->client()->didReceiveResponse(handle, WTFMove(response));
-
- // didReceiveResponse might cause the client to be deleted.
- if (handle->client()) {
- Vector<char> out;
- if (base64Decode(data, out, Base64IgnoreSpacesAndNewLines) && out.size() > 0)
- handle->client()->didReceiveData(handle, out.data(), out.size(), 0);
- }
- } else {
- TextEncoding encoding(charset);
- data = decodeURLEscapeSequences(data, encoding);
- handle->client()->didReceiveResponse(handle, WTFMove(response));
-
- // didReceiveResponse might cause the client to be deleted.
- if (handle->client()) {
- CString encodedData = encoding.encode(data, URLEncodedEntitiesForUnencodables);
- if (encodedData.length())
- handle->client()->didReceiveData(handle, encodedData.data(), encodedData.length(), 0);
- }
- }
-
- if (handle->client())
- handle->client()->didFinishLoading(handle, 0);
-}
-
-} // namespace WebCore
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkDataURLh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/network/DataURL.h (201945 => 201946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/DataURL.h 2016-06-10 22:18:04 UTC (rev 201945)
+++ trunk/Source/WebCore/platform/network/DataURL.h 2016-06-10 22:26:34 UTC (rev 201946)
</span><span class="lines">@@ -1,37 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef DataURL_h
-#define DataURL_h
-
-namespace WebCore {
-
-class ResourceHandle;
-
-void handleDataURL(ResourceHandle*);
-
-}
-
-#endif // DataURL_h
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcurlResourceHandleManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp (201945 => 201946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp 2016-06-10 22:18:04 UTC (rev 201945)
+++ trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp 2016-06-10 22:26:34 UTC (rev 201946)
</span><span class="lines">@@ -7,6 +7,7 @@
</span><span class="cx"> * Copyright (C) 2008 Nuanti Ltd.
</span><span class="cx"> * Copyright (C) 2009 Appcelerator Inc.
</span><span class="cx"> * Copyright (C) 2009 Brent Fulgham <bfulgham@webkit.org>
</span><ins>+ * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com>
</ins><span class="cx"> * Copyright (C) 2013 Peter Gal <galpeter@inf.u-szeged.hu>, University of Szeged
</span><span class="cx"> * Copyright (C) 2013 Alex Christensen <achristensen@webkit.org>
</span><span class="cx"> * Copyright (C) 2013 University of Szeged
</span><span class="lines">@@ -48,8 +49,15 @@
</span><span class="cx"> #include "MultipartHandle.h"
</span><span class="cx"> #include "ResourceError.h"
</span><span class="cx"> #include "ResourceHandle.h"
</span><ins>+#include "ResourceHandleClient.h"
</ins><span class="cx"> #include "ResourceHandleInternal.h"
</span><ins>+#include "ResourceRequest.h"
+#include "ResourceResponse.h"
</ins><span class="cx"> #include "SSLHandle.h"
</span><ins>+#include "TextEncoding.h"
+#include <wtf/text/Base64.h>
+#include <wtf/text/CString.h>
+#include <wtf/text/StringView.h>
</ins><span class="cx">
</span><span class="cx"> #if OS(WINDOWS)
</span><span class="cx"> #include "WebCoreBundleWin.h"
</span><span class="lines">@@ -73,7 +81,6 @@
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><del>-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> const int selectTimeoutMS = 5;
</span><span class="lines">@@ -906,6 +913,68 @@
</span><span class="cx"> return started;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static void handleDataURL(ResourceHandle* handle)
+{
+ ASSERT(handle->firstRequest().url().protocolIsData());
+ String url = handle->firstRequest().url().string();
+
+ ASSERT(handle);
+ ASSERT(handle->client());
+
+ int index = url.find(',');
+ if (index == -1) {
+ handle->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";
+
+ String mimeType = extractMIMETypeFromMediaType(mediaType);
+ String charset = extractCharsetFromMediaType(mediaType);
+
+ if (charset.isEmpty())
+ charset = "US-ASCII";
+
+ ResourceResponse response;
+ response.setMimeType(mimeType);
+ response.setTextEncodingName(charset);
+ response.setURL(handle->firstRequest().url());
+
+ if (base64) {
+ data = decodeURLEscapeSequences(data);
+ handle->client()->didReceiveResponse(handle, WTFMove(response));
+
+ // didReceiveResponse might cause the client to be deleted.
+ if (handle->client()) {
+ Vector<char> out;
+ if (base64Decode(data, out, Base64IgnoreSpacesAndNewLines) && out.size() > 0)
+ handle->client()->didReceiveData(handle, out.data(), out.size(), 0);
+ }
+ } else {
+ TextEncoding encoding(charset);
+ data = decodeURLEscapeSequences(data, encoding);
+ handle->client()->didReceiveResponse(handle, WTFMove(response));
+
+ // didReceiveResponse might cause the client to be deleted.
+ if (handle->client()) {
+ CString encodedData = encoding.encode(data, URLEncodedEntitiesForUnencodables);
+ if (encodedData.length())
+ handle->client()->didReceiveData(handle, encodedData.data(), encodedData.length(), 0);
+ }
+ }
+
+ if (handle->client())
+ handle->client()->didFinishLoading(handle, 0);
+}
+
</ins><span class="cx"> void ResourceHandleManager::dispatchSynchronousJob(ResourceHandle* job)
</span><span class="cx"> {
</span><span class="cx"> URL kurl = job->firstRequest().url();
</span></span></pre>
</div>
</div>
</body>
</html>