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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: Source/core/paint/DisplayItemListPaintTest.cpp

Issue 1315303007: Let DeprecatedPaintLayer be client of subsequence display items (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 3 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
« no previous file with comments | « Source/core/paint/DeprecatedPaintLayerPainter.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/paint/DisplayItemListPaintTest.cpp
diff --git a/Source/core/paint/DisplayItemListPaintTest.cpp b/Source/core/paint/DisplayItemListPaintTest.cpp
index 675ea5ffb27eea969c2ccf295e7789ae21b5330d..f9fed44c8dc0e8f30525dcc4d6b8d718d643e2db 100644
--- a/Source/core/paint/DisplayItemListPaintTest.cpp
+++ b/Source/core/paint/DisplayItemListPaintTest.cpp
@@ -221,7 +221,7 @@ TEST_F(DisplayItemListPaintTestForSlimmingPaintV2, FullDocumentPaintingWithCaret
document().page()->focusController().setActive(true);
document().page()->focusController().setFocused(true);
LayoutView& layoutView = *document().layoutView();
- LayoutObject& html = *document().documentElement()->layoutObject();
+ DeprecatedPaintLayer& htmlLayer = *toLayoutBoxModelObject(document().documentElement()->layoutObject())->layer();
Element& div = *toElement(document().body()->firstChild());
LayoutObject& divLayoutObject = *document().body()->firstChild()->layoutObject();
InlineTextBox& textInlineBox = *toLayoutText(div.firstChild()->layoutObject())->firstTextBox();
@@ -230,26 +230,26 @@ TEST_F(DisplayItemListPaintTestForSlimmingPaintV2, FullDocumentPaintingWithCaret
EXPECT_DISPLAY_LIST_WITH_RED_FILL_IN_DEBUG(rootDisplayItemList().displayItems(), 4,
TestDisplayItem(layoutView, DisplayItem::BoxDecorationBackground),
- TestDisplayItem(html, DisplayItem::BeginSubsequence),
+ TestDisplayItem(htmlLayer, DisplayItem::BeginSubsequence),
TestDisplayItem(textInlineBox, DisplayItem::paintPhaseToDrawingType(PaintPhaseForeground)),
- TestDisplayItem(html, DisplayItem::EndSubsequence));
+ TestDisplayItem(htmlLayer, DisplayItem::EndSubsequence));
div.focus();
document().view()->updateAllLifecyclePhases();
EXPECT_DISPLAY_LIST_WITH_RED_FILL_IN_DEBUG(rootDisplayItemList().displayItems(), 5,
TestDisplayItem(layoutView, DisplayItem::BoxDecorationBackground),
- TestDisplayItem(html, DisplayItem::BeginSubsequence),
+ TestDisplayItem(htmlLayer, DisplayItem::BeginSubsequence),
TestDisplayItem(textInlineBox, DisplayItem::paintPhaseToDrawingType(PaintPhaseForeground)),
TestDisplayItem(divLayoutObject, DisplayItem::Caret), // New!
- TestDisplayItem(html, DisplayItem::EndSubsequence));
+ TestDisplayItem(htmlLayer, DisplayItem::EndSubsequence));
}
TEST_F(DisplayItemListPaintTestForSlimmingPaintV2, InlineRelayout)
{
setBodyInnerHTML("<div id='div' style='width:100px; height: 200px'>AAAAAAAAAA BBBBBBBBBB</div>");
LayoutView& layoutView = *document().layoutView();
- LayoutObject& html = *document().documentElement()->layoutObject();
+ DeprecatedPaintLayer& htmlLayer = *toLayoutBoxModelObject(document().documentElement()->layoutObject())->layer();
Element& div = *toElement(document().body()->firstChild());
LayoutBlock& divBlock = *toLayoutBlock(document().body()->firstChild()->layoutObject());
LayoutText& text = *toLayoutText(divBlock.firstChild());
@@ -259,9 +259,9 @@ TEST_F(DisplayItemListPaintTestForSlimmingPaintV2, InlineRelayout)
EXPECT_DISPLAY_LIST_WITH_RED_FILL_IN_DEBUG(rootDisplayItemList().displayItems(), 4,
TestDisplayItem(layoutView, DisplayItem::BoxDecorationBackground),
- TestDisplayItem(html, DisplayItem::BeginSubsequence),
+ TestDisplayItem(htmlLayer, DisplayItem::BeginSubsequence),
TestDisplayItem(firstTextBox, DisplayItem::paintPhaseToDrawingType(PaintPhaseForeground)),
- TestDisplayItem(html, DisplayItem::EndSubsequence));
+ TestDisplayItem(htmlLayer, DisplayItem::EndSubsequence));
div.setAttribute(HTMLNames::styleAttr, "width: 10px; height: 200px");
document().view()->updateAllLifecyclePhases();
@@ -272,10 +272,10 @@ TEST_F(DisplayItemListPaintTestForSlimmingPaintV2, InlineRelayout)
EXPECT_DISPLAY_LIST_WITH_RED_FILL_IN_DEBUG(rootDisplayItemList().displayItems(), 5,
TestDisplayItem(layoutView, DisplayItem::BoxDecorationBackground),
- TestDisplayItem(html, DisplayItem::BeginSubsequence),
+ TestDisplayItem(htmlLayer, DisplayItem::BeginSubsequence),
TestDisplayItem(newFirstTextBox, DisplayItem::paintPhaseToDrawingType(PaintPhaseForeground)),
TestDisplayItem(secondTextBox, DisplayItem::paintPhaseToDrawingType(PaintPhaseForeground)),
- TestDisplayItem(html, DisplayItem::EndSubsequence));
+ TestDisplayItem(htmlLayer, DisplayItem::EndSubsequence));
}
TEST_F(DisplayItemListPaintTestForSlimmingPaintV2, CachedSubsequence)
@@ -290,52 +290,54 @@ TEST_F(DisplayItemListPaintTestForSlimmingPaintV2, CachedSubsequence)
document().view()->updateAllLifecyclePhases();
LayoutView& layoutView = *document().layoutView();
- LayoutObject& html = *document().documentElement()->layoutObject();
+ DeprecatedPaintLayer& htmlLayer = *toLayoutBoxModelObject(document().documentElement()->layoutObject())->layer();
LayoutObject& container1 = *document().getElementById("container1")->layoutObject();
+ DeprecatedPaintLayer& container1Layer = *toLayoutBoxModelObject(container1).layer();
LayoutObject& content1 = *document().getElementById("content1")->layoutObject();
LayoutObject& container2 = *document().getElementById("container2")->layoutObject();
+ DeprecatedPaintLayer& container2Layer = *toLayoutBoxModelObject(container2).layer();
LayoutObject& content2 = *document().getElementById("content2")->layoutObject();
EXPECT_DISPLAY_LIST_WITH_RED_FILL_IN_DEBUG(rootDisplayItemList().displayItems(), 11,
TestDisplayItem(layoutView, DisplayItem::BoxDecorationBackground),
- TestDisplayItem(html, DisplayItem::BeginSubsequence),
- TestDisplayItem(container1, DisplayItem::BeginSubsequence),
+ TestDisplayItem(htmlLayer, DisplayItem::BeginSubsequence),
+ TestDisplayItem(container1Layer, DisplayItem::BeginSubsequence),
TestDisplayItem(container1, DisplayItem::BoxDecorationBackground),
TestDisplayItem(content1, DisplayItem::BoxDecorationBackground),
- TestDisplayItem(container1, DisplayItem::EndSubsequence),
- TestDisplayItem(container2, DisplayItem::BeginSubsequence),
+ TestDisplayItem(container1Layer, DisplayItem::EndSubsequence),
+ TestDisplayItem(container2Layer, DisplayItem::BeginSubsequence),
TestDisplayItem(container2, DisplayItem::BoxDecorationBackground),
TestDisplayItem(content2, DisplayItem::BoxDecorationBackground),
- TestDisplayItem(container2, DisplayItem::EndSubsequence),
- TestDisplayItem(html, DisplayItem::EndSubsequence));
+ TestDisplayItem(container2Layer, DisplayItem::EndSubsequence),
+ TestDisplayItem(htmlLayer, DisplayItem::EndSubsequence));
toHTMLElement(content1.node())->setAttribute(HTMLNames::styleAttr, "width: 100px; height: 100px; background-color: green");
updateLifecyclePhasesToPaintForSlimmingPaintV2Clean();
EXPECT_DISPLAY_LIST_WITH_CACHED_RED_FILL_IN_DEBUG(newDisplayItemsBeforeUpdate(), 8,
TestDisplayItem(layoutView, DisplayItem::drawingTypeToCachedDrawingType(DisplayItem::BoxDecorationBackground)),
- TestDisplayItem(html, DisplayItem::BeginSubsequence),
- TestDisplayItem(container1, DisplayItem::BeginSubsequence),
+ TestDisplayItem(htmlLayer, DisplayItem::BeginSubsequence),
+ TestDisplayItem(container1Layer, DisplayItem::BeginSubsequence),
TestDisplayItem(container1, DisplayItem::drawingTypeToCachedDrawingType(DisplayItem::BoxDecorationBackground)),
TestDisplayItem(content1, DisplayItem::BoxDecorationBackground),
- TestDisplayItem(container1, DisplayItem::EndSubsequence),
- TestDisplayItem(container2, DisplayItem::CachedSubsequence),
- TestDisplayItem(html, DisplayItem::EndSubsequence));
+ TestDisplayItem(container1Layer, DisplayItem::EndSubsequence),
+ TestDisplayItem(container2Layer, DisplayItem::CachedSubsequence),
+ TestDisplayItem(htmlLayer, DisplayItem::EndSubsequence));
compositeForSlimmingPaintV2();
EXPECT_DISPLAY_LIST_WITH_RED_FILL_IN_DEBUG(rootDisplayItemList().displayItems(), 11,
TestDisplayItem(layoutView, DisplayItem::BoxDecorationBackground),
- TestDisplayItem(html, DisplayItem::BeginSubsequence),
- TestDisplayItem(container1, DisplayItem::BeginSubsequence),
+ TestDisplayItem(htmlLayer, DisplayItem::BeginSubsequence),
+ TestDisplayItem(container1Layer, DisplayItem::BeginSubsequence),
TestDisplayItem(container1, DisplayItem::BoxDecorationBackground),
TestDisplayItem(content1, DisplayItem::BoxDecorationBackground),
- TestDisplayItem(container1, DisplayItem::EndSubsequence),
- TestDisplayItem(container2, DisplayItem::BeginSubsequence),
+ TestDisplayItem(container1Layer, DisplayItem::EndSubsequence),
+ TestDisplayItem(container2Layer, DisplayItem::BeginSubsequence),
TestDisplayItem(container2, DisplayItem::BoxDecorationBackground),
TestDisplayItem(content2, DisplayItem::BoxDecorationBackground),
- TestDisplayItem(container2, DisplayItem::EndSubsequence),
- TestDisplayItem(html, DisplayItem::EndSubsequence));
+ TestDisplayItem(container2Layer, DisplayItem::EndSubsequence),
+ TestDisplayItem(htmlLayer, DisplayItem::EndSubsequence));
}
} // namespace blink
« no previous file with comments | « Source/core/paint/DeprecatedPaintLayerPainter.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698