Revert of Fix incorrect sign in scroll and content box offset in absoluteToLocalPoint.

third_party/WebKit/Source/core/layout/compositing/CompositedLayerMappingTest.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "core/layout/compositing/CompositedLayerMapping.h"
 
 #include "core/frame/FrameView.h"
+#include "core/html/HTMLIFrameElement.h"
 #include "core/layout/LayoutBoxModelObject.h"
 #include "core/layout/LayoutTestHelper.h"
 #include "core/layout/LayoutView.h"
+#include "core/loader/EmptyClients.h"
 #include "core/paint/PaintLayer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace blink {
 
 class CompositedLayerMappingTest : public RenderingTest {
 public:
     CompositedLayerMappingTest()
         : RenderingTest(SingleChildFrameLoaderClient::create())
         , m_originalSlimmingPaintSynchronizedPaintingEnabled(RuntimeEnabledFeatures::slimmingPaintSynchronizedPaintingEnabled())
@@ skipping 27 matching lines @@
 
         RenderingTest::SetUp();
         enableCompositing();
         GraphicsLayer::setDrawDebugRedFillForTesting(false);
     }
 
     void TearDown() override
     {
         GraphicsLayer::setDrawDebugRedFillForTesting(true);
         RuntimeEnabledFeatures::setSlimmingPaintSynchronizedPaintingEnabled(m_originalSlimmingPaintSynchronizedPaintingEnabled);
-
-        RenderingTest::TearDown();
     }
 
     bool m_originalSlimmingPaintSynchronizedPaintingEnabled;
 };
 
 #define EXPECT_RECT_EQ(expected, actual) \
     do { \
-        const IntRect& actualRect = actual; \
-        EXPECT_EQ(expected.x(), actualRect.x()); \
-        EXPECT_EQ(expected.y(), actualRect.y()); \
-        EXPECT_EQ(expected.width(), actualRect.width()); \
-        EXPECT_EQ(expected.height(), actualRect.height()); \
+        EXPECT_EQ(expected.x(), actual.x()); \
+        EXPECT_EQ(expected.y(), actual.y()); \
+        EXPECT_EQ(expected.width(), actual.width()); \
+        EXPECT_EQ(expected.height(), actual.height()); \
     } while (false)
 
 TEST_F(CompositedLayerMappingTest, SimpleInterestRect)
 {
     setBodyInnerHTML("<div id='target' style='width: 200px; height: 200px; will-change: transform'></div>");
 
     document().view()->updateAllLifecyclePhases();
     Element* element = document().getElementById("target");
     PaintLayer* paintLayer = toLayoutBoxModelObject(element->layoutObject())->layer();
     ASSERT_TRUE(!!paintLayer->graphicsLayerBacking());
@@ skipping 399 matching lines @@
         "    <div id='squashed' style='height: 1000px; width: 10000px; right: 0; position: absolute'></div>"
         "  </div>"
         "</div>");
 
     CompositedLayerMapping* groupedMapping = document().getElementById("squashed")->layoutBox()->layer()->groupedMapping();
     // The squashing layer is at (-9600, 0, 10000, 1000) in viewport coordinates.
     // The following rect is at (-4000, 0, 4400, 1000) in viewport coordinates.
     EXPECT_RECT_EQ(IntRect(5600, 0, 4400, 1000), groupedMapping->computeInterestRect(groupedMapping->squashingLayer(), IntRect()));
 }
 
-TEST_F(CompositedLayerMappingTest, InterestRectOfIframeInScrolledDiv)
+TEST_F(CompositedLayerMappingTest, InterestRectOfScrolledIframe)
 {
     document().setBaseURLOverride(KURL(ParsedURLString, "http://test.com"));
     setBodyInnerHTML(
         "<style>body { margin: 0; }</style>"
         "<div style='width: 200; height: 8000px'></div>"
         "<iframe id=frame src='http://test.com' width='500' height='500' frameBorder='0'>"
         "</iframe>");
 
-    Document& frameDocument = setupChildIframe("frame", "<style>body { margin: 0; } #target { width: 200px; height: 200px; will-change: transform}</style><div id=target></div>");
+    HTMLIFrameElement& iframe = *toHTMLIFrameElement(document().getElementById("frame"));
+    OwnPtrWillBeRawPtr<FrameLoaderClient> frameLoaderClient = FrameLoaderClientWithParent::create(document().frame());
+    RefPtrWillBePersistent<LocalFrame> subframe = LocalFrame::create(frameLoaderClient.get(), document().frame()->host(), &iframe);
+    subframe->setView(FrameView::create(subframe.get(), IntSize(500, 500)));
+    subframe->init();
+    static_cast<SingleChildFrameLoaderClient*>(document().frame()->client())->setChild(subframe.get());
+    document().frame()->host()->incrementSubframeCount();
+    Document& frameDocument = *iframe.contentDocument();
+
+    frameDocument.setBaseURLOverride(KURL(ParsedURLString, "http://test.com"));
+    frameDocument.body()->setInnerHTML("<style>body { margin: 0; } #target { width: 200px; height: 200px; will-change: transform}</style><div id=target></div>",
+        ASSERT_NO_EXCEPTION);
 
     // Scroll 8000 pixels down to move the iframe into view.
     document().view()->setScrollPosition(DoublePoint(0.0, 8000.0), ProgrammaticScroll);
     document().view()->updateAllLifecyclePhases();
 
     Element* target = frameDocument.getElementById("target");
     ASSERT_TRUE(target);
 
     EXPECT_RECT_EQ(IntRect(0, 0, 200, 200), recomputeInterestRect(target->layoutObject()->enclosingLayer()->graphicsLayerBacking()));
-}
 
-TEST_F(CompositedLayerMappingTest, InterestRectOfScrolledIframe)
-{
-    document().setBaseURLOverride(KURL(ParsedURLString, "http://test.com"));
-    document().frame()->settings()->setPreferCompositingToLCDTextEnabled(true);
-    setBodyInnerHTML(
-        "<style>body { margin: 0; }</style>"
-        "<iframe id=frame src='http://test.com' width='500' height='500' frameBorder='0'>"
-        "</iframe>");
-
-    Document& frameDocument = setupChildIframe("frame", "<style>body { margin: 0; } #target { width: 200px; height: 8000px;}</style><div id=target></div>");
-
-    document().view()->updateAllLifecyclePhases();
-
-    // Scroll 7500 pixels down to bring the scrollable area to the bottom.
-    frameDocument.view()->setScrollPosition(DoublePoint(0.0, 7500.0), ProgrammaticScroll);
-    document().view()->updateAllLifecyclePhases();
-
-    ASSERT_TRUE(frameDocument.view()->layoutView()->hasLayer());
-    // The width is 485 pixels due to the size of the scrollbar.
-    EXPECT_RECT_EQ(IntRect(0, 3500, 485, 4500), recomputeInterestRect(frameDocument.view()->layoutView()->enclosingLayer()->graphicsLayerBacking()));
-}
-
-TEST_F(CompositedLayerMappingTest, InterestRectOfIframeWithContentBoxOffset)
-{
-    document().setBaseURLOverride(KURL(ParsedURLString, "http://test.com"));
-    document().frame()->settings()->setPreferCompositingToLCDTextEnabled(true);
-    // Set a 10px border in order to have a contentBoxOffset for the iframe element.
-    setBodyInnerHTML(
-        "<style>body { margin: 0; } #frame { border: 10px solid black; }</style>"
-        "<iframe id=frame src='http://test.com' width='500' height='500' frameBorder='0'>"
-        "</iframe>");
-
-    Document& frameDocument = setupChildIframe("frame", "<style>body { margin: 0; } #target { width: 200px; height: 8000px;}</style> <div id=target></div>");
-
-    document().view()->updateAllLifecyclePhases();
-
-    // Scroll 3000 pixels down to bring the scrollable area to somewhere in the middle.
-    frameDocument.view()->setScrollPosition(DoublePoint(0.0, 3000.0), ProgrammaticScroll);
-    document().view()->updateAllLifecyclePhases();
-
-    ASSERT_TRUE(frameDocument.view()->layoutView()->hasLayer());
-    // The width is 485 pixels due to the size of the scrollbar.
-    EXPECT_RECT_EQ(IntRect(0, 0, 485, 7500), recomputeInterestRect(frameDocument.view()->layoutView()->enclosingLayer()->graphicsLayerBacking()));
+    subframe->detach(FrameDetachType::Remove);
+    static_cast<SingleChildFrameLoaderClient*>(document().frame()->client())->setChild(nullptr);
+    document().frame()->host()->decrementSubframeCount();
 }
 
 } // namespace blink