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)
+void FrameSerializer::addToResources(const Resource& resource, PassRefPtr<SharedBuffer> data, const KURL& url)
 {
+    if (m_delegate.shouldSkipResource(resource))
+        return;
+
     if (!data) {
         DLOG(ERROR) << "No data for resource " << url.getString();
         return;
     }
 
-    String mimeType = resource->response().mimeType();
+    String mimeType = resource.response().mimeType();
     m_resources->append(SerializedResource(url, mimeType, data));
     m_resourceURLs.add(url);
 }
 
 void FrameSerializer::addImageToResources(ImageResource* image, const KURL& url)
 {
     if (!image || !image->hasImage() || image->errorOccurred() || !shouldAddURL(url))
         return;
 
     RefPtr<SharedBuffer> data = image->getImage()->data();
-    addToResources(image, data, url);
+    addToResources(*image, data, url);
 }
 
 void FrameSerializer::addFontToResources(FontResource* font)
 {
     if (!font || !font->isLoaded() || !font->resourceBuffer() || !shouldAddURL(font->url()))
         return;
 
     RefPtr<SharedBuffer> data(font->resourceBuffer());
 
-    addToResources(font, data, font->url());
+    addToResources(*font, data, font->url());
 }
 
 void FrameSerializer::retrieveResourcesForProperties(const StylePropertySet* styleDeclaration, Document& document)
 {
     if (!styleDeclaration)
         return;
 
     // The background-image and list-style-image (for ul or ol) are the CSS properties
     // that make use of images. We iterate to make sure we include any other
     // image properties there might be.
@@ skipping 45 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