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

Side by Side Diff: third_party/WebKit/Source/core/paint/TableCellPainterTest.cpp

Issue 1401363003: Rename DisplayItemList to PaintController (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 6
7 #include "core/paint/DisplayItemListPaintTest.h" 7 #include "core/paint/PaintControllerPaintTest.h"
8 #include "core/paint/PaintLayerPainter.h" 8 #include "core/paint/PaintLayerPainter.h"
9 #include "platform/graphics/GraphicsContext.h" 9 #include "platform/graphics/GraphicsContext.h"
10 10
11 namespace blink { 11 namespace blink {
12 12
13 using TableCellPainterTest = DisplayItemListPaintTest; 13 using TableCellPainterTest = PaintControllerPaintTest;
14 14
15 // TODO(wangxianzhu): Create a version for slimming paint v2 when it supports in terest rect 15 // TODO(wangxianzhu): Create a version for slimming paint v2 when it supports in terest rect
16 TEST_F(TableCellPainterTest, TableCellBackgroundInterestRect) 16 TEST_F(TableCellPainterTest, TableCellBackgroundInterestRect)
17 { 17 {
18 setBodyInnerHTML( 18 setBodyInnerHTML(
19 "<style>" 19 "<style>"
20 " td { width: 200px; height: 200px; border: none; }" 20 " td { width: 200px; height: 200px; border: none; }"
21 " tr { background-color: blue; }" 21 " tr { background-color: blue; }"
22 " table { border: none; border-spacing: 0; border-collapse: collapse; } " 22 " table { border: none; border-spacing: 0; border-collapse: collapse; } "
23 "</style>" 23 "</style>"
24 "<table>" 24 "<table>"
25 " <tr><td id='cell1'></td></tr>" 25 " <tr><td id='cell1'></td></tr>"
26 " <tr><td id='cell2'></td></tr>" 26 " <tr><td id='cell2'></td></tr>"
27 "</table>"); 27 "</table>");
28 28
29 LayoutView& layoutView = *document().layoutView(); 29 LayoutView& layoutView = *document().layoutView();
30 PaintLayer& rootLayer = *layoutView.layer(); 30 PaintLayer& rootLayer = *layoutView.layer();
31 LayoutObject& cell1 = *document().getElementById("cell1")->layoutObject(); 31 LayoutObject& cell1 = *document().getElementById("cell1")->layoutObject();
32 LayoutObject& cell2 = *document().getElementById("cell2")->layoutObject(); 32 LayoutObject& cell2 = *document().getElementById("cell2")->layoutObject();
33 33
34 GraphicsContext context(&rootDisplayItemList()); 34 GraphicsContext context(&rootPaintController());
35 PaintLayerPaintingInfo paintingInfo(&rootLayer, LayoutRect(0, 0, 200, 200), GlobalPaintNormalPhase, LayoutSize()); 35 PaintLayerPaintingInfo paintingInfo(&rootLayer, LayoutRect(0, 0, 200, 200), GlobalPaintNormalPhase, LayoutSize());
36 PaintLayerPainter(rootLayer).paintLayerContents(&context, paintingInfo, Pain tLayerPaintingCompositingAllPhases); 36 PaintLayerPainter(rootLayer).paintLayerContents(&context, paintingInfo, Pain tLayerPaintingCompositingAllPhases);
37 rootDisplayItemList().commitNewDisplayItems(); 37 rootPaintController().commitNewDisplayItems();
38 38
39 EXPECT_DISPLAY_LIST(rootDisplayItemList().displayItems(), 2, 39 EXPECT_DISPLAY_LIST(rootPaintController().displayItems(), 2,
40 TestDisplayItem(layoutView, DisplayItem::BoxDecorationBackground), 40 TestDisplayItem(layoutView, DisplayItem::BoxDecorationBackground),
41 TestDisplayItem(cell1, DisplayItem::TableCellBackgroundFromRow)); 41 TestDisplayItem(cell1, DisplayItem::TableCellBackgroundFromRow));
42 42
43 PaintLayerPaintingInfo paintingInfo1(&rootLayer, LayoutRect(0, 300, 200, 200 ), GlobalPaintNormalPhase, LayoutSize()); 43 PaintLayerPaintingInfo paintingInfo1(&rootLayer, LayoutRect(0, 300, 200, 200 ), GlobalPaintNormalPhase, LayoutSize());
44 PaintLayerPainter(rootLayer).paintLayerContents(&context, paintingInfo1, Pai ntLayerPaintingCompositingAllPhases); 44 PaintLayerPainter(rootLayer).paintLayerContents(&context, paintingInfo1, Pai ntLayerPaintingCompositingAllPhases);
45 rootDisplayItemList().commitNewDisplayItems(); 45 rootPaintController().commitNewDisplayItems();
46 46
47 EXPECT_DISPLAY_LIST(rootDisplayItemList().displayItems(), 2, 47 EXPECT_DISPLAY_LIST(rootPaintController().displayItems(), 2,
48 TestDisplayItem(layoutView, DisplayItem::BoxDecorationBackground), 48 TestDisplayItem(layoutView, DisplayItem::BoxDecorationBackground),
49 TestDisplayItem(cell2, DisplayItem::TableCellBackgroundFromRow)); 49 TestDisplayItem(cell2, DisplayItem::TableCellBackgroundFromRow));
50 } 50 }
51 51
52 } // namespace blink 52 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/paint/ScrollRecorder.cpp ('k') | third_party/WebKit/Source/core/paint/Transform3DRecorder.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698