Index: third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilderTest.cpp |
diff --git a/third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilderTest.cpp b/third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilderTest.cpp |
index 466906e8a5de97fb1bc32f72d39a4f0600b4dadd..0bd39b24c1d26095495def793d9203972de95d3e 100644 |
--- a/third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilderTest.cpp |
+++ b/third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilderTest.cpp |
@@ -145,12 +145,14 @@ TEST_F(PaintPropertyTreeBuilderTest, FrameScrollingTraditional) |
FrameView* frameView = document().view(); |
frameView->updateAllLifecyclePhases(); |
EXPECT_EQ(TransformationMatrix(), frameView->preTranslation()->matrix()); |
pdr.
2016/07/13 02:26:51
Which test caused the original test to be rolled o
trchen
2016/07/13 02:50:39
HTMLCanvasPainterTestForSPv2.Canvas2DLayerAppearsI
|
- EXPECT_EQ(nullptr, frameView->preTranslation()->parent()); |
+ EXPECT_EQ(frameView->rootTransform(), frameView->preTranslation()->parent()); |
+ EXPECT_EQ(nullptr, frameView->rootTransform()->parent()); |
EXPECT_EQ(TransformationMatrix().translate(0, -100), frameView->scrollTranslation()->matrix()); |
EXPECT_EQ(frameView->preTranslation(), frameView->scrollTranslation()->parent()); |
EXPECT_EQ(frameView->preTranslation(), frameView->contentClip()->localTransformSpace()); |
EXPECT_EQ(FloatRoundedRect(0, 0, 800, 600), frameView->contentClip()->clipRect()); |
- EXPECT_EQ(nullptr, frameView->contentClip()->parent()); |
+ EXPECT_EQ(frameView->rootClip(), frameView->contentClip()->parent()); |
+ EXPECT_EQ(nullptr, frameView->rootClip()->parent()); |
pdr.
2016/07/13 02:26:51
Add a basic test for effect too?
trchen
2016/07/13 02:50:39
Root effect was already unconditionally created. T
|
LayoutViewItem layoutViewItem = document().layoutViewItem(); |
ObjectPaintProperties* layoutViewProperties = layoutViewItem.objectPaintProperties(); |