Fix: Loading cid: resources in WebView.

third_party/WebKit/Source/platform/loader/fetch/ResourceFetcher.cpp

 /*
     Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
     Copyright (C) 2001 Dirk Mueller (mueller@kde.org)
     Copyright (C) 2002 Waldo Bastian (bastian@kde.org)
     Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
     rights reserved.
     Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
@@ skipping 626 matching lines @@
   if (result == kBlock)
     return ResourceForBlockedRequest(params, factory, blocked_reason);
 
   if (!params.IsSpeculativePreload()) {
     // Only log if it's not for speculative preload.
     Context().RecordLoadingActivity(identifier, resource_request,
                                     factory.GetType(),
                                     params.Options().initiator_info.name);
   }
 
-  // An URL with the "cid" scheme can only be handled by an MHTML Archive.
-  // Abort the request when there is none.
-  if (!archive_ && resource_request.Url().ProtocolIs(kContentIdScheme))
+  // A main resource request with the "cid" scheme can only be handled by an
+  // MHTML Archive. Abort the request when there is none.
+  // Please note that there is some embedder of WebView that are using

[clamy, 2017/07/07 16:14:22]

nit: s/Please note/Note:
nit: s/is some embedder/are some embedders

[arthursonzogni, 2017/07/10 09:03:32]

Done.

+  // Content-ID URLs for sub-resources, even without any MHTMLArchive.
+  // Please see https://crbug.com/739658.
+  if (!archive_ && factory.GetType() == Resource::kMainResource &&

[clamy, 2017/07/07 16:14:22]

nit: this if now needs braces.

[arthursonzogni, 2017/07/10 09:03:32]

Done.

+      resource_request.Url().ProtocolIs(kContentIdScheme))
     return nullptr;
 
   bool is_data_url = resource_request.Url().ProtocolIsData();
   bool is_static_data = is_data_url || substitute_data.IsValid() || archive_;
   if (is_static_data) {
     resource = ResourceForStaticData(params, factory, substitute_data);
     // Abort the request if the archive doesn't contain the resource, except in
     // the case of data URLs which might have resources such as fonts that need
     // to be decoded only on demand. These data URLs are allowed to be
     // processed using the normal ResourceFetcher machinery.
@@ skipping 1011 matching lines @@
   visitor->Trace(archive_);
   visitor->Trace(loaders_);
   visitor->Trace(non_blocking_loaders_);
   visitor->Trace(document_resources_);
   visitor->Trace(preloads_);
   visitor->Trace(matched_preloads_);
   visitor->Trace(resource_timing_info_map_);
 }
 
 }  // namespace blink