diff options
| author | Ben Murdoch <benm@google.com> | 2010-10-22 13:02:20 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-10-26 15:21:41 +0100 |
| commit | a94275402997c11dd2e778633dacf4b7e630a35d (patch) | |
| tree | e66f56c67e3b01f22c9c23cd932271ee9ac558ed /WebCore/rendering/InlineIterator.h | |
| parent | 09e26c78506587b3f5d930d7bc72a23287ffbec0 (diff) | |
| download | external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.zip external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.gz external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.bz2 | |
Merge WebKit at r70209: Initial merge by Git
Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
Diffstat (limited to 'WebCore/rendering/InlineIterator.h')
| -rw-r--r-- | WebCore/rendering/InlineIterator.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/WebCore/rendering/InlineIterator.h b/WebCore/rendering/InlineIterator.h index 9310ea8..270364f 100644 --- a/WebCore/rendering/InlineIterator.h +++ b/WebCore/rendering/InlineIterator.h @@ -53,7 +53,7 @@ public: bool atEnd() const; UChar current() const; - WTF::Unicode::Direction direction() const; + ALWAYS_INLINE WTF::Unicode::Direction direction() const; RenderBlock* block; RenderObject* obj; @@ -220,7 +220,7 @@ ALWAYS_INLINE WTF::Unicode::Direction InlineIterator::direction() const return WTF::Unicode::direction(c); if (obj && obj->isListMarker()) - return obj->style()->direction() == LTR ? WTF::Unicode::LeftToRight : WTF::Unicode::RightToLeft; + return obj->style()->isLeftToRightDirection() ? WTF::Unicode::LeftToRight : WTF::Unicode::RightToLeft; return WTF::Unicode::OtherNeutral; } |