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

Unified Diff: Source/core/layout/BidiRunForLine.cpp

Issue 1164933006: Create LineLayout api (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebase + nits Created 5 years, 5 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 | « Source/core/layout/BidiRun.h ('k') | Source/core/layout/FloatingObjects.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/BidiRunForLine.cpp
diff --git a/Source/core/layout/BidiRunForLine.cpp b/Source/core/layout/BidiRunForLine.cpp
index e3bda139264be01dbde29fb35bff6ebdfa8be94e..9944f663c43c817410c7e32f0ed5392b0e0d2687 100644
--- a/Source/core/layout/BidiRunForLine.cpp
+++ b/Source/core/layout/BidiRunForLine.cpp
@@ -54,11 +54,11 @@ static LayoutObject* firstLayoutObjectForDirectionalityDetermination(
while (current) {
next = nullptr;
- if (isIteratorTarget(current) && !(current->isText()
+ if (isIteratorTarget(LineLayoutItem(current)) && !(current->isText()
&& toLayoutText(current)->isAllCollapsibleWhitespace()))
break;
- if (!isIteratorTarget(current)
+ if (!isIteratorTarget(LineLayoutItem(current))
&& !isIsolated(current->style()->unicodeBidi()))
next = current->slowFirstChild();
@@ -84,7 +84,7 @@ TextDirection determinePlaintextDirectionality(LayoutObject* root,
LayoutObject* current = 0, unsigned pos = 0)
{
LayoutObject* firstLayoutObject = firstLayoutObjectForDirectionalityDetermination(root, current);
- InlineIterator iter(root, firstLayoutObject, firstLayoutObject == current ? pos : 0);
+ InlineIterator iter(LineLayoutItem(root), LineLayoutItem(firstLayoutObject), firstLayoutObject == current ? pos : 0);
InlineBidiResolver observer;
observer.setStatus(BidiStatus(root->style()->direction(),
isOverride(root->style()->unicodeBidi())));
@@ -113,7 +113,7 @@ static inline void setupResolverToResumeInIsolate(InlineBidiResolver& resolver,
if (root != startObject) {
LayoutObject* parent = startObject->parent();
setupResolverToResumeInIsolate(resolver, root, parent);
- notifyObserverEnteredObject(&resolver, startObject);
+ notifyObserverEnteredObject(&resolver, LineLayoutItem(startObject));
}
}
@@ -157,7 +157,7 @@ void constructBidiRunsForLine(InlineBidiResolver& topResolver,
// but that would be a layering violation for BidiResolver (which knows
// nothing about LayoutObject).
LayoutInline* isolatedInline = toLayoutInline(
- highestContainingIsolateWithinRoot(startObj, currentRoot));
+ highestContainingIsolateWithinRoot(LineLayoutItem(startObj), LineLayoutItem(currentRoot)));
ASSERT(isolatedInline);
InlineBidiResolver isolatedResolver;
@@ -184,7 +184,7 @@ void constructBidiRunsForLine(InlineBidiResolver& topResolver,
// isolate that was identified during the earlier call to
// createBidiRunsForLine. This can be but is not necessarily the first
// run within the isolate.
- InlineIterator iter = InlineIterator(isolatedInline, startObj,
+ InlineIterator iter = InlineIterator(LineLayoutItem(isolatedInline), LineLayoutItem(startObj),
isolatedRun->m_start);
isolatedResolver.setPositionIgnoringNestedIsolates(iter);
// We stop at the next end of line; we may re-enter this isolate in the
« no previous file with comments | « Source/core/layout/BidiRun.h ('k') | Source/core/layout/FloatingObjects.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698