[Offline Pages] Adding missing image/CSS detection in FrameSerializer.

third_party/WebKit/Source/web/WebFrameSerializer.cpp

 /*
  * Copyright (C) 2009 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 43 matching lines @@
 #include "platform/loader/fetch/ResourceRequest.h"
 #include "platform/loader/fetch/ResourceResponse.h"
 #include "platform/mhtml/MHTMLArchive.h"
 #include "platform/mhtml/MHTMLParser.h"
 #include "platform/weborigin/KURL.h"
 #include "platform/wtf/Assertions.h"
 #include "platform/wtf/Deque.h"
 #include "platform/wtf/HashMap.h"
 #include "platform/wtf/HashSet.h"
 #include "platform/wtf/Noncopyable.h"
+#include "platform/wtf/PtrUtil.h"
 #include "platform/wtf/Vector.h"
 #include "platform/wtf/text/StringConcatenate.h"
 #include "public/platform/WebString.h"
 #include "public/platform/WebURL.h"
 #include "public/platform/WebURLResponse.h"
 #include "public/platform/WebVector.h"
 #include "public/web/WebDataSource.h"
 #include "public/web/WebDocument.h"
 #include "public/web/WebFrame.h"
 #include "public/web/WebFrameSerializerCacheControlPolicy.h"
 #include "public/web/WebFrameSerializerClient.h"
 #include "web/WebFrameSerializerImpl.h"
+#include "web/WebPageMissingCSSDetector.h"
+#include "web/WebPageMissingImageDetector.h"
+#include "web/WebPageProblemDetector.h"
 #include "web/WebRemoteFrameImpl.h"
 
 namespace blink {
 
 namespace {
 
 const int kPopupOverlayZIndexThreshold = 50;
 
 class MHTMLFrameSerializerDelegate final : public FrameSerializer::Delegate {
   WTF_MAKE_NONCOPYABLE(MHTMLFrameSerializerDelegate);
 
  public:
   explicit MHTMLFrameSerializerDelegate(
       WebFrameSerializer::MHTMLPartsGenerationDelegate&);
   ~MHTMLFrameSerializerDelegate() override;
   bool ShouldIgnoreElement(const Element&) override;
   bool ShouldIgnoreAttribute(const Element&, const Attribute&) override;
   bool RewriteLink(const Element&, String& rewritten_link) override;
   bool ShouldSkipResourceWithURL(const KURL&) override;
   bool ShouldSkipResource(
       FrameSerializer::ResourceHasCacheControlNoStoreHeader) override;
   Vector<Attribute> GetCustomAttributes(const Element&) override;
+  void VisitNode(const Node*) override;
 
  private:
   bool ShouldIgnoreHiddenElement(const Element&);
   bool ShouldIgnoreMetaElement(const Element&);
   bool ShouldIgnorePopupOverlayElement(const Element&);
   void GetCustomAttributesForImageElement(const HTMLImageElement&,
                                           Vector<Attribute>*);
   void GetCustomAttributesForFormControlElement(const Element&,
                                                 Vector<Attribute>*);
 
   WebFrameSerializer::MHTMLPartsGenerationDelegate& web_delegate_;
   bool popup_overlays_skipped_;
+  WebPageProblemDetectorCollection problem_detectors_;
 };
 
 MHTMLFrameSerializerDelegate::MHTMLFrameSerializerDelegate(
     WebFrameSerializer::MHTMLPartsGenerationDelegate& web_delegate)
-    : web_delegate_(web_delegate), popup_overlays_skipped_(false) {}
+    : web_delegate_(web_delegate), popup_overlays_skipped_(false) {
+  if (web_delegate.UsePageProblemDetectors()) {
+    std::unique_ptr<MissingImageDetector> missing_image_detector(
+        new MissingImageDetector());

[dcheng, 2017/05/23 05:52:41]

Nit: prefer auto missing_image_detector = WTF::MakeUnique<...>(...);

Even better:

problem_detectors_.AddDetector(
    WTF::MakeUnique<MissingCSSDetector>());
problem_detectors_.AddDetector(
    WTF::MakeUnique<MissingImageDetector>());

[romax, 2017/05/27 01:00:04]

Done.

+    std::unique_ptr<MissingCSSDetector> missing_css_detector(
+        new MissingCSSDetector());
+    problem_detectors_.AddDetector(std::move(missing_image_detector));
+    problem_detectors_.AddDetector(std::move(missing_css_detector));
+  }
+}
 
 MHTMLFrameSerializerDelegate::~MHTMLFrameSerializerDelegate() {
   if (web_delegate_.RemovePopupOverlay()) {
     UMA_HISTOGRAM_BOOLEAN(
         "PageSerialization.MhtmlGeneration.PopupOverlaySkipped",
         popup_overlays_skipped_);
   }
 }
 
 bool MHTMLFrameSerializerDelegate::ShouldIgnoreElement(const Element& element) {
@@ skipping 148 matching lines @@
   if (isHTMLImageElement(element)) {
     GetCustomAttributesForImageElement(toHTMLImageElement(element),
                                        &attributes);
   } else if (element.IsFormControlElement()) {
     GetCustomAttributesForFormControlElement(element, &attributes);
   }
 
   return attributes;
 }
 
+void MHTMLFrameSerializerDelegate::VisitNode(const Node* node) {
+  problem_detectors_.VisitNode(node);
+}
+
 void MHTMLFrameSerializerDelegate::GetCustomAttributesForImageElement(
     const HTMLImageElement& element,
     Vector<Attribute>* attributes) {
   // Currently only the value of src is pulled into the archive and the srcset
   // attribute is ignored (see shouldIgnoreAttribute() above). If the device
   // has a higher DPR, a different image from srcset could be loaded instead.
   // When this occurs, we should provide the rendering width and height for
   // <img> element if not set.
 
   // The image should be loaded and participate the layout.
@@ skipping 186 matching lines @@
     const WebString& base_target) {
   // TODO(yosin) We should call |FrameSerializer::baseTagDeclarationOf()|.
   if (base_target.IsEmpty())
     return String("<base href=\".\">");
   String base_string = "<base href=\".\" target=\"" +
                        static_cast<const String&>(base_target) + "\">";
   return base_string;
 }
 
 }  // namespace blink