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

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

Issue 940373003: Rename RenderText to LayoutText (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Merge w/HEAD again Created 5 years, 10 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
Index: Source/core/paint/ViewDisplayListTest.cpp
diff --git a/Source/core/paint/ViewDisplayListTest.cpp b/Source/core/paint/ViewDisplayListTest.cpp
index c3b8632183c4cd817f53d7218156d59ed0617b1d..06fb3e00075c97478d2d3f25dbe90885a216783a 100644
--- a/Source/core/paint/ViewDisplayListTest.cpp
+++ b/Source/core/paint/ViewDisplayListTest.cpp
@@ -5,6 +5,7 @@
#include "config.h"
#include "core/layout/LayoutTestHelper.h"
+#include "core/layout/LayoutText.h"
#include "core/layout/LayoutView.h"
#include "core/layout/compositing/LayerCompositor.h"
#include "core/layout/line/InlineTextBox.h"
@@ -14,7 +15,6 @@
#include "core/paint/RenderDrawingRecorder.h"
#include "core/paint/ScopeRecorder.h"
#include "core/paint/SubtreeRecorder.h"
-#include "core/rendering/RenderText.h"
#include "platform/graphics/GraphicsContext.h"
#include "platform/graphics/GraphicsLayer.h"
#include "platform/graphics/paint/DisplayItemList.h"
@@ -436,7 +436,7 @@ TEST_F(ViewDisplayListTest, FullDocumentPaintingWithCaret_CacheDisabled)
LayoutObject* htmlRenderer = document().documentElement()->renderer();
Element* div = toElement(document().body()->firstChild());
LayoutObject* divRenderer = document().body()->firstChild()->renderer();
- InlineTextBox* textInlineBox = toRenderText(div->firstChild()->renderer())->firstTextBox();
+ InlineTextBox* textInlineBox = toLayoutText(div->firstChild()->renderer())->firstTextBox();
SkCanvas canvas(800, 600);
GraphicsContext context(&canvas, &rootDisplayItemList());
@@ -472,7 +472,7 @@ TEST_F(ViewDisplayListTest, FullDocumentPaintingWithCaret_CacheEnabled)
LayoutObject* bodyRenderer = document().body()->renderer();
Element* div = toElement(document().body()->firstChild());
LayoutObject* divRenderer = document().body()->firstChild()->renderer();
- InlineTextBox* textInlineBox = toRenderText(div->firstChild()->renderer())->firstTextBox();
+ InlineTextBox* textInlineBox = toLayoutText(div->firstChild()->renderer())->firstTextBox();
SkCanvas canvas(800, 600);
GraphicsContext context(&canvas, &rootDisplayItemList());

Powered by Google App Engine
This is Rietveld 408576698