Merge to M59: Only skip certain hidden elements at MHTML serialization

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 13 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "public/web/WebFrameSerializer.h"
 
 #include "core/HTMLNames.h"
+#include "core/InputTypeNames.h"
 #include "core/dom/Document.h"
 #include "core/dom/Element.h"
 #include "core/frame/Frame.h"
 #include "core/frame/FrameSerializer.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/RemoteFrame.h"
 #include "core/html/HTMLAllCollection.h"
 #include "core/html/HTMLFrameElementBase.h"
 #include "core/html/HTMLFrameOwnerElement.h"
 #include "core/html/HTMLImageElement.h"
@@ skipping 73 matching lines @@
     return true;
   if (web_delegate_.RemovePopupOverlay() &&
       ShouldIgnorePopupOverlayElement(element)) {
     return true;
   }
   return false;
 }
 
 bool MHTMLFrameSerializerDelegate::ShouldIgnoreHiddenElement(
     const Element& element) {
-  // Do not include elements that are are set to hidden without affecting layout
-  // by the page. For those elements that are hidden by default, they will not
-  // be excluded:
-  // 1) All elements that are head or part of head, including head, meta, style,
-  //    link and etc.
-  // 2) Some specific elements in body: meta, style, datalist, option and etc.
-  if (element.GetLayoutObject())
-    return false;
-  if (isHTMLHeadElement(element) || isHTMLMetaElement(element) ||
-      isHTMLStyleElement(element) || isHTMLDataListElement(element) ||
-      isHTMLOptionElement(element) || isHTMLLinkElement(element)) {
-    return false;
-  }
-  Element* parent = element.parentElement();
-  return parent && !isHTMLHeadElement(parent);
+  // Do not include the element that is marked with hidden attribute.
+  if (element.FastHasAttribute(HTMLNames::hiddenAttr))
+    return true;
+
+  // Do not include the hidden form element.
+  return isHTMLInputElement(element) &&
+         toHTMLInputElement(&element)->type() == InputTypeNames::hidden;
 }
 
 bool MHTMLFrameSerializerDelegate::ShouldIgnoreMetaElement(
     const Element& element) {
   // Do not include meta elements that declare Content-Security-Policy
   // directives. They should have already been enforced when the original
   // document is loaded. Since only the rendered resources are encapsulated in
   // the saved MHTML page, there is no need to carry the directives. If they
   // are still kept in the MHTML, child frames that are referred to using cid:
   // scheme could be prevented from loading.
@@ skipping 315 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