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: Patch for landing 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

« no previous file with comments | « Source/core/rendering/RenderBR.h ('k') | Source/core/rendering/RenderBlockFlow.cpp » ('j') | no next file with comments »

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 183 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
194 return obj->isFloating() \|\| (obj->isOutOfFlowPositioned() && !obj->style ()->isOriginalDisplayInlineType() && !obj->container()->isRenderInline());	194 return obj->isFloating() \|\| (obj->isOutOfFlowPositioned() && !obj->style ()->isOriginalDisplayInlineType() && !obj->container()->isRenderInline());

195 }	195 }

196	196

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

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

199	199

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

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

202	202

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

	204 TextDirection = LTR,

204 TextRun::ExpansionBehavior = TextRun::AllowTrailingExpansion \| TextRun:: ForbidLeadingExpansion);	205 TextRun::ExpansionBehavior = TextRun::AllowTrailingExpansion \| TextRun:: ForbidLeadingExpansion);

205	206

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

207 TextRun::ExpansionBehavior = TextRun::AllowTrailingExpansion \| TextRun:: ForbidLeadingExpansion);	208 TextRun::ExpansionBehavior = TextRun::AllowTrailingExpansion \| TextRun:: ForbidLeadingExpansion);

208	209

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

210 TextRun::ExpansionBehavior = TextRun::AllowTrailingExpansion \| TextRun:: ForbidLeadingExpansion);	211 TextRun::ExpansionBehavior = TextRun::AllowTrailingExpansion \| TextRun:: ForbidLeadingExpansion);

211	212

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

213 TextRun::ExpansionBehavior = TextRun::AllowTrailingExpansion \| TextRun:: ForbidLeadingExpansion);	214 TextRun::ExpansionBehavior = TextRun::AllowTrailingExpansion \| TextRun:: ForbidLeadingExpansion);

(...skipping 298 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
512	513

513 // END METHODS DEFINED IN RenderBlockLineLayout	514 // END METHODS DEFINED IN RenderBlockLineLayout

514	515

515 };	516 };

516	517

517 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlockFlow, isRenderBlockFlow());	518 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlockFlow, isRenderBlockFlow());

518	519

519 } // namespace WebCore	520 } // namespace WebCore

520	521

521 #endif // RenderBlockFlow_h	522 #endif // RenderBlockFlow_h

OLD	NEW