Remove hidden elements from MHTML

third_party/WebKit/Source/core/frame/FrameSerializer.cpp

Index: third_party/WebKit/Source/core/frame/FrameSerializer.cpp
diff --git a/third_party/WebKit/Source/core/frame/FrameSerializer.cpp b/third_party/WebKit/Source/core/frame/FrameSerializer.cpp
index c2041086ac548e84e3404397db3b5bc03bd27b55..41eb44870b4684be35ebc2b427cfe2d8a1844089 100644
--- a/third_party/WebKit/Source/core/frame/FrameSerializer.cpp
+++ b/third_party/WebKit/Source/core/frame/FrameSerializer.cpp
@@ -79,15 +79,6 @@ const int32_t maxSerializationTimeUmaMicroseconds = 10 * secondsToMicroseconds;
 
 namespace blink {
 
-static bool shouldIgnoreElement(const Element& element) {
-  if (isHTMLScriptElement(element))
-    return true;
-  if (isHTMLNoScriptElement(element))
-    return true;
-  return isHTMLMetaElement(element) &&
-         toHTMLMetaElement(element).computeEncoding().isValid();
-}
-
 class SerializerMarkupAccumulator : public MarkupAccumulator {
   STACK_ALLOCATED();
 
@@ -109,6 +100,7 @@ class SerializerMarkupAccumulator : public MarkupAccumulator {
   void appendEndTag(const Element&) override;
 
  private:
+  bool shouldIgnoreElement(const Element&) const;
   void appendAttributeValue(StringBuilder& out, const String& attributeValue);
   void appendRewrittenAttribute(StringBuilder& out,
                                 const Element&,
@@ -219,6 +211,19 @@ void SerializerMarkupAccumulator::appendEndTag(const Element& element) {
     MarkupAccumulator::appendEndTag(element);
 }
 
+bool SerializerMarkupAccumulator::shouldIgnoreElement(
+    const Element& element) const {
+  if (isHTMLScriptElement(element))
+    return true;
+  if (isHTMLNoScriptElement(element))
+    return true;
+  if (isHTMLMetaElement(element) &&
+      toHTMLMetaElement(element).computeEncoding().isValid()) {
+    return true;
+  }
+  return m_delegate.shouldIgnoreElement(element);

[carlosk, 2016/11/30 23:30:22]

This might be a dumb question but why is this logic split between this method
and the delegate's? Are these checks here for cases that should always be
ignored when serializing and the ones in the delegate only for format-specific
cases (assuming MHTML is not the only format)?

[jianli, 2016/12/01 02:19:38]

It seems that this is useful in supporting multiple formats. I think we need to
have some discussions to understand what we want to support here.

+}
+
 void SerializerMarkupAccumulator::appendAttributeValue(
     StringBuilder& out,
     const String& attributeValue) {