third_party/WebKit/Source/core/editing/commands/ApplyBlockElementCommand.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/commands/ApplyBlockElementCommand.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/VisibleUnits.cpp ('k') | third_party/WebKit/Source/core/editing/commands/ApplyStyleCommand.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/editing/commands/ApplyBlockElementCommand.cpp

diff --git a/third_party/WebKit/Source/core/editing/commands/ApplyBlockElementCommand.cpp b/third_party/WebKit/Source/core/editing/commands/ApplyBlockElementCommand.cpp

index b07479702406a4c0182fa955032ac048b17747ed..86edb522f7fc567ccc29950da50dbeb6451758f7 100644

--- a/third_party/WebKit/Source/core/editing/commands/ApplyBlockElementCommand.cpp

+++ b/third_party/WebKit/Source/core/editing/commands/ApplyBlockElementCommand.cpp

@@ -94,7 +94,7 @@ void ApplyBlockElementCommand::doApply(EditingState* editingState)

if (editingState->isAborted())

return;

- document().updateLayoutIgnorePendingStylesheets();

+ document().updateStyleAndLayoutIgnorePendingStylesheets();

DCHECK_EQ(startScope, endScope);

DCHECK_GE(startIndex, 0);

@@ -192,7 +192,7 @@ void ApplyBlockElementCommand::rangeForParagraphSplittingTextNodesIfNeeded(const

start = startOfParagraph(endOfCurrentParagraph).deepEquivalent();

end = endOfCurrentParagraph.deepEquivalent();

- document().updateLayoutTree();

+ document().updateStyleAndLayoutTree();

bool isStartAndEndOnSameNode = false;

if (const ComputedStyle* startStyle = computedStyleOfEnclosingTextNode(start)) {

@@ -222,7 +222,7 @@ void ApplyBlockElementCommand::rangeForParagraphSplittingTextNodesIfNeeded(const

}

- document().updateLayoutTree();

+ document().updateStyleAndLayoutTree();

if (const ComputedStyle* endStyle = computedStyleOfEnclosingTextNode(end)) {

bool isEndAndEndOfLastParagraphOnSameNode = computedStyleOfEnclosingTextNode(m_endOfLastParagraph) && end.anchorNode() == m_endOfLastParagraph.anchorNode();