Translate viewport related meta tags into @viewport descriptors as suggested by the CSS Device Adap…

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 349 matching lines @@
     while (renderer) {
         if (renderer->style()) {
             renderer->style()->setTextAutosizingMultiplier(2);
             EXPECT_EQ(2, renderer->style()->textAutosizingMultiplier());
             multiplierSetAtLeastOnce = true;
         }
         renderer = renderer->nextInPreOrder();
     }
     EXPECT_TRUE(multiplierSetAtLeastOnce);
 
-    WebCore::ViewportArguments arguments = document->viewportArguments();
-    arguments.width += 10;
-    webViewImpl->updatePageDefinedPageScaleConstraints(arguments);
+    // Modify layout size to invalidate text autosizing multipliers.
+    webViewImpl->addUserStyleSheet("@viewport{width:1000px;}", WebVector<WebString>(), WebView::UserContentInjectInAllFrames, WebView::UserStyleInjectInExistingDocuments);
+    webViewImpl->layout();
 
     bool multiplierCheckedAtLeastOnce = false;
     renderer = document->renderer();
     while (renderer) {
         if (renderer->style()) {
             EXPECT_EQ(1, renderer->style()->textAutosizingMultiplier());
             multiplierCheckedAtLeastOnce = true;
         }
         renderer = renderer->nextInPreOrder();
     }
@@ skipping 240 matching lines @@
 
 TEST_F(WebFrameTest, setInitialPageScaleFactorPermanently)
 {
     WebCore::Settings::setMockScrollbarsEnabled(true);
     WebCore::Settings::setUsesOverlayScrollbars(true);
 
     registerMockedHttpURLLoad("fixed_layout.html");
 
     FixedLayoutTestWebViewClient client;
     client.m_screenInfo.deviceScaleFactor = 1;
-    float enforcedPageScaleFactor = 2.0f;
+    float enforcedPageScaleFactor = 2;
 
     m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "fixed_layout.html", true, 0, &client);
     m_webView->settings()->setSupportDeprecatedTargetDensityDPI(true);
     m_webView->settings()->setLoadWithOverviewMode(false);
     m_webView->setInitialPageScaleOverride(enforcedPageScaleFactor);
     m_webView->enableFixedLayoutMode(true);
     m_webView->settings()->setViewportEnabled(true);
     m_webView->layout();
 
     EXPECT_EQ(enforcedPageScaleFactor, m_webView->pageScaleFactor());
@@ skipping 15 matching lines @@
     registerMockedHttpURLLoad("viewport-auto-initial-scale.html");
 
     FixedLayoutTestWebViewClient client;
     client.m_screenInfo.deviceScaleFactor = 1;
     int viewportWidth = 640;
     int viewportHeight = 480;
     float enforcedPageScalePactor = 0.5f;
 
     m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "viewport-auto-initial-scale.html", true, 0, &client);
     m_webView->enableFixedLayoutMode(true);
+    m_webView->settings()->setViewportEnabled(true);
     m_webView->settings()->setSupportDeprecatedTargetDensityDPI(true);
-    m_webView->settings()->setViewportEnabled(true);
     m_webView->settings()->setLoadWithOverviewMode(false);
     m_webView->setInitialPageScaleOverride(enforcedPageScalePactor);
     m_webView->resize(WebSize(viewportWidth, viewportHeight));
 
     EXPECT_EQ(enforcedPageScalePactor, m_webView->pageScaleFactor());
 }
 
 TEST_F(WebFrameTest, PermanentInitialPageScaleFactorOverridesPageViewportInitialScale)
 {
     registerMockedHttpURLLoad("viewport-wide-2x-initial-scale.html");
@@ skipping 2780 matching lines @@
     webViewImpl->page()->mainFrame()->loader()->load(frameRequest);
     Platform::current()->unitTestSupport()->serveAsynchronousMockedRequests();
 
     EXPECT_TRUE(client.frameLoadTypeSameSeen());
     m_webView->close();
     m_webView = 0;
 }
 
 
 } // namespace