<!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>[191420] 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/191420">191420</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-10-21 17:46:20 -0700 (Wed, 21 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove dead MHTML code
https://bugs.webkit.org/show_bug.cgi?id=150426
Reviewed by Tim Horton.
* loader/archive/mhtml/MHTMLArchive.cpp:
(WebCore::MHTMLArchive::generateMHTMLData):
(WebCore::MHTMLArchive::generateMHTMLDataUsingBinaryEncoding): Deleted.
* loader/archive/mhtml/MHTMLArchive.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloaderarchivemhtmlMHTMLArchivecpp">trunk/Source/WebCore/loader/archive/mhtml/MHTMLArchive.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderarchivemhtmlMHTMLArchiveh">trunk/Source/WebCore/loader/archive/mhtml/MHTMLArchive.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (191419 => 191420)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-10-22 00:31:23 UTC (rev 191419)
+++ trunk/Source/WebCore/ChangeLog 2015-10-22 00:46:20 UTC (rev 191420)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-10-21 Anders Carlsson <andersca@apple.com>
+
+ Remove dead MHTML code
+ https://bugs.webkit.org/show_bug.cgi?id=150426
+
+ Reviewed by Tim Horton.
+
+ * loader/archive/mhtml/MHTMLArchive.cpp:
+ (WebCore::MHTMLArchive::generateMHTMLData):
+ (WebCore::MHTMLArchive::generateMHTMLDataUsingBinaryEncoding): Deleted.
+ * loader/archive/mhtml/MHTMLArchive.h:
+
</ins><span class="cx"> 2015-10-21 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> Null dereference loading Blink layout test svg/filters/display-none-filter-primitive.html
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderarchivemhtmlMHTMLArchivecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/archive/mhtml/MHTMLArchive.cpp (191419 => 191420)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/archive/mhtml/MHTMLArchive.cpp 2015-10-22 00:31:23 UTC (rev 191419)
+++ trunk/Source/WebCore/loader/archive/mhtml/MHTMLArchive.cpp 2015-10-22 00:46:20 UTC (rev 191420)
</span><span class="lines">@@ -59,7 +59,6 @@
</span><span class="cx">
</span><span class="cx"> const char* const quotedPrintable = "quoted-printable";
</span><span class="cx"> const char* const base64 = "base64";
</span><del>-const char* const binary = "binary";
</del><span class="cx">
</span><span class="cx"> static String generateRandomBoundary()
</span><span class="cx"> {
</span><span class="lines">@@ -133,16 +132,6 @@
</span><span class="cx">
</span><span class="cx"> PassRefPtr<SharedBuffer> MHTMLArchive::generateMHTMLData(Page* page)
</span><span class="cx"> {
</span><del>- return generateMHTMLData(page, false);
-}
-
-PassRefPtr<SharedBuffer> MHTMLArchive::generateMHTMLDataUsingBinaryEncoding(Page* page)
-{
- return generateMHTMLData(page, true);
-}
-
-PassRefPtr<SharedBuffer> MHTMLArchive::generateMHTMLData(Page* page, bool useBinaryEncoding)
-{
</del><span class="cx"> Vector<PageSerializer::Resource> resources;
</span><span class="cx"> PageSerializer pageSerializer(&resources);
</span><span class="cx"> pageSerializer.serialize(page);
</span><span class="lines">@@ -183,9 +172,7 @@
</span><span class="cx"> stringBuilder.append(resource.mimeType);
</span><span class="cx">
</span><span class="cx"> const char* contentEncoding = nullptr;
</span><del>- if (useBinaryEncoding)
- contentEncoding = binary;
- else if (MIMETypeRegistry::isSupportedJavaScriptMIMEType(resource.mimeType) || MIMETypeRegistry::isSupportedNonImageMIMEType(resource.mimeType))
</del><ins>+ if (MIMETypeRegistry::isSupportedJavaScriptMIMEType(resource.mimeType) || MIMETypeRegistry::isSupportedNonImageMIMEType(resource.mimeType))
</ins><span class="cx"> contentEncoding = quotedPrintable;
</span><span class="cx"> else
</span><span class="cx"> contentEncoding = base64;
</span><span class="lines">@@ -199,36 +186,27 @@
</span><span class="cx"> asciiString = stringBuilder.toString().utf8();
</span><span class="cx"> mhtmlData->append(asciiString.data(), asciiString.length());
</span><span class="cx">
</span><del>- if (!strcmp(contentEncoding, binary)) {
- const char* data;
- size_t position = 0;
- while (size_t length = resource.data->getSomeData(data, position)) {
- mhtmlData->append(data, length);
- position += length;
- }
</del><ins>+ // FIXME: ideally we would encode the content as a stream without having to fetch it all.
+ const char* data = resource.data->data();
+ size_t dataLength = resource.data->size();
+ Vector<char> encodedData;
+ if (!strcmp(contentEncoding, quotedPrintable)) {
+ quotedPrintableEncode(data, dataLength, encodedData);
+ mhtmlData->append(encodedData.data(), encodedData.size());
+ mhtmlData->append("\r\n", 2);
</ins><span class="cx"> } else {
</span><del>- // FIXME: ideally we would encode the content as a stream without having to fetch it all.
- const char* data = resource.data->data();
- size_t dataLength = resource.data->size();
- Vector<char> encodedData;
- if (!strcmp(contentEncoding, quotedPrintable)) {
- quotedPrintableEncode(data, dataLength, encodedData);
- mhtmlData->append(encodedData.data(), encodedData.size());
</del><ins>+ ASSERT(!strcmp(contentEncoding, base64));
+ // We are not specifying insertLFs = true below as it would cut the lines with LFs and MHTML requires CRLFs.
+ base64Encode(data, dataLength, encodedData);
+ const size_t maximumLineLength = 76;
+ size_t index = 0;
+ size_t encodedDataLength = encodedData.size();
+ do {
+ size_t lineLength = std::min(encodedDataLength - index, maximumLineLength);
+ mhtmlData->append(encodedData.data() + index, lineLength);
</ins><span class="cx"> mhtmlData->append("\r\n", 2);
</span><del>- } else {
- ASSERT(!strcmp(contentEncoding, base64));
- // We are not specifying insertLFs = true below as it would cut the lines with LFs and MHTML requires CRLFs.
- base64Encode(data, dataLength, encodedData);
- const size_t maximumLineLength = 76;
- size_t index = 0;
- size_t encodedDataLength = encodedData.size();
- do {
- size_t lineLength = std::min(encodedDataLength - index, maximumLineLength);
- mhtmlData->append(encodedData.data() + index, lineLength);
- mhtmlData->append("\r\n", 2);
- index += maximumLineLength;
- } while (index < encodedDataLength);
- }
</del><ins>+ index += maximumLineLength;
+ } while (index < encodedDataLength);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderarchivemhtmlMHTMLArchiveh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/archive/mhtml/MHTMLArchive.h (191419 => 191420)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/archive/mhtml/MHTMLArchive.h 2015-10-22 00:31:23 UTC (rev 191419)
+++ trunk/Source/WebCore/loader/archive/mhtml/MHTMLArchive.h 2015-10-22 00:46:20 UTC (rev 191420)
</span><span class="lines">@@ -49,8 +49,6 @@
</span><span class="cx"> static PassRefPtr<MHTMLArchive> create(const URL&, SharedBuffer*);
</span><span class="cx">
</span><span class="cx"> static PassRefPtr<SharedBuffer> generateMHTMLData(Page*);
</span><del>- // Binary encoding results in smaller MHTML files but they might not work in other browsers.
- static PassRefPtr<SharedBuffer> generateMHTMLDataUsingBinaryEncoding(Page*);
</del><span class="cx">
</span><span class="cx"> virtual ~MHTMLArchive();
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>