Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(272)

Unified Diff: third_party/WebKit/Source/core/layout/LayoutObjectTest.cpp

Issue 2219903002: Revert of Don't traverse non-stacked layer under composited child in traverseNonCompositingDescendants (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/layout/LayoutObjectTest.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutObjectTest.cpp b/third_party/WebKit/Source/core/layout/LayoutObjectTest.cpp
index 6c1af3251ea025ebc6d2f00fdcca66b24b3b1f2b..6a86f8c51280fd286c050447144efd31bf19439b 100644
--- a/third_party/WebKit/Source/core/layout/LayoutObjectTest.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutObjectTest.cpp
@@ -4,11 +4,9 @@
#include "core/layout/LayoutObject.h"
-#include "core/frame/FrameView.h"
#include "core/layout/LayoutTestHelper.h"
#include "core/layout/LayoutView.h"
#include "core/layout/api/LayoutAPIShim.h"
-#include "platform/JSONValues.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace blink {
@@ -126,43 +124,4 @@
EXPECT_EQ(columns->layer(), overflowClipObject->paintingLayer());
}
-TEST_F(LayoutObjectTest, TraverseNonCompositingDescendantsInPaintOrder)
-{
- if (RuntimeEnabledFeatures::slimmingPaintV2Enabled())
- return;
-
- enableCompositing();
- setBodyInnerHTML(
- "<style>div { width: 10px; height: 10px; background-color: green; }</style>"
- "<div id='container' style='position: fixed'>"
- " <div id='normal-child'></div>"
- " <div id='stacked-child' style='position: relative'></div>"
- " <div id='composited-stacking-context' style='will-change: transform'>"
- " <div id='normal-child-of-composited-stacking-context'></div>"
- " <div id='stacked-child-of-composited-stacking-context' style='position: relative'></div>"
- " </div>"
- " <div id='composited-non-stacking-context' style='backface-visibility: hidden'>"
- " <div id='normal-child-of-composited-non-stacking-context'></div>"
- " <div id='stacked-child-of-composited-non-stacking-context' style='position: relative'></div>"
- " <div id='non-stacked-layered-child-of-composited-non-stacking-context' style='overflow: scroll'></div>"
- " </div>"
- "</div>");
-
- document().view()->setTracksPaintInvalidations(true);
- getLayoutObjectByElementId("container")->invalidateDisplayItemClientsIncludingNonCompositingDescendants(PaintInvalidationSubtree);
- RefPtr<JSONArray> invalidations = document().view()->trackedObjectPaintInvalidationsAsJSON();
- document().view()->setTracksPaintInvalidations(false);
-
- ASSERT_EQ(4u, invalidations->length());
- String s;
- static_cast<JSONObject*>(invalidations->get(0).get())->get("object")->asString(&s);
- EXPECT_EQ(getLayoutObjectByElementId("container")->debugName(), s);
- static_cast<JSONObject*>(invalidations->get(1).get())->get("object")->asString(&s);
- EXPECT_EQ(getLayoutObjectByElementId("normal-child")->debugName(), s);
- static_cast<JSONObject*>(invalidations->get(2).get())->get("object")->asString(&s);
- EXPECT_EQ(getLayoutObjectByElementId("stacked-child")->debugName(), s);
- static_cast<JSONObject*>(invalidations->get(3).get())->get("object")->asString(&s);
- EXPECT_EQ(getLayoutObjectByElementId("stacked-child-of-composited-non-stacking-context")->debugName(), s);
-}
-
} // namespace blink
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutObject.cpp ('k') | tools/perf/benchmarks/system_health_smoke_test.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698