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

Unified Diff: third_party/WebKit/Source/core/editing/FrameSelection.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/FrameSelection.cpp
diff --git a/third_party/WebKit/Source/core/editing/FrameSelection.cpp b/third_party/WebKit/Source/core/editing/FrameSelection.cpp
index 88b0334f037acf89acdb46d11066424ccb943189..91dc01b80ad9dbe68e4252079c3e3d499c4e3bc8 100644
--- a/third_party/WebKit/Source/core/editing/FrameSelection.cpp
+++ b/third_party/WebKit/Source/core/editing/FrameSelection.cpp
@@ -706,7 +706,7 @@ IntRect FrameSelection::absoluteCaretBounds()
{
DCHECK(selection().isValidFor(*m_frame->document()));
DCHECK_NE(m_frame->document()->lifecycle().state(), DocumentLifecycle::InPaintInvalidation);
- m_frame->document()->updateLayoutIgnorePendingStylesheets();
+ m_frame->document()->updateStyleAndLayoutIgnorePendingStylesheets();
if (!isCaret()) {
m_caretBase->clearCaretRect();
} else {
@@ -963,7 +963,7 @@ void FrameSelection::focusedOrActiveStateChanged()
if (Element* element = document->focusedElement())
element->focusStateChanged();
- document->updateLayoutTree();
+ document->updateStyleAndLayoutTree();
// Because LayoutObject::selectionBackgroundColor() and
// LayoutObject::selectionForegroundColor() check if the frame is active,
@@ -1144,7 +1144,7 @@ void FrameSelection::setFocusedNodeIfNeeded()
if (Element* target = rootEditableElement()) {
// Walk up the DOM tree to search for a node to focus.
- m_frame->document()->updateLayoutTreeIgnorePendingStylesheets();
+ m_frame->document()->updateStyleAndLayoutTreeIgnorePendingStylesheets();
while (target) {
// We don't want to set focus on a subframe when selecting in a parent frame,
// so add the !isFrameElement check here. There's probably a better way to make this
@@ -1304,7 +1304,7 @@ void FrameSelection::setShouldShowBlockCursor(bool shouldShowBlockCursor)
{
m_shouldShowBlockCursor = shouldShowBlockCursor;
- m_frame->document()->updateLayoutIgnorePendingStylesheets();
+ m_frame->document()->updateStyleAndLayoutIgnorePendingStylesheets();
updateAppearance();
}
« no previous file with comments | « third_party/WebKit/Source/core/editing/Editor.cpp ('k') | third_party/WebKit/Source/core/editing/FrameSelectionTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698