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

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

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

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

index 05d072dbae4d9336bb5563ceeaaab714f0ef057c..179ac140b5f5714bbc79fbe909721ec31eb63b63 100644

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

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

@@ -109,7 +109,7 @@ void EditCommandComposition::unapply()

// Changes to the document may have been made since the last editing operation that require a layout, as in <rdar://problem/5658603>.

// Low level operations, like RemoveNodeCommand, don't require a layout because the high level operations that use them perform one

// if one is necessary (like for the creation of VisiblePositions).

- m_document->updateLayoutIgnorePendingStylesheets();

+ m_document->updateStyleAndLayoutIgnorePendingStylesheets();

{

size_t size = m_commands.size();

@@ -129,7 +129,7 @@ void EditCommandComposition::reapply()

// Changes to the document may have been made since the last editing operation that require a layout, as in <rdar://problem/5658603>.

// Low level operations, like RemoveNodeCommand, don't require a layout because the high level operations that use them perform one

// if one is necessary (like for the creation of VisiblePositions).

- m_document->updateLayoutIgnorePendingStylesheets();

+ m_document->updateStyleAndLayoutIgnorePendingStylesheets();

{

for (const auto& command : m_commands)

@@ -198,7 +198,7 @@ bool CompositeEditCommand::apply()

// Changes to the document may have been made since the last editing operation that require a layout, as in <rdar://problem/5658603>.

// Low level operations, like RemoveNodeCommand, don't require a layout because the high level operations that use them perform one

// if one is necessary (like for the creation of VisiblePositions).

- document().updateLayoutIgnorePendingStylesheets();

+ document().updateStyleAndLayoutIgnorePendingStylesheets();

LocalFrame* frame = document().frame();

DCHECK(frame);

@@ -776,7 +776,7 @@ void CompositeEditCommand::deleteInsignificantText(Text* textNode, unsigned star

if (!textNode || start >= end)

return;

- document().updateLayout();

+ document().updateStyleAndLayout();

LayoutText* textLayoutObject = textNode->layoutObject();

if (!textLayoutObject)

@@ -888,7 +888,7 @@ HTMLBRElement* CompositeEditCommand::appendBlockPlaceholder(Element* container,

if (!container)

return nullptr;

- document().updateLayoutIgnorePendingStylesheets();

+ document().updateStyleAndLayoutIgnorePendingStylesheets();

// Should assert isLayoutBlockFlow || isInlineFlow when deletion improves. See 4244964.

DCHECK(container->layoutObject()) << container;

@@ -920,7 +920,7 @@ HTMLBRElement* CompositeEditCommand::addBlockPlaceholderIfNeeded(Element* contai

if (!container)

return nullptr;

- document().updateLayoutIgnorePendingStylesheets();

+ document().updateStyleAndLayoutIgnorePendingStylesheets();

LayoutObject* layoutObject = container->layoutObject();

if (!layoutObject || !layoutObject->isLayoutBlockFlow())

@@ -1334,7 +1334,7 @@ void CompositeEditCommand::moveParagraphs(const VisiblePosition& startOfParagrap

if (editingState->isAborted())

return;

// Need an updateLayout here in case inserting the br has split a text node.

- document().updateLayoutIgnorePendingStylesheets();

+ document().updateStyleAndLayoutIgnorePendingStylesheets();

}

destinationIndex = TextIterator::rangeLength(Position::firstPositionInNode(document().documentElement()), destination.toParentAnchoredPosition(), true);