Adds a feature to MHTML serialization that omits subframes and subresources marked no-store.

third_party/WebKit/Source/core/frame/FrameSerializer.cpp

Index: third_party/WebKit/Source/core/frame/FrameSerializer.cpp
diff --git a/third_party/WebKit/Source/core/frame/FrameSerializer.cpp b/third_party/WebKit/Source/core/frame/FrameSerializer.cpp
index 6427f7e04fab9595002ef102e06221ba685c23a4..04e105240dedb6c14f08eba077c91c9cbbd5f482 100644
--- a/third_party/WebKit/Source/core/frame/FrameSerializer.cpp
+++ b/third_party/WebKit/Source/core/frame/FrameSerializer.cpp
@@ -386,11 +386,14 @@ void FrameSerializer::serializeCSSRule(CSSRule* rule)
 bool FrameSerializer::shouldAddURL(const KURL& url)
 {
     return url.isValid() && !m_resourceURLs.contains(url) && !url.protocolIsData()
-        && !m_delegate.shouldSkipResource(url);
+        && !m_delegate.shouldSkipResourceWithURL(url);
 }
 
 void FrameSerializer::addToResources(Resource* resource, PassRefPtr<SharedBuffer> data, const KURL& url)

[Łukasz Anforowicz, 2016/05/19 18:50:18]

nit: I think that callers always guarantee that |resource| is not null, so it
probably would be good to change this to const-ref.  This is old code, but this
change would make FrameSerializer::addToResources play nicely with the other
suggested const-ref change - in the new code / in
FrameSerializer::Delegate::shouldSkipResource).

[dewittj, 2016/05/19 19:44:55]

Done.

 {
+    if (m_delegate.shouldSkipResource(resource))
+        return;
+
     if (!data) {
         DLOG(ERROR) << "No data for resource " << url.getString();
         return;