Index: third_party/WebKit/Source/core/paint/SVGInlineTextBoxPainterTest.cpp |
diff --git a/third_party/WebKit/Source/core/paint/SVGInlineTextBoxPainterTest.cpp b/third_party/WebKit/Source/core/paint/SVGInlineTextBoxPainterTest.cpp |
index b2ad3742e7811179450730c34c0cf439c544db8b..68362a9545c29a51205b5022dfbd77426d3476f1 100644 |
--- a/third_party/WebKit/Source/core/paint/SVGInlineTextBoxPainterTest.cpp |
+++ b/third_party/WebKit/Source/core/paint/SVGInlineTextBoxPainterTest.cpp |
@@ -99,11 +99,6 @@ const static int kPixelDelta = 4; |
<< ", expected: " << expected.Height(); \ |
} while (false) |
-static IntRect CullRectFromDrawing( |
- const DrawingDisplayItem& drawing_display_item) { |
- return IntRect(drawing_display_item.GetPaintRecord()->cullRect()); |
-} |
- |
TEST_F(SVGInlineTextBoxPainterTest, TextCullRect_DefaultWritingMode) { |
SetBodyInnerHTML( |
"<svg width='400px' height='400px' font-family='Arial' font-size='30'>" |
@@ -115,7 +110,7 @@ TEST_F(SVGInlineTextBoxPainterTest, TextCullRect_DefaultWritingMode) { |
GetDrawingForSVGTextById("target"); |
AssertTextDrawingEquals(drawing_display_item, "x"); |
EXPECT_RECT_EQ(IntRect(50, 3, 15, 33), |
- CullRectFromDrawing(*drawing_display_item)); |
+ drawing_display_item->GetPaintRecordBounds()); |
SelectAllText(); |
GetDocument().View()->UpdateAllLifecyclePhases(); |
@@ -123,7 +118,7 @@ TEST_F(SVGInlineTextBoxPainterTest, TextCullRect_DefaultWritingMode) { |
drawing_display_item = GetDrawingForSVGTextById("target"); |
AssertTextDrawingEquals(drawing_display_item, "x"); |
EXPECT_RECT_EQ(IntRect(50, 3, 15, 33), |
- CullRectFromDrawing(*drawing_display_item)); |
+ drawing_display_item->GetPaintRecordBounds()); |
} |
TEST_F(SVGInlineTextBoxPainterTest, TextCullRect_WritingModeTopToBottom) { |
@@ -137,7 +132,7 @@ TEST_F(SVGInlineTextBoxPainterTest, TextCullRect_WritingModeTopToBottom) { |
GetDrawingForSVGTextById("target"); |
AssertTextDrawingEquals(drawing_display_item, "x"); |
EXPECT_RECT_EQ(IntRect(33, 30, 34, 15), |
- CullRectFromDrawing(*drawing_display_item)); |
+ drawing_display_item->GetPaintRecordBounds()); |
SelectAllText(); |
GetDocument().View()->UpdateAllLifecyclePhases(); |
@@ -148,7 +143,7 @@ TEST_F(SVGInlineTextBoxPainterTest, TextCullRect_WritingModeTopToBottom) { |
drawing_display_item = GetDrawingForSVGTextById("target"); |
AssertTextDrawingEquals(drawing_display_item, "x"); |
EXPECT_RECT_EQ(IntRect(33, 30, 34, 16), |
- CullRectFromDrawing(*drawing_display_item)); |
+ drawing_display_item->GetPaintRecordBounds()); |
} |
TEST_F(SVGInlineTextBoxPainterTest, TextCullRect_TextShadow) { |
@@ -163,7 +158,7 @@ TEST_F(SVGInlineTextBoxPainterTest, TextCullRect_TextShadow) { |
GetDrawingForSVGTextById("target"); |
AssertTextDrawingEquals(drawing_display_item, "x"); |
EXPECT_RECT_EQ(IntRect(50, 3, 220, 238), |
- CullRectFromDrawing(*drawing_display_item)); |
+ drawing_display_item->GetPaintRecordBounds()); |
} |
} // namespace |