Add UMA for popup overlays removed from saved MHTML page

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 69 matching lines @@
 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;
 
  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_;
 };
 
 MHTMLFrameSerializerDelegate::MHTMLFrameSerializerDelegate(
     WebFrameSerializer::MHTMLPartsGenerationDelegate& web_delegate)
-    : web_delegate_(web_delegate) {}
+    : web_delegate_(web_delegate), popup_overlays_skipped_(false) {}
+
+MHTMLFrameSerializerDelegate::~MHTMLFrameSerializerDelegate() {
+  if (web_delegate_.RemovePopupOverlay()) {
+    UMA_HISTOGRAM_BOOLEAN(
+        "PageSerialization.MhtmlGeneration.PopupOverlaySkipped",
+        popup_overlays_skipped_);
+  }
+}
 
 bool MHTMLFrameSerializerDelegate::ShouldIgnoreElement(const Element& element) {
   if (ShouldIgnoreHiddenElement(element))
     return true;
   if (ShouldIgnoreMetaElement(element))
     return true;
   if (web_delegate_.RemovePopupOverlay() &&
       ShouldIgnorePopupOverlayElement(element)) {
     return true;
   }
@@ skipping 40 matching lines @@
   LocalDOMWindow* window = element.GetDocument().domWindow();
   DCHECK(window);
   LayoutPoint center_point(window->innerWidth() / 2, window->innerHeight() / 2);
   if (!box->FrameRect().Contains(center_point))
     return false;
 
   // The z-index should be greater than the threshold.
   if (box->Style()->ZIndex() < kPopupOverlayZIndexThreshold)
     return false;
 
+  popup_overlays_skipped_ = true;
+
   return true;
 }
 
 bool MHTMLFrameSerializerDelegate::ShouldIgnoreAttribute(
     const Element& element,
     const Attribute& attribute) {
   // TODO(fgorski): Presence of srcset attribute causes MHTML to not display
   // images, as only the value of src is pulled into the archive. Discarding
   // srcset prevents the problem. Long term we should make sure to MHTML plays
   // nicely with srcset.
@@ skipping 277 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