Reland "Avoid layout/full-repaint on view height change if possible"

Source/web/tests/WebFrameTest.cpp

Index: Source/web/tests/WebFrameTest.cpp
diff --git a/Source/web/tests/WebFrameTest.cpp b/Source/web/tests/WebFrameTest.cpp
index 2ace031af1056175cb57ce2b8e9a2a66058c1d07..2769260d4a2b0da96b4fad530c1347b6316a4449 100644
--- a/Source/web/tests/WebFrameTest.cpp
+++ b/Source/web/tests/WebFrameTest.cpp
@@ -105,10 +105,12 @@ namespace {
 const int touchPointPadding = 32;
 
 #define EXPECT_EQ_RECT(a, b) \
-    EXPECT_EQ(a.x(), b.x()); \
-    EXPECT_EQ(a.y(), b.y()); \
-    EXPECT_EQ(a.width(), b.width()); \
-    EXPECT_EQ(a.height(), b.height());
+    do { \
+        EXPECT_EQ(a.x(), b.x()); \
+        EXPECT_EQ(a.y(), b.y()); \
+        EXPECT_EQ(a.width(), b.width()); \
+        EXPECT_EQ(a.height(), b.height()); \
+    } while (false)
 
 class FakeCompositingWebViewClient : public WebViewClient {
 public:
@@ -5194,6 +5196,93 @@ TEST_F(WebFrameTest, CreateChildFrameFailure)
     EXPECT_EQ(1, client.callCount());
 }
 
+TEST_F(WebFrameTest, heightChangeRepaint)
+{
+    const char* kTests[] = {
+        "repaint/height-change-no-full-repaint1.html",
+        "repaint/height-change-no-full-repaint2.html",
+
+        // The following tests need full repaint on height change for now,
+        // but may be optimized not to need full repaint in the future and need
+        // to be updated.
+        "repaint/height-change-repaint1.html", // vertical writing mode
+        "repaint/height-change-repaint2.html", // frameset
+        "repaint/height-change-repaint3.html", // percentage height
+        "repaint/height-change-repaint4.html", // positioned percentage height
+        "repaint/height-change-repaint5.html", // percentage top
+        "repaint/height-change-repaint6.html", // bottom
+        "repaint/height-change-repaint7.html", // viewport related media query
+        "repaint/height-change-repaint8.html", // viewport percentage length
+    };
+
+    UseMockScrollbarSettings mockScrollbarSettings;
+
+    FrameTestHelpers::WebViewHelper webViewHelper;
+    WebViewImpl* webView = webViewHelper.initialize(true);
+
+    for (size_t i = 0; i < arraysize(kTests); ++i) {
+        SCOPED_TRACE(kTests[i]);
+        registerMockedHttpURLLoad(kTests[i]);
+        FrameTestHelpers::loadFrame(webView->mainFrame(), m_baseURL + kTests[i]);
+        Platform::current()->unitTestSupport()->serveAsynchronousMockedRequests();
+
+        webView->resize(WebSize(200, 200));
+        webView->layout();
+
+        // Change height.
+        WebCore::FrameView* frameView = webView->mainFrameImpl()->frameView();
+        frameView->setTracksRepaints(true);
+        webView->resize(WebSize(200, 300));
+        webView->layout();
+        if (strstr(kTests[i], "no-full-repaint"))
+            EXPECT_EQ_RECT(WebCore::IntRect(0, 200, 200, 100), WebCore::unionRect(frameView->trackedRepaintRects()));
+        else
+            EXPECT_EQ_RECT(WebCore::IntRect(0, 0, 200, 300), WebCore::unionRect(frameView->trackedRepaintRects()));
+        frameView->setTracksRepaints(false);
+
+        // Change width, ensure optimized logic for height change doesn't break repaint on width change.
+        frameView->setTracksRepaints(true);
+        webView->resize(WebSize(300, 300));
+        webView->layout();
+        EXPECT_EQ_RECT(WebCore::IntRect(0, 0, 300, 300), WebCore::unionRect(frameView->trackedRepaintRects()));
+        frameView->setTracksRepaints(false);
+    }
+}
+
+TEST_F(WebFrameTest, heightChangeNoFullRepaintOverflowChange)
+{
+    UseMockScrollbarSettings mockScrollbarSettings;
+
+    registerMockedHttpURLLoad("repaint/height-change-no-full-repaint-overflow-change.html");
+    FrameTestHelpers::WebViewHelper webViewHelper;
+    webViewHelper.initializeAndLoad(m_baseURL + "repaint/height-change-no-full-repaint-overflow-change.html");
+    WebView* webView = webViewHelper.webView();
+    webView->resize(WebSize(200, 200));
+    webView->layout();
+
+    WebCore::FrameView* frameView = toWebFrameImpl(webView->mainFrame())->frameView();
+    WebCore::RenderView* renderView = frameView->renderView();
+    EXPECT_TRUE(renderView->hasRenderOverflow());
+    EXPECT_EQ_RECT(WebCore::IntRect(0, 0, 200, 200), WebCore::enclosingIntRect(renderView->visualOverflowRect()));
+    EXPECT_EQ_RECT(WebCore::IntRect(0, 0, 200, 250), WebCore::enclosingIntRect(renderView->layoutOverflowRect()));
+
+    frameView->setTracksRepaints(true);
+    webView->resize(WebSize(200, 300));
+    webView->layout();
+    EXPECT_EQ_RECT(WebCore::IntRect(0, 200, 200, 100), WebCore::unionRect(frameView->trackedRepaintRects()));
+    frameView->setTracksRepaints(false);
+
+    EXPECT_FALSE(renderView->hasRenderOverflow());
+    EXPECT_EQ_RECT(WebCore::IntRect(0, 0, 200, 300), WebCore::enclosingIntRect(renderView->visualOverflowRect()));
+    EXPECT_EQ_RECT(WebCore::IntRect(0, 0, 200, 300), WebCore::enclosingIntRect(renderView->layoutOverflowRect()));
+
+    webView->resize(WebSize(200, 200));
+    webView->layout();
+    EXPECT_TRUE(renderView->hasRenderOverflow());
+    EXPECT_EQ_RECT(WebCore::IntRect(0, 0, 200, 200), WebCore::enclosingIntRect(renderView->visualOverflowRect()));
+    EXPECT_EQ_RECT(WebCore::IntRect(0, 0, 200, 250), WebCore::enclosingIntRect(renderView->layoutOverflowRect()));
+}
+
 TEST_F(WebFrameTest, fixedPositionInFixedViewport)
 {
     UseMockScrollbarSettings mockScrollbarSettings;