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 ed4d6a18cbd7515eb4e393c8b6734ca9e941bce6..bd302cdd0f5b459263c661abd883f4e092fa1863 100644 |
--- a/third_party/WebKit/Source/platform/graphics/paint/PaintControllerTest.cpp |
+++ b/third_party/WebKit/Source/platform/graphics/paint/PaintControllerTest.cpp |
@@ -502,6 +502,10 @@ TEST_F(PaintControllerTest, CachedSubsequenceSwapOrder) |
TestDisplayItem(content1, foregroundDrawingType), |
TestDisplayItem(container1, foregroundDrawingType), |
TestDisplayItem(container1, DisplayItem::EndSubsequence)); |
+ |
+#if CHECK_DISPLAY_ITEM_CLIENT_ALIVENESS |
+ DisplayItemClient::endShouldKeepAliveAllClients(); |
+#endif |
} |
TEST_F(PaintControllerTest, OutOfOrderNoCrash) |
@@ -620,6 +624,10 @@ TEST_F(PaintControllerTest, CachedNestedSubsequenceUpdate) |
TestDisplayItem(content1, DisplayItem::EndSubsequence), |
TestDisplayItem(container1, foregroundDrawingType), |
TestDisplayItem(container1, DisplayItem::EndSubsequence)); |
+ |
+#if CHECK_DISPLAY_ITEM_CLIENT_ALIVENESS |
+ DisplayItemClient::endShouldKeepAliveAllClients(); |
+#endif |
} |
TEST_F(PaintControllerTest, SkipCache) |
@@ -893,6 +901,10 @@ TEST_F(PaintControllerTest, IsNotSuitableForGpuRasterizationSinglePictureManyPat |
EXPECT_TRUE(SubsequenceRecorder::useCachedSubsequenceIfPossible(context, container)); |
getPaintController().commitNewDisplayItems(LayoutSize()); |
EXPECT_FALSE(getPaintController().paintArtifact().isSuitableForGpuRasterization()); |
+ |
+#if CHECK_DISPLAY_ITEM_CLIENT_ALIVENESS |
+ DisplayItemClient::endShouldKeepAliveAllClients(); |
+#endif |
} |
// Temporarily disabled (pref regressions due to GPU veto stickiness: http://crbug.com/603969). |