third_party/WebKit/Source/core/editing/iterators/TextIterator.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/TextIterator.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/iterators/SearchBuffer.cpp ('k') | third_party/WebKit/Source/core/editing/markers/DocumentMarkerController.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 4b6aece17b33f3da1816d7ca5bedd72e5678b862..12bd4aff4921e7f02fbf5356f42696a4d1b85897 100644

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

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

@@ -1095,9 +1095,9 @@ PositionTemplate<Strategy> TextIteratorAlgorithm<Strategy>::endPositionInCurrent

template<typename Strategy>

int TextIteratorAlgorithm<Strategy>::rangeLength(const PositionTemplate<Strategy>& start, const PositionTemplate<Strategy>& end, bool forSelectionPreservation)

{

- // 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.

- start.document()->updateLayoutIgnorePendingStylesheets();

+ start.document()->updateStyleAndLayoutIgnorePendingStylesheets();

int length = 0;

TextIteratorBehaviorFlags behaviorFlags = TextIteratorEmitsObjectReplacementCharacter;

@@ -1154,9 +1154,9 @@ static String createPlainText(const EphemeralRangeTemplate<Strategy>& range, Tex

return emptyString();

- // 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.

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

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

TextIteratorAlgorithm<Strategy> it(range.startPosition(), range.endPosition(), behavior);