Source/core/rendering/RenderBlock.cpp - Issue 940373003: Rename RenderText to LayoutText

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/core/rendering/RenderBlock.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:

Index: Source/core/rendering/RenderBlock.cpp

diff --git a/Source/core/rendering/RenderBlock.cpp b/Source/core/rendering/RenderBlock.cpp

index c6a0c8e0b8e514938cdca7bce52a8e3e18058ee9..838e704d90cc8582ba327774ee822d341fb7acac 100644

--- a/Source/core/rendering/RenderBlock.cpp

+++ b/Source/core/rendering/RenderBlock.cpp

@@ -41,6 +41,7 @@

#include "core/layout/HitTestLocation.h"

#include "core/layout/HitTestResult.h"

#include "core/layout/Layer.h"

+#include "core/layout/LayoutCombineText.h"

#include "core/layout/LayoutDeprecatedFlexibleBox.h"

#include "core/layout/LayoutFlowThread.h"

#include "core/layout/LayoutGrid.h"

@@ -48,6 +49,7 @@

#include "core/layout/LayoutRegion.h"

#include "core/layout/LayoutTableCell.h"

#include "core/layout/LayoutTextControl.h"

+#include "core/layout/LayoutTextFragment.h"

#include "core/layout/LayoutTheme.h"

#include "core/layout/LayoutView.h"

#include "core/layout/PaintInfo.h"

@@ -61,10 +63,8 @@

#include "core/paint/BlockPainter.h"

#include "core/paint/BoxPainter.h"

#include "core/paint/RenderDrawingRecorder.h"

-#include "core/rendering/RenderCombineText.h"

#include "core/rendering/RenderFlexibleBox.h"

#include "core/rendering/RenderInline.h"

-#include "core/rendering/RenderTextFragment.h"

#include "platform/geometry/FloatQuad.h"

#include "platform/geometry/TransformState.h"

#include "wtf/StdLibExtras.h"