Toggle GPU raster heuristics based on viewportEnabled.

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

Index: third_party/WebKit/Source/web/tests/ViewportTest.cpp
diff --git a/third_party/WebKit/Source/web/tests/ViewportTest.cpp b/third_party/WebKit/Source/web/tests/ViewportTest.cpp
index 83b34db43e8e8c2c41193a7e853b4a2058268f24..4804e5e72093972feaeee05e00019f036586cb54 100644
--- a/third_party/WebKit/Source/web/tests/ViewportTest.cpp
+++ b/third_party/WebKit/Source/web/tests/ViewportTest.cpp
@@ -2792,6 +2792,11 @@ TEST_F(ViewportTest, viewportTriggersGpuRasterization)
     webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-gpu-rasterization-disabled-without-viewport.html", true, nullptr, nullptr, nullptr, setViewportSettings);
     webViewHelper.webView()->resize(WebSize(640, 480));
     EXPECT_FALSE(webViewHelper.webView()->matchesHeuristicsForGpuRasterizationForTesting());
+    // Also test that setting enableViewport to false (as on desktop Chrome)
+    // supports GPU raster unconditionally.
+    webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-gpu-rasterization-disabled-without-viewport.html", true);
+    webViewHelper.webView()->resize(WebSize(640, 480));
+    EXPECT_TRUE(webViewHelper.webView()->matchesHeuristicsForGpuRasterizationForTesting());
 
     registerMockedHttpURLLoad("viewport/viewport-gpu-rasterization.html");
     webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-gpu-rasterization.html", true, nullptr, nullptr, nullptr, setViewportSettings);