Modified: trunk/Source/WebCore/rendering/InlineIterator.h (93558 => 93559)
--- trunk/Source/WebCore/rendering/InlineIterator.h 2011-08-22 23:30:10 UTC (rev 93558)
+++ trunk/Source/WebCore/rendering/InlineIterator.h 2011-08-22 23:34:31 UTC (rev 93559)
@@ -139,10 +139,16 @@
return object->isText() || object->isFloating() || object->isPositioned() || object->isReplaced();
}
+// This enum is only used for bidiNextShared()
+enum EmptyInlineBehavior {
+ SkipEmptyInlines,
+ IncludeEmptyInlines,
+};
+
// FIXME: This function is misleadingly named. It has little to do with bidi.
// This function will iterate over inlines within a block, optionally notifying
// a bidi resolver as it enters/exits inlines (so it can push/pop embedding levels).
-static inline RenderObject* bidiNext(RenderObject* root, RenderObject* current, InlineBidiResolver* resolver = 0, bool skipInlines = true, bool* endOfInlinePtr = 0)
+static inline RenderObject* bidiNextShared(RenderObject* root, RenderObject* current, InlineBidiResolver* resolver = 0, EmptyInlineBehavior emptyInlineBehavior = SkipEmptyInlines, bool* endOfInlinePtr = 0)
{
RenderObject* next = 0;
// oldEndOfInline denotes if when we last stopped iterating if we were at the end of an inline.
@@ -159,7 +165,7 @@
// We hit this when either current has no children, or when current is not a renderer we care about.
if (!next) {
// If it is a renderer we care about, and we're doing our inline-walk, return it.
- if (!skipInlines && !oldEndOfInline && current->isRenderInline()) {
+ if (emptyInlineBehavior == IncludeEmptyInlines && !oldEndOfInline && current->isRenderInline()) {
next = current;
endOfInline = true;
break;
@@ -175,7 +181,7 @@
}
current = current->parent();
- if (!skipInlines && current && current != root && current->isRenderInline()) {
+ if (emptyInlineBehavior == IncludeEmptyInlines && current && current != root && current->isRenderInline()) {
next = current;
endOfInline = true;
break;
@@ -187,7 +193,7 @@
break;
if (isIteratorTarget(next)
- || ((!skipInlines || !next->firstChild()) // Always return EMPTY inlines.
+ || ((emptyInlineBehavior == IncludeEmptyInlines || !next->firstChild()) // Always return EMPTY inlines.
&& next->isRenderInline()))
break;
current = next;
@@ -199,8 +205,20 @@
return next;
}
-static inline RenderObject* bidiFirstSkippingInlines(RenderObject* root, InlineBidiResolver* resolver)
+static inline RenderObject* bidiNextSkippingEmptyInlines(RenderObject* root, RenderObject* current, InlineBidiResolver* observer = 0)
{
+ // The SkipEmptyInlines callers never care about endOfInlinePtr.
+ return bidiNextShared(root, current, observer, SkipEmptyInlines);
+}
+
+static inline RenderObject* bidiNextIncludingEmptyInlines(RenderObject* root, RenderObject* current, bool* endOfInlinePtr = 0)
+{
+ InlineBidiResolver* observer = 0; // Callers who include empty inlines, never use an observer.
+ return bidiNextShared(root, current, observer, IncludeEmptyInlines, endOfInlinePtr);
+}
+
+static inline RenderObject* bidiFirstSkippingEmptyInlines(RenderObject* root, InlineBidiResolver* resolver)
+{
ASSERT(resolver);
RenderObject* o = root->firstChild();
if (!o)
@@ -209,7 +227,7 @@
if (o->isRenderInline()) {
notifyResolverEnteredObject(resolver, o);
if (o->firstChild())
- o = bidiNext(root, o, resolver, true);
+ o = bidiNextSkippingEmptyInlines(root, o, resolver);
else {
// Never skip empty inlines.
if (resolver)
@@ -220,14 +238,14 @@
// FIXME: Unify this with the bidiNext call above.
if (o && !isIteratorTarget(o))
- o = bidiNext(root, o, resolver, true);
+ o = bidiNextSkippingEmptyInlines(root, o, resolver);
resolver->commitExplicitEmbedding();
return o;
}
// FIXME: This method needs to be renamed when bidiNext finds a good name.
-static inline RenderObject* bidiFirstNotSkippingInlines(RenderObject* root)
+static inline RenderObject* bidiFirstIncludingEmptyInlines(RenderObject* root)
{
RenderObject* o = root->firstChild();
// If either there are no children to walk, or the first one is correct
@@ -235,7 +253,7 @@
if (!o || o->isRenderInline() || isIteratorTarget(o))
return o;
- return bidiNext(root, o, 0, false);
+ return bidiNextIncludingEmptyInlines(root, o);
}
inline void InlineIterator::fastIncrementInTextNode()
@@ -246,6 +264,8 @@
m_pos++;
}
+// FIXME: This is used by RenderBlock for simplified layout, and has nothing to do with bidi
+// it shouldn't use functions called bidiFirst and bidiNext.
class InlineWalker {
public:
InlineWalker(RenderObject* root)
@@ -253,8 +273,8 @@
, m_current(0)
, m_atEndOfInline(false)
{
- // FIXME: This class should be taught how to do the skipInlines codepath as well.
- m_current = bidiFirstNotSkippingInlines(m_root);
+ // FIXME: This class should be taught how to do the SkipEmptyInlines codepath as well.
+ m_current = bidiFirstIncludingEmptyInlines(m_root);
}
RenderObject* root() { return m_root; }
@@ -265,16 +285,13 @@
RenderObject* advance()
{
- // FIXME: Eventually skipInlines and observer will be a members.
- bool skipInlines = false;
- InlineBidiResolver* observer = 0;
- m_current = bidiNext(m_root, m_current, observer, skipInlines, &m_atEndOfInline);
+ // FIXME: Support SkipEmptyInlines and observer parameters.
+ m_current = bidiNextIncludingEmptyInlines(m_root, m_current, &m_atEndOfInline);
return m_current;
}
private:
RenderObject* m_root;
RenderObject* m_current;
- bool m_skipInlines;
bool m_atEndOfInline;
};
@@ -288,7 +305,7 @@
return;
}
// bidiNext can return 0, so use moveTo instead of moveToStartOf
- moveTo(bidiNext(m_root, m_obj, resolver), 0);
+ moveTo(bidiNextSkippingEmptyInlines(m_root, m_obj, resolver), 0);
}
inline bool InlineIterator::atEnd() const
@@ -343,7 +360,7 @@
while (obj && obj != m_eor.m_obj && obj != endOfLine.m_obj) {
RenderBlock::appendRunsForObject(m_runs, start, obj->length(), obj, *this);
start = 0;
- obj = bidiNext(m_sor.root(), obj);
+ obj = bidiNextSkippingEmptyInlines(m_sor.root(), obj);
}
if (obj) {
unsigned pos = obj == m_eor.m_obj ? m_eor.m_pos : UINT_MAX;
Modified: trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp (93558 => 93559)
--- trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2011-08-22 23:30:10 UTC (rev 93558)
+++ trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2011-08-22 23:34:31 UTC (rev 93559)
@@ -1427,10 +1427,12 @@
resolver.setStatus(last->lineBreakBidiStatus());
} else {
TextDirection direction = style()->direction();
- if (style()->unicodeBidi() == Plaintext)
- determineParagraphDirection(direction, InlineIterator(this, bidiFirstNotSkippingInlines(this), 0));
+ if (style()->unicodeBidi() == Plaintext) {
+ // FIXME: Why does "unicode-bidi: plaintext" bidiFirstIncludingEmptyInlines when all other line layout code uses bidiFirstSkippingEmptyInlines?
+ determineParagraphDirection(direction, InlineIterator(this, bidiFirstIncludingEmptyInlines(this), 0));
+ }
resolver.setStatus(BidiStatus(direction, style()->unicodeBidi() == Override));
- resolver.setPosition(InlineIterator(this, bidiFirstSkippingInlines(this, &resolver), 0));
+ resolver.setPosition(InlineIterator(this, bidiFirstSkippingEmptyInlines(this, &resolver), 0));
}
return curr;
}
@@ -1646,7 +1648,7 @@
// have an effect on whitespace at the start of the line.
static bool shouldSkipWhitespaceAfterStartObject(RenderBlock* block, RenderObject* o, LineMidpointState& lineMidpointState)
{
- RenderObject* next = bidiNext(block, o);
+ RenderObject* next = bidiNextSkippingEmptyInlines(block, o);
if (next && !next->isBR() && next->isText() && toRenderText(next)->textLength() > 0) {
RenderText* nextText = toRenderText(next);
UChar nextChar = nextText->characters()[0];
@@ -1983,7 +1985,7 @@
EWhiteSpace currWS = m_block->style()->whiteSpace();
EWhiteSpace lastWS = currWS;
while (current.m_obj) {
- RenderObject* next = bidiNext(m_block, current.m_obj);
+ RenderObject* next = bidiNextSkippingEmptyInlines(m_block, current.m_obj);
if (next && next->parent() && !next->parent()->isDescendantOf(current.m_obj->parent()))
includeEndWidth = true;
