Title: [160279] trunk/Source/WebCore
- Revision
- 160279
- Author
- zol...@webkit.org
- Date
- 2013-12-07 21:53:33 -0800 (Sat, 07 Dec 2013)
Log Message
Remove statusWithDirection static function from RenderBlockLineLayout
https://bugs.webkit.org/show_bug.cgi?id=125372
Reviewed by Andreas Kling.
I run into a FIXME about using BidiStatus constructor rather than statusWithDirection,
once it's implemented. BidiStatus has got the appropriate constructor now, so I removed
statusWithDirection and updated the code to use the constructor of BidiStatus.
No new tests, no behavior change.
* rendering/RenderBlockLineLayout.cpp:
(WebCore::constructBidiRunsForSegment):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (160278 => 160279)
--- trunk/Source/WebCore/ChangeLog 2013-12-08 05:23:29 UTC (rev 160278)
+++ trunk/Source/WebCore/ChangeLog 2013-12-08 05:53:33 UTC (rev 160279)
@@ -1,3 +1,19 @@
+2013-12-07 Zoltan Horvath <zol...@webkit.org>
+
+ Remove statusWithDirection static function from RenderBlockLineLayout
+ https://bugs.webkit.org/show_bug.cgi?id=125372
+
+ Reviewed by Andreas Kling.
+
+ I run into a FIXME about using BidiStatus constructor rather than statusWithDirection,
+ once it's implemented. BidiStatus has got the appropriate constructor now, so I removed
+ statusWithDirection and updated the code to use the constructor of BidiStatus.
+
+ No new tests, no behavior change.
+
+ * rendering/RenderBlockLineLayout.cpp:
+ (WebCore::constructBidiRunsForSegment):
+
2013-12-07 ChangSeok Oh <changseok...@collabora.com>
Unreviewed. Build fix for gtk port after r160260.
Modified: trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp (160278 => 160279)
--- trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2013-12-08 05:23:29 UTC (rev 160278)
+++ trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2013-12-08 05:53:33 UTC (rev 160279)
@@ -865,16 +865,6 @@
lastRootBox()->appendFloat(floatingObject->renderer());
}
-// FIXME: This should be a BidiStatus constructor or create method.
-static inline BidiStatus statusWithDirection(TextDirection textDirection, bool isOverride)
-{
- UCharDirection direction = textDirection == LTR ? U_LEFT_TO_RIGHT : U_RIGHT_TO_LEFT;
- RefPtr<BidiContext> context = BidiContext::create(textDirection == LTR ? 0 : 1, direction, isOverride, FromStyleOrDOM);
-
- // This copies BidiStatus and may churn the ref on BidiContext. I doubt it matters.
- return BidiStatus(direction, direction, direction, context.release());
-}
-
// FIXME: BidiResolver should have this logic.
static inline void constructBidiRunsForSegment(InlineBidiResolver& topResolver, BidiRunList<BidiRun>& bidiRuns, const InlineIterator& endOfRuns, VisualDirectionOverride override, bool previousLineBrokeCleanly)
{
@@ -907,7 +897,7 @@
ASSERT(unicodeBidi == Isolate || unicodeBidi == IsolateOverride);
direction = isolatedInline->style().direction();
}
- isolatedResolver.setStatus(statusWithDirection(direction, isOverride(unicodeBidi)));
+ isolatedResolver.setStatus(BidiStatus(direction, isOverride(unicodeBidi)));
// FIXME: The fact that we have to construct an Iterator here
// currently prevents this code from moving into BidiResolver.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
