Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1296)

Unified Diff: Source/core/rendering/InlineIterator.h

Issue 23298002: Fix nested unicode-bidi: isolate (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Proposed patch Created 7 years, 4 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 side-by-side diff with in-line comments
Download patch
Index: Source/core/rendering/InlineIterator.h
diff --git a/Source/core/rendering/InlineIterator.h b/Source/core/rendering/InlineIterator.h
index eae2dca791056ad703309473d0d774795fd61628..d88205ae92425e121e171ac28d5876fa629ad7e0 100644
--- a/Source/core/rendering/InlineIterator.h
+++ b/Source/core/rendering/InlineIterator.h
@@ -417,12 +417,17 @@ static inline bool isIsolatedInline(RenderObject* object)
static inline RenderObject* containingIsolate(RenderObject* object, RenderObject* root)
{
ASSERT(object);
+ RenderObject* containingIsolateObj = 0;
while (object && object != root) {
+ if (containingIsolateObj && !isIsolatedInline(object))
+ break;
+
if (isIsolatedInline(object))
- return object;
+ containingIsolateObj = object;
+
object = object->parent();
}
- return 0;
+ return containingIsolateObj;
}
static inline unsigned numberOfIsolateAncestors(const InlineIterator& iter)

Powered by Google App Engine
This is Rietveld 408576698