third_party/WebKit/Source/core/editing/iterators/SearchBuffer.cpp - Issue 1896793002: Rename (updateLayout/updateStyle).*.() to updateStyleAndLayout.*.()

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: third_party/WebKit/Source/core/editing/iterators/SearchBuffer.cpp

Issue 1896793002: Rename (updateLayout/updateStyle).*.() to updateStyleAndLayout.*.() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 7 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 | « third_party/WebKit/Source/core/editing/commands/ReplaceSelectionCommand.cpp ('k') | third_party/WebKit/Source/core/editing/iterators/TextIterator.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/editing/iterators/SearchBuffer.cpp

diff --git a/third_party/WebKit/Source/core/editing/iterators/SearchBuffer.cpp b/third_party/WebKit/Source/core/editing/iterators/SearchBuffer.cpp

index 9dac6c898174520749d7291d73b50fa27e28f06a..d4dda383119009651c0b1f9c5581f464d76bc00a 100644

--- a/third_party/WebKit/Source/core/editing/iterators/SearchBuffer.cpp

+++ b/third_party/WebKit/Source/core/editing/iterators/SearchBuffer.cpp

@@ -434,18 +434,18 @@ static EphemeralRangeTemplate<Strategy> findPlainTextAlgorithm(const EphemeralRa

TextIteratorBehaviorFlags behavior = iteratorFlagsForFindPlainText;

if (options & FindAPICall)

behavior |= TextIteratorForWindowFind;

- // TODO(dglazkov): The use of updateLayoutIgnorePendingStylesheets needs to be audited.

+ // TODO(dglazkov): The use of updateStyleAndLayoutIgnorePendingStylesheets needs to be audited.

// see http://crbug.com/590369 for more details.

- inputRange.startPosition().document()->updateLayoutIgnorePendingStylesheets();

+ inputRange.startPosition().document()->updateStyleAndLayoutIgnorePendingStylesheets();

CharacterIteratorAlgorithm<Strategy> findIterator(inputRange, behavior);

matchLength = findPlainTextInternal(findIterator, target, options, matchStart);

if (!matchLength)

return EphemeralRangeTemplate<Strategy>(options & Backwards ? inputRange.startPosition() : inputRange.endPosition());

}

- // TODO(dglazkov): The use of updateLayoutIgnorePendingStylesheets needs to be audited.

+ // TODO(dglazkov): The use of updateStyleAndLayoutIgnorePendingStylesheets needs to be audited.

// see http://crbug.com/590369 for more details.

- inputRange.startPosition().document()->updateLayoutIgnorePendingStylesheets();

+ inputRange.startPosition().document()->updateStyleAndLayoutIgnorePendingStylesheets();

CharacterIteratorAlgorithm<Strategy> computeRangeIterator(inputRange, iteratorFlagsForFindPlainText);

return computeRangeIterator.calculateCharacterSubrange(matchStart, matchLength);

}