Merge to M57: Remove popup overlay from MHTML when requested

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 45 matching lines @@
   void didSerializeDataForFrame(const WebCString& data,
                                 FrameSerializationStatus) final {
     m_builder.append(data.data(), data.length());
   }
 
   StringBuilder m_builder;
 };
 
 class SimpleMHTMLPartsGenerationDelegate
     : public WebFrameSerializer::MHTMLPartsGenerationDelegate {
+ public:
+  SimpleMHTMLPartsGenerationDelegate() : m_removePopupOverlay(false) {}
+
+  void setRemovePopupOverlay(bool removePopupOverlay) {
+    m_removePopupOverlay = removePopupOverlay;
+  }
+
  private:
   bool shouldSkipResource(const WebURL&) final { return false; }
 
   WebString getContentID(WebFrame*) final { return WebString("<cid>"); }
 
   WebFrameSerializerCacheControlPolicy cacheControlPolicy() final {
     return WebFrameSerializerCacheControlPolicy::None;
   }
 
   bool useBinaryEncoding() final { return false; }
+  bool removePopupOverlay() final { return m_removePopupOverlay; }
+
+  bool m_removePopupOverlay;
 };
 
 // Returns the count of match for substring |pattern| in string |str|.
 int matchSubstring(const String& str, const char* pattern, size_t size) {
   int matches = 0;
   size_t start = 0;
   while (true) {
     size_t pos = str.find(pattern, start);
     if (pos == WTF::kNotFound)
       break;
@@ skipping 119 matching lines @@
                             const String& mimeType = "text/html") {
     KURL parsedURL(ParsedURLString, url);
     URLTestHelpers::registerMockedURLLoad(parsedURL, fileName,
                                           "frameserialization/", mimeType);
     FrameTestHelpers::loadFrame(mainFrameImpl(), url.utf8().data());
     WebThreadSafeData result = WebFrameSerializer::generateMHTMLParts(
         WebString("boundary"), mainFrameImpl(), &m_mhtmlDelegate);
     return String(result.data(), result.size());
   }
 
+  void setRemovePopupOverlay(bool removePopupOverlay) {
+    m_mhtmlDelegate.setRemovePopupOverlay(removePopupOverlay);
+  }
+
  private:
   SimpleMHTMLPartsGenerationDelegate m_mhtmlDelegate;
 };
 
 TEST_F(WebFrameSerializerSanitizationTest, RemoveInlineScriptInAttributes) {
   String mhtml =
       generateMHTMLParts("http://www.test.com", "script_in_attributes.html");
 
   // These scripting attributes should be removed.
   EXPECT_EQ(WTF::kNotFound, mhtml.find("onload="));
@@ skipping 99 matching lines @@
   String mhtml = generateMHTMLParts("http://www.test.com", "img_srcset.html");
 
   // srcset attribute should be skipped.
   EXPECT_EQ(WTF::kNotFound, mhtml.find("srcset="));
 
   // New width and height attributes should not be set.
   EXPECT_NE(WTF::kNotFound, mhtml.find("id=3D\"i1\">"));
   EXPECT_NE(WTF::kNotFound, mhtml.find("id=3D\"i2\" width=3D\"8\">"));
 }
 
+TEST_F(WebFrameSerializerSanitizationTest, RemovePopupOverlayIfRequested) {
+  webView()->resize(WebSize(500, 500));
+  setRemovePopupOverlay(true);
+  String mhtml = generateMHTMLParts("http://www.test.com", "popup.html");
+  EXPECT_EQ(WTF::kNotFound, mhtml.find("class=3D\"overlay"));
+  EXPECT_EQ(WTF::kNotFound, mhtml.find("class=3D\"modal"));
+}
+
+TEST_F(WebFrameSerializerSanitizationTest, KeepPopupOverlayIfNotRequested) {
+  webView()->resize(WebSize(500, 500));
+  setRemovePopupOverlay(false);
+  String mhtml = generateMHTMLParts("http://www.test.com", "popup.html");
+  EXPECT_NE(WTF::kNotFound, mhtml.find("class=3D\"overlay"));
+  EXPECT_NE(WTF::kNotFound, mhtml.find("class=3D\"modal"));
+}
+
 }  // namespace blink