Changeset 89869 in webkit

Timestamp:

Jun 27, 2011 3:18:15 PM (13 years ago)

Author:

jcivelli@chromium.org

Message:

2011-06-27 Jay Civelli <​jcivelli@chromium.org>

Reviewed by Darin Fisher.

Adding binary part support to MHTML.
​https://bugs.webkit.org/show_bug.cgi?id=63310

• mhtml/multi_frames_binary.mht: Added.
• platform/chromium/mhtml/multi_frames_binary-expected.txt: Added.

2011-06-27 Jay Civelli <​jcivelli@chromium.org>

Reviewed by Darin Fisher.

Adding binary part support to MHTML.
​https://bugs.webkit.org/show_bug.cgi?id=63310

• loader/archive/mhtml/MHTMLArchive.cpp: (WebCore::MHTMLArchive::generateMHTMLData): (WebCore::MHTMLArchive::generateMHTMLDataUsingBinaryEncoding):
• loader/archive/mhtml/MHTMLArchive.h:
• loader/archive/mhtml/MHTMLParser.cpp: (WebCore::MHTMLParser::parseNextPart):
• platform/SharedBuffer.cpp: (WebCore::SharedBuffer::append):
• platform/SharedBuffer.h:
• platform/network/MIMEHeader.cpp: (WebCore::MIMEHeader::parseContentTransferEncoding):
• platform/network/MIMEHeader.h:

2011-06-27 Jay Civelli <​jcivelli@chromium.org>

Reviewed by Darin Fisher.

Adding binary part support to MHTML.
​https://bugs.webkit.org/show_bug.cgi?id=63310

• public/WebPageSerializer.h:
• src/WebPageSerializer.cpp: (WebKit::WebPageSerializer::serializeToMHTML): (WebKit::WebPageSerializer::serializeToMHTMLUsingBinaryEncoding):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/mhtml/multi_frames_binary.mht (added)
• LayoutTests/platform/chromium/mhtml/multi_frames_binary-expected.txt (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/loader/archive/mhtml/MHTMLArchive.cpp (modified) (4 diffs)
• Source/WebCore/loader/archive/mhtml/MHTMLArchive.h (modified) (1 diff)
• Source/WebCore/loader/archive/mhtml/MHTMLParser.cpp (modified) (2 diffs)
• Source/WebCore/platform/SharedBuffer.cpp (modified) (1 diff)
• Source/WebCore/platform/SharedBuffer.h (modified) (1 diff)
• Source/WebCore/platform/network/MIMEHeader.cpp (modified) (1 diff)
• Source/WebCore/platform/network/MIMEHeader.h (modified) (1 diff)
• Source/WebKit/chromium/ChangeLog (modified) (1 diff)
• Source/WebKit/chromium/public/WebPageSerializer.h (modified) (1 diff)
• Source/WebKit/chromium/src/WebPageSerializer.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-06-27  Jay Civelli  <jcivelli@chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        Adding binary part support to MHTML.
+        https://bugs.webkit.org/show_bug.cgi?id=63310
+
+        * mhtml/multi_frames_binary.mht: Added.
+        * platform/chromium/mhtml/multi_frames_binary-expected.txt: Added.
+
 2011-06-27  Levi Weintraub  <leviw@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-27  Jay Civelli  <jcivelli@chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        Adding binary part support to MHTML.
+        https://bugs.webkit.org/show_bug.cgi?id=63310
+
+        * loader/archive/mhtml/MHTMLArchive.cpp:
+        (WebCore::MHTMLArchive::generateMHTMLData):
+        (WebCore::MHTMLArchive::generateMHTMLDataUsingBinaryEncoding):
+        * loader/archive/mhtml/MHTMLArchive.h:
+        * loader/archive/mhtml/MHTMLParser.cpp:
+        (WebCore::MHTMLParser::parseNextPart):
+        * platform/SharedBuffer.cpp:
+        (WebCore::SharedBuffer::append):
+        * platform/SharedBuffer.h:
+        * platform/network/MIMEHeader.cpp:
+        (WebCore::MIMEHeader::parseContentTransferEncoding):
+        * platform/network/MIMEHeader.h:
+
 2011-06-27  Levi Weintraub  <leviw@chromium.org>
 

trunk/Source/WebCore/loader/archive/mhtml/MHTMLArchive.cpp

@@ -58 +58 @@
 const char* const quotedPrintable = "quoted-printable";
 const char* const base64 = "base64";
+const char* const binary = "binary";
 
 static String generateRandomBoundary()
@@ -124 +125 @@
 
 PassRefPtr<SharedBuffer> MHTMLArchive::generateMHTMLData(Page* page)
+{
+    return generateMHTMLData(page, false);
+}
+
+PassRefPtr<SharedBuffer> MHTMLArchive::generateMHTMLDataUsingBinaryEncoding(Page* page)
+{
+    return generateMHTMLData(page, true);
+}
+
+PassRefPtr<SharedBuffer> MHTMLArchive::generateMHTMLData(Page* page, bool useBinaryEncoding)
 {
     Vector<PageSerializer::Resource> resources;
@@ -168 +179 @@
         stringBuilder.append(resource.mimeType);
 
-        const char* contentEncoding = MIMETypeRegistry::isSupportedJavaScriptMIMEType(resource.mimeType) || MIMETypeRegistry::isSupportedNonImageMIMEType(resource.mimeType) ? quotedPrintable : base64;
+        const char* contentEncoding = useBinaryEncoding ? binary : base64;
         stringBuilder.append("\r\nContent-Transfer-Encoding: ");
         stringBuilder.append(contentEncoding);
@@ -178 +189 @@
         mhtmlData->append(asciiString.data(), asciiString.length());
 
-        // 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);
+        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;
+            }
         } 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);
+            // 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);
-                index += maximumLineLength;
-            } while (index < encodedDataLength);
+            } 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);
+            }
         }
     }

trunk/Source/WebCore/loader/archive/mhtml/MHTMLArchive.h

@@ -50 +50 @@
 
     static PassRefPtr<SharedBuffer> generateMHTMLData(Page*);
+    // Binary encoding results in smaller MHTML files but they might not work in other browsers.
+    static PassRefPtr<SharedBuffer> generateMHTMLDataUsingBinaryEncoding(Page*);
 
 private:
+    static PassRefPtr<SharedBuffer> generateMHTMLData(Page*, bool useBinaryEncoding);
+
     friend class MHTMLParser;
     MHTMLArchive();

trunk/Source/WebCore/loader/archive/mhtml/MHTMLParser.cpp

@@ -147 +147 @@
     const bool checkBoundary = !endOfPartBoundary.isEmpty();
     bool endOfPartReached = false;
-    String line;
-    while (!(line = m_lineReader.nextChunkAsUTF8StringWithLatin1Fallback()).isNull()) {
-        if (checkBoundary && (line == endOfPartBoundary || line == endOfDocumentBoundary)) {
+    if (mimeHeader.contentTransferEncoding() == MIMEHeader::Binary) {
+        if (!checkBoundary) {
+            LOG_ERROR("Binary contents requires end of part");
+            return 0;
+        }
+        m_lineReader.setSeparator(endOfPartBoundary.utf8().data());
+        Vector<char> part;
+        if (!m_lineReader.nextChunk(part)) {
+            LOG_ERROR("Binary contents requires end of part");
+            return 0;
+         }
+         content->append(part);
+         m_lineReader.setSeparator("\r\n");
+         Vector<char> nextChars;
+         if (m_lineReader.peek(nextChars, 2) != 2) {
+             LOG_ERROR("Invalid seperator.");
+             return 0;
+         }
+         endOfPartReached = true;
+         ASSERT(nextChars.size() == 2);
+         endOfArchiveReached = (nextChars[0] == '-' && nextChars[1] == '-');
+         if (!endOfArchiveReached) {
+             String line = m_lineReader.nextChunkAsUTF8StringWithLatin1Fallback();
+             if (!line.isEmpty()) {
+                 LOG_ERROR("No CRLF at end of binary section.");
+                 return 0;
+             }
+         }
+    } else {
+        String line;
+        while (!(line = m_lineReader.nextChunkAsUTF8StringWithLatin1Fallback()).isNull()) {
             endOfArchiveReached = (line == endOfDocumentBoundary);
-            endOfPartReached = true;
-            break;
-        }
-        // Note that we use line.utf8() and not line.ascii() as ascii turns special characters (such as tab, line-feed...) into '?'.
-        content->append(line.utf8().data(), line.length());
-        if (mimeHeader.contentTransferEncoding() == MIMEHeader::QuotedPrintable) {
-            // The line reader removes the \r\n, but we need them for the content in this case as the QuotedPrintable decoder expects CR-LF terminated lines.
-            content->append("\r\n", 2);
+            if (checkBoundary && (line == endOfPartBoundary || endOfArchiveReached)) {
+                endOfPartReached = true;
+                break;
+            }
+            // Note that we use line.utf8() and not line.ascii() as ascii turns special characters (such as tab, line-feed...) into '?'.
+            content->append(line.utf8().data(), line.length());
+            if (mimeHeader.contentTransferEncoding() == MIMEHeader::QuotedPrintable) {
+                // The line reader removes the \r\n, but we need them for the content in this case as the QuotedPrintable decoder expects CR-LF terminated lines.
+                content->append("\r\n", 2);
+            }
         }
     }
@@ -178 +208 @@
         break;
     case MIMEHeader::SevenBit:
+    case MIMEHeader::Binary:
         data.append(content->data(), content->size());
         break;

trunk/Source/WebCore/platform/SharedBuffer.cpp

@@ -166 +166 @@
 }
 
+void SharedBuffer::append(const Vector<char>& data)
+{
+    append(data.data(), data.size());
+}
+
 void SharedBuffer::clear()
 {

trunk/Source/WebCore/platform/SharedBuffer.h

@@ -87 +87 @@
     void append(SharedBuffer*);
     void append(const char*, unsigned);
+    void append(const Vector<char>&);
+
     void clear();
     const char* platformData() const;

trunk/Source/WebCore/platform/network/MIMEHeader.cpp

@@ -124 +124 @@
     if (encoding == "7bit")
         return SevenBit;
+    if (encoding == "binary")
+        return Binary;
     LOG_ERROR("Unknown encoding '%s' found in MIME header.", text.ascii().data());
     return Unknown;

trunk/Source/WebCore/platform/network/MIMEHeader.h

@@ -47 +47 @@
         Base64,
         SevenBit,
+        Binary,
         Unknown
     };

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-06-27  Jay Civelli  <jcivelli@chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        Adding binary part support to MHTML.
+        https://bugs.webkit.org/show_bug.cgi?id=63310
+
+        * public/WebPageSerializer.h:
+        * src/WebPageSerializer.cpp:
+        (WebKit::WebPageSerializer::serializeToMHTML):
+        (WebKit::WebPageSerializer::serializeToMHTMLUsingBinaryEncoding):
+
 2011-05-17  Nat Duca  <nduca@chromium.org>
 

trunk/Source/WebKit/chromium/public/WebPageSerializer.h

@@ -62 +62 @@
     WEBKIT_API static WebCString serializeToMHTML(WebView*);
 
+    // Similar to serializeToMHTML but uses binary encoding for the MHTML parts.
+    // This results in a smaller MHTML file but it might not be supported by other browsers.
+    WEBKIT_API static WebCString serializeToMHTMLUsingBinaryEncoding(WebView*);
+
     // IMPORTANT:
     // The API below is an older implementation of a pageserialization that

trunk/Source/WebKit/chromium/src/WebPageSerializer.cpp

@@ -209 +209 @@
 }
 
+WebCString WebPageSerializer::serializeToMHTMLUsingBinaryEncoding(WebView* view)
+{
+    RefPtr<SharedBuffer> mhtml = MHTMLArchive::generateMHTMLDataUsingBinaryEncoding(static_cast<WebViewImpl*>(view)->page());
+    // FIXME: we are copying all the data here. Idealy we would have a WebSharedData().
+    return WebCString(mhtml->data(), mhtml->size());
+}
+
 bool WebPageSerializer::serialize(WebFrame* frame,
                                   bool recursive,