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

third_party/WebKit/Source/core/frame/FrameSerializer.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 368 matching lines @@
         break;
 
     default:
         ASSERT_NOT_REACHED();
     }
 }
 
 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)
 {
+    if (m_delegate.shouldSkipResource(resource))
+        return;
+
+    DLOG(ERROR) << "Adding " << url.getString() << " to resources!";

[Łukasz Anforowicz, 2016/05/19 17:00:13]

I assume this is temporary (i.e. for printf-style debugging) and can be removed
now?

[dewittj, 2016/05/19 18:18:36]

Done.

+
     if (!data) {
         DLOG(ERROR) << "No data for resource " << url.getString();
         return;
     }
 
     String mimeType = resource->response().mimeType();
     m_resources->append(SerializedResource(url, mimeType, data));
     m_resourceURLs.add(url);
 }
 
@@ skipping 72 matching lines @@
             continue;
         }
         emitsMinus = ch == '-';
         builder.append(ch);
     }
     CString escapedUrl = builder.toString().ascii();
     return String::format("saved from url=(%04d)%s", static_cast<int>(escapedUrl.length()), escapedUrl.data());
 }
 
 } // namespace blink