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

third_party/WebKit/Source/web/tests/WebFrameSerializerTest.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 255 matching lines @@
   const char kDisabledAttr[] = "disabled=3D\"\"";
   int matches =
       MatchSubstring(mhtml, kDisabledAttr, arraysize(kDisabledAttr) - 1);
   EXPECT_EQ(21, matches);
 }
 
 TEST_F(WebFrameSerializerSanitizationTest, RemoveHiddenElements) {
   String mhtml =
       GenerateMHTMLParts("http://www.test.com", "hidden_elements.html");
 
-  // These hidden elements that do not affect layout should be removed.
-  EXPECT_EQ(WTF::kNotFound, mhtml.Find("<h1"));
+  // The element with hidden attribute should be removed.
   EXPECT_EQ(WTF::kNotFound, mhtml.Find("<p id=3D\"hidden_id\""));
+
+  // The hidden form element should be removed.
   EXPECT_EQ(WTF::kNotFound, mhtml.Find("<input type=3D\"hidden\""));
 
-  // These default-hidden elements should not be removed.
+  // All other hidden elements should not be removed.
   EXPECT_NE(WTF::kNotFound, mhtml.Find("<html"));
   EXPECT_NE(WTF::kNotFound, mhtml.Find("<head"));
   EXPECT_NE(WTF::kNotFound, mhtml.Find("<style"));
   EXPECT_NE(WTF::kNotFound, mhtml.Find("<title"));
+  EXPECT_NE(WTF::kNotFound, mhtml.Find("<h1"));
+  EXPECT_NE(WTF::kNotFound, mhtml.Find("<h2"));
   EXPECT_NE(WTF::kNotFound, mhtml.Find("<datalist"));
   EXPECT_NE(WTF::kNotFound, mhtml.Find("<option"));
   // One for meta in head and another for meta in body.
   EXPECT_EQ(2, MatchSubstring(mhtml, "<meta", 5));
   // One for style in head and another for style in body.
   EXPECT_EQ(2, MatchSubstring(mhtml, "<style", 6));
   // One for link in head and another for link in body.
   EXPECT_EQ(2, MatchSubstring(mhtml, "<link", 5));
 
-  // These hidden elements that affect layout should remain intact.
-  EXPECT_NE(WTF::kNotFound, mhtml.Find("<h2"));
-
   // These visible elements should remain intact.
-  EXPECT_NE(WTF::kNotFound, mhtml.Find("<h2"));
   EXPECT_NE(WTF::kNotFound, mhtml.Find("<p id=3D\"visible_id\""));
   EXPECT_NE(WTF::kNotFound, mhtml.Find("<form"));
   EXPECT_NE(WTF::kNotFound, mhtml.Find("<input type=3D\"text\""));
   EXPECT_NE(WTF::kNotFound, mhtml.Find("<div"));
 }
 
 // Regression test for crbug.com/678893, where in some cases serializing an
 // image document could cause code to pick an element from an empty container.
 TEST_F(WebFrameSerializerSanitizationTest, FromBrokenImageDocument) {
   String mhtml = GenerateMHTMLParts("http://www.test.com", "broken-image.png",
@@ skipping 74 matching lines @@
             mhtml.Find("<meta http-equiv=3D\"Content-Security-Policy"));
   EXPECT_NE(WTF::kNotFound, mhtml.Find("<meta name=3D\"description"));
   EXPECT_NE(WTF::kNotFound, mhtml.Find("<meta http-equiv=3D\"refresh"));
 
   // If an element is removed, its children should also be skipped.
   EXPECT_EQ(WTF::kNotFound, mhtml.Find("<select"));
   EXPECT_EQ(WTF::kNotFound, mhtml.Find("<option"));
 }
 
 }  // namespace blink