Source/core/layout/TextRunConstructor.h - Issue 1033943002: Rename LayoutStyle to papayawhip

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/layout/TextRunConstructor.h

Issue 1033943002: Rename LayoutStyle to papayawhip (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: ensureComputedStyle Created 5 years, 9 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/layout/TextRunConstructor.h

diff --git a/Source/core/layout/TextRunConstructor.h b/Source/core/layout/TextRunConstructor.h

index 46bad17e7c11f974ba961bae06ae2b04949d9ab4..8827cac7611084efcc644bf93df5388058f529f0 100644

--- a/Source/core/layout/TextRunConstructor.h

+++ b/Source/core/layout/TextRunConstructor.h

@@ -45,7 +45,7 @@ namespace blink {

class Font;

class LayoutObject;

-class LayoutStyle;

+class ComputedStyle;

class LayoutText;

enum TextRunFlag {

@@ -57,15 +57,15 @@ enum TextRunFlag {

typedef unsigned TextRunFlags;

// Direction resolved from string value.

-TextRun constructTextRun(LayoutObject* context, const Font&, const String&, const LayoutStyle&, TextRunFlags = DefaultTextRunFlags);

-TextRun constructTextRun(LayoutObject* context, const Font&, const LayoutText*, unsigned offset, unsigned length, const LayoutStyle&);

+TextRun constructTextRun(LayoutObject* context, const Font&, const String&, const ComputedStyle&, TextRunFlags = DefaultTextRunFlags);

+TextRun constructTextRun(LayoutObject* context, const Font&, const LayoutText*, unsigned offset, unsigned length, const ComputedStyle&);

// Explicit direction.

-TextRun constructTextRun(LayoutObject*, const Font&, const String&, const LayoutStyle&, TextDirection, TextRunFlags = DefaultTextRunFlags);

-TextRun constructTextRun(LayoutObject*, const Font&, const LayoutText*, const LayoutStyle&, TextDirection);

-TextRun constructTextRun(LayoutObject*, const Font&, const LayoutText*, unsigned offset, unsigned length, const LayoutStyle&, TextDirection);

-TextRun constructTextRun(LayoutObject*, const Font&, const LChar*, int length, const LayoutStyle&, TextDirection);

-TextRun constructTextRun(LayoutObject*, const Font&, const UChar*, int length, const LayoutStyle&, TextDirection);

+TextRun constructTextRun(LayoutObject*, const Font&, const String&, const ComputedStyle&, TextDirection, TextRunFlags = DefaultTextRunFlags);

+TextRun constructTextRun(LayoutObject*, const Font&, const LayoutText*, const ComputedStyle&, TextDirection);

+TextRun constructTextRun(LayoutObject*, const Font&, const LayoutText*, unsigned offset, unsigned length, const ComputedStyle&, TextDirection);

+TextRun constructTextRun(LayoutObject*, const Font&, const LChar*, int length, const ComputedStyle&, TextDirection);

+TextRun constructTextRun(LayoutObject*, const Font&, const UChar*, int length, const ComputedStyle&, TextDirection);

} // namespace blink

« no previous file with comments | « Source/core/layout/TextAutosizer.cpp ('k') | Source/core/layout/TextRunConstructor.cpp » ('j') | no next file with comments »