| Index: third_party/WebKit/Source/platform/graphics/paint/PaintControllerTest.cpp
|
| diff --git a/third_party/WebKit/Source/platform/graphics/paint/PaintControllerTest.cpp b/third_party/WebKit/Source/platform/graphics/paint/PaintControllerTest.cpp
|
| index f5f45cc8da78e98a8c8c02e09fa814d7f16c31c4..038f0bd39cacaf61f7e07130d344487e70fa0ee9 100644
|
| --- a/third_party/WebKit/Source/platform/graphics/paint/PaintControllerTest.cpp
|
| +++ b/third_party/WebKit/Source/platform/graphics/paint/PaintControllerTest.cpp
|
| @@ -2273,40 +2273,6 @@ class PaintControllerUnderInvalidationTest
|
| DisplayItemClient::EndShouldKeepAliveAllClients();
|
| #endif
|
| }
|
| -
|
| - void TestFoldCompositingDrawingInSubsequence() {
|
| - FakeDisplayItemClient container("container");
|
| - FakeDisplayItemClient content("content");
|
| - GraphicsContext context(GetPaintController());
|
| -
|
| - {
|
| - SubsequenceRecorder subsequence(context, container);
|
| - CompositingRecorder compositing(context, content, SkBlendMode::kSrc, 0.5);
|
| - DrawRect(context, content, kBackgroundDrawingType,
|
| - FloatRect(100, 100, 300, 300));
|
| - }
|
| - GetPaintController().CommitNewDisplayItems();
|
| - EXPECT_EQ(
|
| - 1u,
|
| - GetPaintController().GetPaintArtifact().GetDisplayItemList().size());
|
| -
|
| - {
|
| - EXPECT_FALSE(SubsequenceRecorder::UseCachedSubsequenceIfPossible(
|
| - context, container));
|
| - SubsequenceRecorder subsequence(context, container);
|
| - CompositingRecorder compositing(context, content, SkBlendMode::kSrc, 0.5);
|
| - DrawRect(context, content, kBackgroundDrawingType,
|
| - FloatRect(100, 100, 300, 300));
|
| - }
|
| - GetPaintController().CommitNewDisplayItems();
|
| - EXPECT_EQ(
|
| - 1u,
|
| - GetPaintController().GetPaintArtifact().GetDisplayItemList().size());
|
| -
|
| -#if CHECK_DISPLAY_ITEM_CLIENT_ALIVENESS
|
| - DisplayItemClient::EndShouldKeepAliveAllClients();
|
| -#endif
|
| - }
|
| };
|
|
|
| TEST_F(PaintControllerUnderInvalidationTest, ChangeDrawing) {
|
| @@ -2363,11 +2329,6 @@ TEST_F(PaintControllerUnderInvalidationTest, InvalidationInSubsequence) {
|
| TestInvalidationInSubsequence();
|
| }
|
|
|
| -TEST_F(PaintControllerUnderInvalidationTest,
|
| - FoldCompositingDrawingInSubsequence) {
|
| - TestFoldCompositingDrawingInSubsequence();
|
| -}
|
| -
|
| #endif // defined(GTEST_HAS_DEATH_TEST) && !OS(ANDROID)
|
|
|
| } // namespace blink
|
|
|