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

Unified Diff: third_party/WebKit/Source/core/editing/commands/ApplyStyleCommand.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
Index: third_party/WebKit/Source/core/editing/commands/ApplyStyleCommand.cpp
diff --git a/third_party/WebKit/Source/core/editing/commands/ApplyStyleCommand.cpp b/third_party/WebKit/Source/core/editing/commands/ApplyStyleCommand.cpp
index be0c9c6acc752cc7f1f623e00578fdd51baf86ea..37ad1387b679256072255c0cb6fbc81d8bba1d77 100644
--- a/third_party/WebKit/Source/core/editing/commands/ApplyStyleCommand.cpp
+++ b/third_party/WebKit/Source/core/editing/commands/ApplyStyleCommand.cpp
@@ -245,7 +245,7 @@ void ApplyStyleCommand::applyBlockStyle(EditingStyle *style, EditingState* editi
// update document layout once before removing styles
// so that we avoid the expense of updating before each and every call
// to check a computed style
- document().updateLayoutIgnorePendingStylesheets();
+ document().updateStyleAndLayoutIgnorePendingStylesheets();
// get positions we want to use for applying style
Position start = startPosition();
@@ -592,7 +592,7 @@ void ApplyStyleCommand::applyInlineStyle(EditingStyle* style, EditingState* edit
// update document layout once before removing styles
// so that we avoid the expense of updating before each and every call
// to check a computed style
- document().updateLayoutIgnorePendingStylesheets();
+ document().updateStyleAndLayoutIgnorePendingStylesheets();
// adjust to the positions we want to use for applying style
Position start = startPosition();
@@ -706,7 +706,7 @@ void ApplyStyleCommand::applyInlineStyle(EditingStyle* style, EditingState* edit
// update document layout once before running the rest of the function
// so that we avoid the expense of updating before each and every call
// to check a computed style
- document().updateLayoutIgnorePendingStylesheets();
+ document().updateStyleAndLayoutIgnorePendingStylesheets();
EditingStyle* styleToApply = style;
if (hasTextDirection) {
@@ -835,7 +835,7 @@ void ApplyStyleCommand::applyInlineStyleToNodeRange(EditingStyle* style, Node* s
if (m_removeOnly)
return;
- document().updateLayoutIgnorePendingStylesheets();
+ document().updateStyleAndLayoutIgnorePendingStylesheets();
HeapVector<InlineRunToApplyStyle> runs;
Node* node = startNode;
@@ -904,7 +904,7 @@ void ApplyStyleCommand::applyInlineStyleToNodeRange(EditingStyle* style, Node* s
}
}
- document().updateLayoutIgnorePendingStylesheets();
+ document().updateStyleAndLayoutIgnorePendingStylesheets();
for (auto& run : runs) {
if (run.positionForStyleComputation.isNotNull())
@@ -1103,7 +1103,7 @@ void ApplyStyleCommand::applyInlineStyleToPushDown(Node* node, EditingStyle* sty
{
DCHECK(node);
- node->document().updateLayoutTree();
+ node->document().updateStyleAndLayoutTree();
if (!style || style->isEmpty() || !node->layoutObject() || isHTMLIFrameElement(*node))
return;
@@ -1296,7 +1296,7 @@ void ApplyStyleCommand::removeInlineStyle(EditingStyle* style, const Position &s
bool ApplyStyleCommand::elementFullySelected(HTMLElement& element, const Position& start, const Position& end) const
{
// The tree may have changed and Position::upstream() relies on an up-to-date layout.
- element.document().updateLayoutIgnorePendingStylesheets();
+ element.document().updateStyleAndLayoutIgnorePendingStylesheets();
return comparePositions(firstPositionInOrBeforeNode(&element), start) >= 0
&& comparePositions(mostBackwardCaretPosition(lastPositionInOrAfterNode(&element)), end) <= 0;

Powered by Google App Engine
This is Rietveld 408576698