Generating CIDs in Blink during MHTML serialization.

third_party/WebKit/Source/platform/mhtml/MHTMLArchive.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 21 matching lines @@
 #include "platform/mhtml/MHTMLArchive.h"
 
 #include "platform/DateComponents.h"
 #include "platform/MIMETypeRegistry.h"
 #include "platform/SerializedResource.h"
 #include "platform/SharedBuffer.h"
 #include "platform/mhtml/ArchiveResource.h"
 #include "platform/mhtml/MHTMLParser.h"
 #include "platform/text/QuotedPrintable.h"
 #include "platform/weborigin/SchemeRegistry.h"
+#include "wtf/Assertions.h"
 #include "wtf/CryptographicallyRandomNumber.h"
 #include "wtf/DateMath.h"
 #include "wtf/text/Base64.h"
 #include "wtf/text/StringBuilder.h"
 
 namespace blink {
 
 const char* const quotedPrintable = "quoted-printable";
 const char* const base64 = "base64";
 const char* const binary = "binary";
@@ skipping 68 matching lines @@
         for (size_t j = 0; j < parser.subResourceCount(); ++j)
             archive->addSubresource(parser.subResourceAt(j));
     }
     return mainArchive.release();
 }
 
 void MHTMLArchive::generateMHTMLHeader(
     const String& boundary, const String& title, const String& mimeType,
     SharedBuffer& outputBuffer)
 {
+    ASSERT(!boundary.isEmpty());
+    ASSERT(!mimeType.isEmpty());
+
     DateComponents now;
     now.setMillisecondsSinceEpochForDateTime(currentTimeMS());
     // TODO(lukasza): Passing individual date/time components seems fragile.
     String dateString = makeRFC2822DateString(
         now.weekDay(), now.monthDay(), now.month(), now.fullYear(),
         now.hour(), now.minute(), now.second(), 0);
 
     StringBuilder stringBuilder;
     stringBuilder.appendLiteral("From: <Saved by Blink>\r\n");
     stringBuilder.appendLiteral("Subject: ");
@@ skipping 13 matching lines @@
     // We use utf8() below instead of ascii() as ascii() replaces CRLFs with ??
     // (we still only have put ASCII characters in it).
     ASSERT(stringBuilder.toString().containsOnlyASCII());
     CString asciiString = stringBuilder.toString().utf8();
 
     outputBuffer.append(asciiString.data(), asciiString.length());
 }
 
 void MHTMLArchive::generateMHTMLPart(
     const String& boundary,
+    const String& contentID,
     EncodingPolicy encodingPolicy,
     const SerializedResource& resource,
     SharedBuffer& outputBuffer)
 {
+    ASSERT(!boundary.isEmpty());
+    ASSERT(contentID.isEmpty() || contentID[0] == '<');
+
     StringBuilder stringBuilder;
     stringBuilder.append("--" + boundary + "\r\n");
+
     stringBuilder.appendLiteral("Content-Type: ");
     stringBuilder.append(resource.mimeType);
+    stringBuilder.appendLiteral("\r\n");
+
+    if (!contentID.isEmpty()) {
+        stringBuilder.appendLiteral("Content-ID: ");
+        stringBuilder.append(contentID);
+        stringBuilder.appendLiteral("\r\n");
+    }
 
     const char* contentEncoding = 0;
     if (encodingPolicy == UseBinaryEncoding)
         contentEncoding = binary;
     else if (MIMETypeRegistry::isSupportedJavaScriptMIMEType(resource.mimeType) || MIMETypeRegistry::isSupportedNonImageMIMEType(resource.mimeType))
         contentEncoding = quotedPrintable;
     else
         contentEncoding = base64;
 
-    stringBuilder.appendLiteral("\r\nContent-Transfer-Encoding: ");
+    stringBuilder.appendLiteral("Content-Transfer-Encoding: ");
     stringBuilder.append(contentEncoding);
-    stringBuilder.appendLiteral("\r\nContent-Location: ");
-    stringBuilder.append(resource.url);
-    stringBuilder.appendLiteral("\r\n\r\n");
+    stringBuilder.appendLiteral("\r\n");
+
+    if (!resource.url.protocolIsAbout()) {
+        stringBuilder.appendLiteral("Content-Location: ");
+        stringBuilder.append(resource.url);
+        stringBuilder.appendLiteral("\r\n");
+    }
+
+    stringBuilder.appendLiteral("\r\n");
 
     CString asciiString = stringBuilder.toString().utf8();
     outputBuffer.append(asciiString.data(), asciiString.length());
 
     if (!strcmp(contentEncoding, binary)) {
         const char* data;
         size_t position = 0;
         while (size_t length = resource.data->getSomeData(data, position)) {
             outputBuffer.append(data, length);
             position += length;
@@ skipping 21 matching lines @@
                 index += maximumLineLength;
             } while (index < encodedDataLength);
         }
     }
 }
 
 void MHTMLArchive::generateMHTMLFooter(
     const String& boundary,
     SharedBuffer& outputBuffer)
 {
+    ASSERT(!boundary.isEmpty());
     CString asciiString = String("--" + boundary + "--\r\n").utf8();
     outputBuffer.append(asciiString.data(), asciiString.length());
 }
 
 #if !ENABLE(OILPAN)
 void MHTMLArchive::clearAllSubframeArchives()
 {
     SubFrameArchives clearedArchives;
     clearAllSubframeArchivesImpl(&clearedArchives);
 }
@@ skipping 26 matching lines @@
 }
 
 DEFINE_TRACE(MHTMLArchive)
 {
     visitor->trace(m_mainResource);
     visitor->trace(m_subresources);
     visitor->trace(m_subframeArchives);
 }
 
 }