Source/core/rendering/RenderCombineText.cpp - Issue 397723006: Move RenderBlockFlow::constructTextRun out.

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/RenderCombineText.cpp

Issue 397723006: Move RenderBlockFlow::constructTextRun out. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Created 6 years, 5 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/RenderCombineText.cpp

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

index 2e58c5f995b833d3d6ea76924103d3049ce6941c..ac411bc13550c8a6a24740d5040fee14817cc596 100644

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

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

@@ -21,7 +21,7 @@

#include "config.h"

#include "core/rendering/RenderCombineText.h"

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

+#include "core/rendering/TextRunConstructor.h"

namespace WebCore {

@@ -99,7 +99,7 @@ void RenderCombineText::combineText()

if (style()->isHorizontalWritingMode())

return;

- TextRun run = RenderBlockFlow::constructTextRun(this, originalFont(), this, style(), style()->direction());

+ TextRun run = constructTextRun(this, originalFont(), this, style(), style()->direction());

FontDescription description = originalFont().fontDescription();

float emWidth = description.computedSize() * textCombineMargin;

bool shouldUpdateFont = false;