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

Unified Diff: Source/core/layout/line/InlineTextBox.cpp

Issue 931633003: Move and rename RenderBR to LayoutBR. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: 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
« no previous file with comments | « Source/core/layout/LayoutTreeAsText.cpp ('k') | Source/core/rendering/RenderBR.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/line/InlineTextBox.cpp
diff --git a/Source/core/layout/line/InlineTextBox.cpp b/Source/core/layout/line/InlineTextBox.cpp
index a3ad28d81949e8b4d6694a3db5239a6625c300c2..531dcacf811ca0a7d741c11582f641d7fb5a749a 100644
--- a/Source/core/layout/line/InlineTextBox.cpp
+++ b/Source/core/layout/line/InlineTextBox.cpp
@@ -24,13 +24,13 @@
#include "core/layout/line/InlineTextBox.h"
#include "core/layout/HitTestResult.h"
+#include "core/layout/LayoutBR.h"
#include "core/layout/LayoutRubyRun.h"
#include "core/layout/LayoutRubyText.h"
#include "core/layout/PaintInfo.h"
#include "core/layout/line/AbstractInlineTextBox.h"
#include "core/layout/line/EllipsisBox.h"
#include "core/paint/InlineTextBoxPainter.h"
-#include "core/rendering/RenderBR.h"
#include "core/rendering/RenderBlock.h"
#include "platform/fonts/FontCache.h"
#include "platform/fonts/shaping/SimpleShaper.h"
@@ -113,7 +113,7 @@ LayoutUnit InlineTextBox::lineHeight() const
if (!isText() || !renderer().parent())
return 0;
if (renderer().isBR())
- return toRenderBR(renderer()).lineHeight(isFirstLineStyle());
+ return toLayoutBR(renderer()).lineHeight(isFirstLineStyle());
if (parent()->renderer() == renderer().parent())
return parent()->lineHeight();
return toRenderBoxModelObject(renderer().parent())->lineHeight(isFirstLineStyle(), isHorizontal() ? HorizontalLine : VerticalLine, PositionOnContainingLine);
« no previous file with comments | « Source/core/layout/LayoutTreeAsText.cpp ('k') | Source/core/rendering/RenderBR.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698