Source/core/rendering/InlineIterator.h - Issue 23972003: Update containtingIsolate to go back all the way to top isolate from current

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 23972003: Update containtingIsolate to go back all the way to top isolate from current (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Reverted assert to normal ASSERT, rather than ASSERT_WITH_SECURITY_IMPLICATION Created 7 years, 3 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

« no previous file with comments | « LayoutTests/fast/text/international/unicode-bidi-isolate-nested-with-removes-not-adjacent-expected.txt ('k') | Source/core/rendering/RenderBlockLineLayout.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/rendering/InlineIterator.h

diff --git a/Source/core/rendering/InlineIterator.h b/Source/core/rendering/InlineIterator.h

index d88205ae92425e121e171ac28d5876fa629ad7e0..323e7e4f931de86839fa2bb85800c08e6c8c2a84 100644

--- a/Source/core/rendering/InlineIterator.h

+++ b/Source/core/rendering/InlineIterator.h

@@ -414,14 +414,11 @@ static inline bool isIsolatedInline(RenderObject* object)

return object->isRenderInline() && isIsolated(object->style()->unicodeBidi());

}

-static inline RenderObject* containingIsolate(RenderObject* object, RenderObject* root)

+static inline RenderObject* highestContainingIsolateWithinRoot(RenderObject* object, RenderObject* root)

{

ASSERT(object);

RenderObject* containingIsolateObj = 0;

while (object && object != root) {

- if (containingIsolateObj && !isIsolatedInline(object))

- break;

if (isIsolatedInline(object))

containingIsolateObj = object;