| Index: Source/core/rendering/TextRunConstructor.h
|
| diff --git a/Source/core/rendering/TextRunConstructor.h b/Source/core/rendering/TextRunConstructor.h
|
| index 3fb83cf3c473b164aa0a786467ba9afcca33e365..ff7ef67a688f9d1c1fea701e7fee88f272f2cb20 100644
|
| --- a/Source/core/rendering/TextRunConstructor.h
|
| +++ b/Source/core/rendering/TextRunConstructor.h
|
| @@ -44,7 +44,7 @@
|
| namespace blink {
|
|
|
| class Font;
|
| -class RenderObject;
|
| +class LayoutObject;
|
| class RenderStyle;
|
| class RenderText;
|
|
|
| @@ -57,15 +57,15 @@ enum TextRunFlag {
|
| typedef unsigned TextRunFlags;
|
|
|
| // Direction resolved from string value.
|
| -TextRun constructTextRun(RenderObject* context, const Font&, const String&, const RenderStyle&, TextRunFlags = DefaultTextRunFlags);
|
| -TextRun constructTextRun(RenderObject* context, const Font&, const RenderText*, unsigned offset, unsigned length, const RenderStyle&);
|
| +TextRun constructTextRun(LayoutObject* context, const Font&, const String&, const RenderStyle&, TextRunFlags = DefaultTextRunFlags);
|
| +TextRun constructTextRun(LayoutObject* context, const Font&, const RenderText*, unsigned offset, unsigned length, const RenderStyle&);
|
|
|
| // Explicit direction.
|
| -TextRun constructTextRun(RenderObject*, const Font&, const String&, const RenderStyle&, TextDirection, TextRunFlags = DefaultTextRunFlags);
|
| -TextRun constructTextRun(RenderObject*, const Font&, const RenderText*, const RenderStyle&, TextDirection);
|
| -TextRun constructTextRun(RenderObject*, const Font&, const RenderText*, unsigned offset, unsigned length, const RenderStyle&, TextDirection);
|
| -TextRun constructTextRun(RenderObject*, const Font&, const LChar*, int length, const RenderStyle&, TextDirection);
|
| -TextRun constructTextRun(RenderObject*, const Font&, const UChar*, int length, const RenderStyle&, TextDirection);
|
| +TextRun constructTextRun(LayoutObject*, const Font&, const String&, const RenderStyle&, TextDirection, TextRunFlags = DefaultTextRunFlags);
|
| +TextRun constructTextRun(LayoutObject*, const Font&, const RenderText*, const RenderStyle&, TextDirection);
|
| +TextRun constructTextRun(LayoutObject*, const Font&, const RenderText*, unsigned offset, unsigned length, const RenderStyle&, TextDirection);
|
| +TextRun constructTextRun(LayoutObject*, const Font&, const LChar*, int length, const RenderStyle&, TextDirection);
|
| +TextRun constructTextRun(LayoutObject*, const Font&, const UChar*, int length, const RenderStyle&, TextDirection);
|
|
|
| } // namespace blink
|
|
|
|
|