Source/core/rendering/RenderBlockFlow.h - Issue 104813005: Explicitly set text direction for TextRuns

Side by Side Diff: Source/core/rendering/RenderBlockFlow.h

Issue 104813005: Explicitly set text direction for TextRuns (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Created 6 years, 11 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 unified diff | Download patch | Annotate | Revision Log

« Source/core/rendering/InlineTextBox.cpp ('K') | « Source/core/rendering/InlineTextBox.cpp ('k') | Source/core/rendering/RenderBlockFlow.cpp » ('j') | Source/core/rendering/RenderBlockLineLayout.cpp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)	2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)

3 * (C) 1999 Antti Koivisto (koivisto@kde.org)	3 * (C) 1999 Antti Koivisto (koivisto@kde.org)

4 * (C) 2007 David Smith (catfish.man@gmail.com)	4 * (C) 2007 David Smith (catfish.man@gmail.com)

5 * Copyright (C) 2003-2013 Apple Inc. All rights reserved.	5 * Copyright (C) 2003-2013 Apple Inc. All rights reserved.

6 * Copyright (C) Research In Motion Limited 2010. All rights reserved.	6 * Copyright (C) Research In Motion Limited 2010. All rights reserved.

7 * Copyright (C) 2013 Google Inc. All rights reserved.	7 * Copyright (C) 2013 Google Inc. All rights reserved.

8 *	8 *

9 * Redistribution and use in source and binary forms, with or without	9 * Redistribution and use in source and binary forms, with or without

10 * modification, are permitted provided that the following conditions are	10 * modification, are permitted provided that the following conditions are

(...skipping 113 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
124 return obj->isFloating() \|\| (obj->isOutOfFlowPositioned() && !obj->style ()->isOriginalDisplayInlineType() && !obj->container()->isRenderInline());	124 return obj->isFloating() \|\| (obj->isOutOfFlowPositioned() && !obj->style ()->isOriginalDisplayInlineType() && !obj->container()->isRenderInline());

125 }	125 }

126	126

127 static TextRun constructTextRun(RenderObject* context, const Font&, const St ring&, RenderStyle*,	127 static TextRun constructTextRun(RenderObject* context, const Font&, const St ring&, RenderStyle*,

128 TextRun::ExpansionBehavior = TextRun::AllowTrailingExpansion \| TextRun:: ForbidLeadingExpansion, TextRunFlags = DefaultTextRunFlags);	128 TextRun::ExpansionBehavior = TextRun::AllowTrailingExpansion \| TextRun:: ForbidLeadingExpansion, TextRunFlags = DefaultTextRunFlags);

129	129

130 static TextRun constructTextRun(RenderObject* context, const Font&, const Re nderText, RenderStyle,	130 static TextRun constructTextRun(RenderObject* context, const Font&, const Re nderText, RenderStyle,

131 TextRun::ExpansionBehavior = TextRun::AllowTrailingExpansion \| TextRun:: ForbidLeadingExpansion);	131 TextRun::ExpansionBehavior = TextRun::AllowTrailingExpansion \| TextRun:: ForbidLeadingExpansion);

132	132

133 static TextRun constructTextRun(RenderObject* context, const Font&, const Re nderText, unsigned offset, unsigned length, RenderStyle,	133 static TextRun constructTextRun(RenderObject* context, const Font&, const Re nderText, unsigned offset, unsigned length, RenderStyle,

	134 TextDirection = LTR,

134 TextRun::ExpansionBehavior = TextRun::AllowTrailingExpansion \| TextRun:: ForbidLeadingExpansion);	135 TextRun::ExpansionBehavior = TextRun::AllowTrailingExpansion \| TextRun:: ForbidLeadingExpansion);

135	136

136 static TextRun constructTextRun(RenderObject* context, const Font&, const Re nderText, unsigned offset, RenderStyle,	137 static TextRun constructTextRun(RenderObject* context, const Font&, const Re nderText, unsigned offset, RenderStyle,

137 TextRun::ExpansionBehavior = TextRun::AllowTrailingExpansion \| TextRun:: ForbidLeadingExpansion);	138 TextRun::ExpansionBehavior = TextRun::AllowTrailingExpansion \| TextRun:: ForbidLeadingExpansion);

138	139

139 static TextRun constructTextRun(RenderObject* context, const Font&, const LC har* characters, int length, RenderStyle*,	140 static TextRun constructTextRun(RenderObject* context, const Font&, const LC har* characters, int length, RenderStyle*,

140 TextRun::ExpansionBehavior = TextRun::AllowTrailingExpansion \| TextRun:: ForbidLeadingExpansion);	141 TextRun::ExpansionBehavior = TextRun::AllowTrailingExpansion \| TextRun:: ForbidLeadingExpansion);

141	142

142 static TextRun constructTextRun(RenderObject* context, const Font&, const UC har* characters, int length, RenderStyle*,	143 static TextRun constructTextRun(RenderObject* context, const Font&, const UC har* characters, int length, RenderStyle*,

143 TextRun::ExpansionBehavior = TextRun::AllowTrailingExpansion \| TextRun:: ForbidLeadingExpansion);	144 TextRun::ExpansionBehavior = TextRun::AllowTrailingExpansion \| TextRun:: ForbidLeadingExpansion);

(...skipping 285 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
429	430

430 // END METHODS DEFINED IN RenderBlockLineLayout	431 // END METHODS DEFINED IN RenderBlockLineLayout

431	432

432 };	433 };

433	434

434 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlockFlow, isRenderBlockFlow());	435 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlockFlow, isRenderBlockFlow());

435	436

436 } // namespace WebCore	437 } // namespace WebCore

437	438

438 #endif // RenderBlockFlow_h	439 #endif // RenderBlockFlow_h

OLD	NEW