[Refactor] Use correct viewport style in Android tests

third_party/WebKit/Source/web/tests/WebFrameTest.cpp

 /*
  * Copyright (C) 2010 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 237 matching lines @@
         testing::WebTestDataPath(WebString::FromUTF8(file_name)), response);
   }
 
   void RegisterMockedHttpURLLoadWithMimeType(const std::string& file_name,
                                              const std::string& mime_type) {
     URLTestHelpers::RegisterMockedURLLoadFromBase(
         WebString::FromUTF8(base_url_), testing::WebTestDataPath(),
         WebString::FromUTF8(file_name), WebString::FromUTF8(mime_type));
   }
 
-  void ApplyViewportStyleOverride(
-      FrameTestHelpers::WebViewHelper* web_view_helper) {
-    web_view_helper->WebView()->GetSettings()->SetViewportStyle(
-        WebViewportStyle::kMobile);
-  }
-
   static void ConfigureCompositingWebView(WebSettings* settings) {
     settings->SetAcceleratedCompositingEnabled(true);
     settings->SetPreferCompositingToLCDTextEnabled(true);
   }
 
   static void ConfigureAndroid(WebSettings* settings) {
     settings->SetViewportMetaEnabled(true);
     settings->SetViewportEnabled(true);
     settings->SetMainFrameResizesAreOrientationChanges(true);
     settings->SetShrinksViewportContentToFit(true);
+    settings->SetViewportStyle(WebViewportStyle::kMobile);
   }
 
   static void ConfigureLoadsImagesAutomatically(WebSettings* settings) {
     settings->SetLoadsImagesAutomatically(true);
   }
 
   void InitializeTextSelectionWebView(
       const std::string& url,
       FrameTestHelpers::WebViewHelper* web_view_helper) {
     web_view_helper->InitializeAndLoad(url, true);
@@ skipping 799 matching lines @@
     : public FrameTestHelpers::TestWebViewClient {
  public:
   WebScreenInfo GetScreenInfo() override { return screen_info_; }
 
   WebScreenInfo screen_info_;
 };
 
 class FakeCompositingWebViewClient : public FixedLayoutTestWebViewClient {};
 
 // Viewport settings need to be set before the page gets loaded
 void EnableViewportSettings(WebSettings* settings) {

[bokan, 2017/06/12 16:06:11]

This is identical to ConfigureAndroid, remove it and replace with
ConfigureAndroid.

   settings->SetViewportMetaEnabled(true);
   settings->SetViewportEnabled(true);
   settings->SetMainFrameResizesAreOrientationChanges(true);
   settings->SetShrinksViewportContentToFit(true);
+  settings->SetViewportStyle(WebViewportStyle::kMobile);
 }
 
 // Helper function to set autosizing multipliers on a document.
 bool SetTextAutosizingMultiplier(Document* document, float multiplier) {
   bool multiplier_set = false;
   for (LayoutItem layout_item = document->GetLayoutViewItem();
        !layout_item.IsNull(); layout_item = layout_item.NextInPreOrder()) {
     if (layout_item.Style()) {
       layout_item.MutableStyleRef().SetTextAutosizingMultiplier(multiplier);
 
@@ skipping 397 matching lines @@
 
   FixedLayoutTestWebViewClient client;
   client.screen_info_.device_scale_factor = 1;
   int viewport_width = 640;
   int viewport_height = 480;
 
   FrameTestHelpers::WebViewHelper web_view_helper;
   web_view_helper.InitializeAndLoad(base_url_ + "no_viewport_tag.html", true,
                                     nullptr, &client, nullptr,
                                     EnableViewportSettings);
-  ApplyViewportStyleOverride(&web_view_helper);
   web_view_helper.WebView()->GetSettings()->SetWideViewportQuirkEnabled(true);
   web_view_helper.WebView()->GetSettings()->SetUseWideViewport(true);
   web_view_helper.Resize(WebSize(viewport_width, viewport_height));
 
   EXPECT_EQ(980, web_view_helper.WebView()
                      ->MainFrameImpl()
                      ->GetFrameView()
                      ->ContentsSize()
                      .Width());
   EXPECT_EQ(980.0 / viewport_width * viewport_height, web_view_helper.WebView()
                                                           ->MainFrameImpl()
                                                           ->GetFrameView()
                                                           ->ContentsSize()
                                                           .Height());
 }
 
 TEST_P(ParameterizedWebFrameTest, WideViewportSetsTo980WithXhtmlMp) {
   RegisterMockedHttpURLLoad("viewport/viewport-legacy-xhtmlmp.html");
 
   FixedLayoutTestWebViewClient client;
   client.screen_info_.device_scale_factor = 1;
   int viewport_width = 640;
   int viewport_height = 480;
 
   FrameTestHelpers::WebViewHelper web_view_helper;
   web_view_helper.Initialize(true, nullptr, &client, nullptr,
                              EnableViewportSettings);
-  ApplyViewportStyleOverride(&web_view_helper);
   web_view_helper.WebView()->GetSettings()->SetWideViewportQuirkEnabled(true);
   web_view_helper.WebView()->GetSettings()->SetUseWideViewport(true);
   FrameTestHelpers::LoadFrame(
       web_view_helper.WebView()->MainFrame(),
       base_url_ + "viewport/viewport-legacy-xhtmlmp.html");
 
   web_view_helper.Resize(WebSize(viewport_width, viewport_height));
   EXPECT_EQ(viewport_width, web_view_helper.WebView()
                                 ->MainFrameImpl()
                                 ->GetFrameView()
@@ skipping 34 matching lines @@
 
   FixedLayoutTestWebViewClient client;
   client.screen_info_.device_scale_factor = 1;
   int viewport_width = 640;
   int viewport_height = 480;
 
   FrameTestHelpers::WebViewHelper web_view_helper;
   web_view_helper.InitializeAndLoad(
       base_url_ + "viewport-2x-initial-scale.html", true, nullptr, &client,
       nullptr, EnableViewportSettings);
-  ApplyViewportStyleOverride(&web_view_helper);
   web_view_helper.WebView()->GetSettings()->SetWideViewportQuirkEnabled(true);
   web_view_helper.WebView()->GetSettings()->SetUseWideViewport(true);
   web_view_helper.Resize(WebSize(viewport_width, viewport_height));
 
   EXPECT_EQ(980, web_view_helper.WebView()
                      ->MainFrameImpl()
                      ->GetFrameView()
                      ->ContentsSize()
                      .Width());
   EXPECT_EQ(980.0 / viewport_width * viewport_height, web_view_helper.WebView()
@@ skipping 28 matching lines @@
   RegisterMockedHttpURLLoad("fixed_layout.html");
 
   FixedLayoutTestWebViewClient client;
   client.screen_info_.device_scale_factor = 1;
   float enforced_page_scale_factor = 2.0f;
 
   FrameTestHelpers::WebViewHelper web_view_helper;
   web_view_helper.InitializeAndLoad(base_url_ + "fixed_layout.html", true,
                                     nullptr, &client, nullptr,
                                     EnableViewportSettings);
-  ApplyViewportStyleOverride(&web_view_helper);
   web_view_helper.WebView()->GetSettings()->SetWideViewportQuirkEnabled(true);
   web_view_helper.WebView()->GetSettings()->SetLoadWithOverviewMode(false);
   web_view_helper.WebView()->SetInitialPageScaleOverride(
       enforced_page_scale_factor);
   web_view_helper.WebView()->UpdateAllLifecyclePhases();
 
   EXPECT_EQ(enforced_page_scale_factor,
             web_view_helper.WebView()->PageScaleFactor());
 
   int viewport_width = 640;
@@ skipping 72 matching lines @@
   int viewport_width = 400;
   int viewport_height = 300;
   float enforced_page_scale_factor = 0.75f;
 
   for (size_t i = 0; i < WTF_ARRAY_LENGTH(pages); ++i) {
     for (int quirk_enabled = 0; quirk_enabled <= 1; ++quirk_enabled) {
       FrameTestHelpers::WebViewHelper web_view_helper;
       web_view_helper.InitializeAndLoad(base_url_ + pages[i], true, nullptr,
                                         &client, nullptr,
                                         EnableViewportSettings);
-      ApplyViewportStyleOverride(&web_view_helper);
       web_view_helper.WebView()
           ->GetSettings()
           ->SetClobberUserAgentInitialScaleQuirk(quirk_enabled);
       web_view_helper.WebView()->SetInitialPageScaleOverride(
           enforced_page_scale_factor);
       web_view_helper.Resize(WebSize(viewport_width, viewport_height));
 
       float expected_page_scale_factor =
           quirk_enabled && i < WTF_ARRAY_LENGTH(page_scale_factors)
               ? page_scale_factors[i]
@@ skipping 8552 matching lines @@
   EXPECT_CALL(client, DidOverscroll(_, _, _, _)).Times(0);
   ScrollUpdate(&web_view_helper, 0, -316);
   Mock::VerifyAndClearExpectations(&client);
 
   ScrollEnd(&web_view_helper);
   ScrollBegin(&web_view_helper);
 
   // Now On Scrolling DIV, scroll is bubbled and root layer is over-scrolled.
   EXPECT_CALL(client, DidOverscroll(WebFloatSize(0, 50), WebFloatSize(0, 50),
                                     WebFloatPoint(100, 100), WebFloatSize()));
-  ScrollUpdate(&web_view_helper, 0, -150);
+  ScrollUpdate(&web_view_helper, 0, -250);

[bokan, 2017/06/12 16:06:11]

Eh, why did this change? Didn't we see this work with 150 when I was at your
machine?

[chaopeng, 2017/06/12 16:29:21]

Forgot revert this one.

   Mock::VerifyAndClearExpectations(&client);
 }
 
 TEST_P(WebFrameOverscrollTest, RootLayerOverscrolledOnInnerIFrameOverScroll) {
   OverscrollWebViewClient client;
   RegisterMockedHttpURLLoad("overscroll/iframe-overscroll.html");
   RegisterMockedHttpURLLoad("overscroll/scrollable-iframe.html");
   FrameTestHelpers::WebViewHelper web_view_helper;
   web_view_helper.InitializeAndLoad(
       base_url_ + "overscroll/iframe-overscroll.html", true, nullptr, &client,
@@ skipping 690 matching lines @@
   constexpr int kBrowserControlsHeight = 100;
 
   FrameTestHelpers::WebViewHelper web_view_helper;
   web_view_helper.Initialize(true, nullptr, nullptr, nullptr,
                              EnableViewportSettings);
   WebViewBase* web_view = web_view_helper.WebView();
   web_view->ResizeWithBrowserControls(
       WebSize(kViewportWidth, kViewportHeight - kBrowserControlsHeight),
       kBrowserControlsHeight, true);
 
-  InitializeWithHTML(*web_view->MainFrameImpl()->GetFrame(),
-                     "<!DOCTYPE html>"
-                     "<style>"
-                     "  html, body {width:100%;height:540px;margin:0px}"
-                     "  #elem {"
-                     "    overflow: scroll;"
-                     "    width: 100px;"
-                     "    height: 10px;"
-                     "    position: fixed;"
-                     "    left: 0px;"
-                     "    bottom: 0px;"
-                     "  }"
-                     "</style>"
-                     "<div id='elem'></div>");
+  InitializeWithHTML(
+      *web_view->MainFrameImpl()->GetFrame(),
+      "<!DOCTYPE html>"
+      "<meta name='viewport' content='width=device-width, initial-scale=1'>"
+      "<style>"
+      "  html, body {width:100%;height:540px;margin:0px}"
+      "  #elem {"
+      "    overflow: scroll;"
+      "    width: 100px;"
+      "    height: 10px;"
+      "    position: fixed;"
+      "    left: 0px;"
+      "    bottom: 0px;"
+      "  }"
+      "</style>"
+      "<div id='elem'></div>");
   web_view->UpdateAllLifecyclePhases();
 
   Document* document = web_view->MainFrameImpl()->GetFrame()->GetDocument();
   LocalFrameView* frame_view = web_view->MainFrameImpl()->GetFrameView();
   PaintLayerCompositor* compositor =
       frame_view->GetLayoutViewItem().Compositor();
 
   EXPECT_EQ(kViewportHeight - kBrowserControlsHeight,
             compositor->RootLayer()->BoundingBoxForCompositing().Height());
 
@@ skipping 1191 matching lines @@
     if (obj->IsText()) {
       LayoutText* layout_text = ToLayoutText(obj);
       text = layout_text->GetText();
       break;
     }
   }
   EXPECT_EQ("foo alt", text.Utf8());
 }
 
 }  // namespace blink