Moved remaining legacy viewport tests to unit tests.

Source/web/tests/FrameTestHelpers.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 14 matching lines @@
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "FrameTestHelpers.h"
 
 #include "URLTestHelpers.h"
-#include "wtf/StdLibExtras.h"
+#include "UserAgentStyleSheets.h"
 #include "WebFrameClient.h"
 #include "WebFrameImpl.h"
 #include "WebSettings.h"
 #include "WebViewClient.h"
+#include "core/css/CSSDefaultStyleSheets.h"
+#include "core/css/RuleSet.h"
+#include "core/css/StyleSheetContents.h"
+#include "core/css/ViewportStyle.h"
+#include "core/page/Settings.h"
+#include "core/platform/ScrollbarTheme.h"

[abarth-chromium, 2013/11/27 18:43:50]

It's sad to have all these detailed dependencies.  The invasiveness of these
dependencies will make it harder to change this code in the future...

 #include "public/platform/Platform.h"
 #include "public/platform/WebString.h"
 #include "public/platform/WebThread.h"
 #include "public/platform/WebURLRequest.h"
 #include "public/platform/WebURLResponse.h"
 #include "public/platform/WebUnitTestSupport.h"
+#include "wtf/StdLibExtras.h"
+#include <gtest/gtest.h>
 
 namespace blink {
 namespace FrameTestHelpers {
 
 namespace {
 
 class QuitTask : public WebThread::Task {
 public:
     void PostThis(WebCore::Timer<QuitTask>*)
     {
@@ skipping 33 matching lines @@
 }
 
 void runPendingTasks()
 {
     // Pending tasks include Timers that have been scheduled.
     WebCore::Timer<QuitTask> quitOnTimeout(new QuitTask, &QuitTask::PostThis);
     quitOnTimeout.startOneShot(0);
     Platform::current()->currentThread()->enterRunLoop();
 }
 
+void setViewportSettings(WebSettings* settings)
+{
+    settings->setViewportMetaEnabled(true);
+    settings->setViewportEnabled(true);
+    settings->setMainFrameResizesAreOrientationChanges(true);
+}
+
 WebViewHelper::WebViewHelper()
     : m_mainFrame(0)
     , m_webView(0)
 {
 }
 
 WebViewHelper::~WebViewHelper()
 {
     reset();
 }
@@ skipping 36 matching lines @@
     if (m_webView) {
         m_webView->close();
         m_webView = 0;
     }
     if (m_mainFrame) {
         m_mainFrame->close();
         m_mainFrame = 0;
     }
 }
 
+UseMockScrollbarSettings::UseMockScrollbarSettings()
+{
+    WebCore::Settings::setMockScrollbarsEnabled(true);
+    WebCore::RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(true);
+    EXPECT_TRUE(WebCore::ScrollbarTheme::theme()->usesOverlayScrollbars());
+}
+
+UseMockScrollbarSettings::~UseMockScrollbarSettings()
+{
+    WebCore::Settings::setMockScrollbarsEnabled(false);
+    WebCore::RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(false);
+}

[abarth-chromium, 2013/11/27 18:43:50]

These seem fine because they're poking at well-defined knobs in the engine.

+
+// Since UA stylesheets get loaded statically at first use, we need this to
+// reset the UA stylesheets so that we can have per-test UA stylesheets and
+// have Blink pick up a newly injected viewport stylesheet.
+static void resetCSSDefaultStyleSheets()
+{
+    if (WebCore::CSSDefaultStyleSheets::defaultPrintStyle
+        == WebCore::CSSDefaultStyleSheets::defaultStyle)
+        WebCore::CSSDefaultStyleSheets::defaultPrintStyle = 0;
+
+#define RESET(x)                                    \
+if (WebCore::CSSDefaultStyleSheets::x) {            \
+    delete WebCore::CSSDefaultStyleSheets::x;       \
+    WebCore::CSSDefaultStyleSheets::x = 0;          \
+}
+
+    RESET(defaultStyle)
+    RESET(defaultQuirksStyle)
+    RESET(defaultPrintStyle)
+    RESET(defaultViewSourceStyle)
+    RESET(defaultXHTMLMobileProfileStyle)
+
+#undef RESET
+#define RESET(x)                                    \
+if (WebCore::CSSDefaultStyleSheets::x) {            \
+    WebCore::CSSDefaultStyleSheets::x->deref();     \
+    WebCore::CSSDefaultStyleSheets::x = 0;          \
+}
+
+    RESET(defaultStyleSheet)
+    RESET(quirksStyleSheet)
+    RESET(svgStyleSheet)
+    RESET(mediaControlsStyleSheet)
+    RESET(fullscreenStyleSheet)
+
+#undef RESET
+}

[abarth-chromium, 2013/11/27 18:43:50]

These seem a bit more questionable....

[bokan, 2013/11/27 19:20:10]

Yah, this feels wrong but there seems to be no way to replace the UA stylesheet
and I'm not sure of a better way to do this. Could you recommend someone in this
space to have a look/provide guidance?

+
+ReplaceViewportUAStylesheet::ReplaceViewportUAStylesheet(WTF::String uaStylesheet)
+{
+    resetCSSDefaultStyleSheets();
+    WebCore::ViewportStyle::styleOverrideString() = String(uaStylesheet);
+}
+
+ReplaceViewportUAStylesheet::~ReplaceViewportUAStylesheet()
+{
+    WebCore::ViewportStyle::styleOverrideString() = WTF::String();
+    resetCSSDefaultStyleSheets();
+}
+
+UseAndroidViewportUAStylesheet::UseAndroidViewportUAStylesheet()
+    : ReplaceViewportUAStylesheet(String(
+        WebCore::viewportAndroidUserAgentStyleSheet,
+        sizeof(WebCore::viewportAndroidUserAgentStyleSheet)))
+{
+}
+
 } // namespace FrameTestHelpers
 } // namespace blink