Allow loading MHTML archive from content scheme

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 51 matching lines @@
     }
     return stringBuilder.toString();
 }
 
 MHTMLArchive::MHTMLArchive()
 {
 }
 
 MHTMLArchive* MHTMLArchive::create(const KURL& url, PassRefPtr<SharedBuffer> data)
 {
-    // MHTML pages can only be loaded from local URLs and http/https URLs.
+    // MHTML pages can only be loaded from local URLs, http/https URLs, and content URLs(Android specific).
     // The latter is now allowed due to full sandboxing enforcement on MHTML pages.
-    if (!SchemeRegistry::shouldTreatURLSchemeAsLocal(url.protocol()) && !url.protocolIsInHTTPFamily())
+    if (!SchemeRegistry::shouldTreatURLSchemeAsLocal(url.protocol()) && !url.protocolIsInHTTPFamily() && !canLoadContent(url))

[jianli, 2016/08/17 20:27:21]

I think it would be better to move all these checks into a helper function,
like:
bool MHTMLArchive::canLoadArchive(onst KURL& url)
{
    // MHTML pages can only be loaded ...
    if (SchemeRegistry::shouldTreatURLSchemeAsLocal(url.protocol())
        return true;
    if (url.protocolIsInHTTPFamily())
        return true;
#if OS(ANDROID)
    if (url.protocolIs("content"))
        return true;
#endif
    return false;
}

[Vivian, 2016/08/17 20:38:17]

Done.

         return nullptr;
 
     MHTMLParser parser(data);
     HeapVector<Member<ArchiveResource>> resources = parser.parseArchive();
     if (resources.isEmpty())
         return nullptr; // Invalid MHTML file.
 
     MHTMLArchive* archive = new MHTMLArchive;
     // The first document suitable resource is the main resource of the top frame.
     for (size_t i = 0; i < resources.size(); ++i) {
         const AtomicString& mimeType = resources[i]->mimeType();
         if (archive->mainResource() || !MIMETypeRegistry::isSupportedNonImageMIMEType(mimeType) || MIMETypeRegistry::isSupportedJavaScriptMIMEType(mimeType) || mimeType == "text/css")
             archive->addSubresource(resources[i].get());
         else
             archive->setMainResource(resources[i].get());
     }
     return archive;
 }
 
+bool MHTMLArchive::canLoadContent(const KURL& url)
+{
+#if OS(ANDROID)
+    return url.protocolIs("content");
+#endif
+    return false;
+}
+
 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.
@@ skipping 134 matching lines @@
     return m_subresources.get(url.getString());
 }
 
 DEFINE_TRACE(MHTMLArchive)
 {
     visitor->trace(m_mainResource);
     visitor->trace(m_subresources);
 }
 
 } // namespace blink