third_party/WebKit/Source/core/layout/LayoutTreeAsText.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/layout/LayoutTreeAsText.cpp

Issue 1896793002: Rename (updateLayout/updateStyle).*.() to updateStyleAndLayout.*.() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 8 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/layout/LayoutObject.cpp ('k') | third_party/WebKit/Source/core/page/FocusController.cpp » ('j') | third_party/WebKit/Source/core/testing/Internals.idl » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/layout/LayoutTreeAsText.cpp

diff --git a/third_party/WebKit/Source/core/layout/LayoutTreeAsText.cpp b/third_party/WebKit/Source/core/layout/LayoutTreeAsText.cpp

index b0adbcb95fa7436e5b1abaaedfb44ca4fa888a4c..6fb97d71d5be4ff792e5e6783ce763012ea93e62 100644

--- a/third_party/WebKit/Source/core/layout/LayoutTreeAsText.cpp

+++ b/third_party/WebKit/Source/core/layout/LayoutTreeAsText.cpp

@@ -541,7 +541,7 @@ void write(TextStream& ts, const LayoutObject& o, int indent, LayoutAsTextBehavi

FrameView* view = toFrameView(widget);

LayoutView* root = view->layoutView();

if (root) {

- root->document().updateLayout();

+ root->document().updateStyleAndLayout();

PaintLayer* layer = root->layer();

if (layer)

LayoutTreeAsText::writeLayers(ts, layer, layer, layer->rect(), indent + 1, behavior);

@@ -786,7 +786,7 @@ static String externalRepresentation(LayoutBox* layoutObject, LayoutAsTextBehavi

String externalRepresentation(LocalFrame* frame, LayoutAsTextBehavior behavior, const PaintLayer* markedLayer)

{

if (!(behavior & LayoutAsTextDontUpdateLayout))

- frame->document()->updateLayout();

+ frame->document()->updateStyleAndLayout();

LayoutObject* layoutObject = frame->contentLayoutObject();

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

@@ -806,7 +806,7 @@ String externalRepresentation(Element* element, LayoutAsTextBehavior behavior)

// Doesn't support printing mode.

ASSERT(!(behavior & LayoutAsTextPrintingMode));

if (!(behavior & LayoutAsTextDontUpdateLayout))

- element->document().updateLayout();

+ element->document().updateStyleAndLayout();

LayoutObject* layoutObject = element->layoutObject();

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

@@ -830,7 +830,7 @@ static void writeCounterValuesFromChildren(TextStream& stream, LayoutObject* par

String counterValueForElement(Element* element)

{

- element->document().updateLayout();

+ element->document().updateStyleAndLayout();

TextStream stream;

bool isFirstCounter = true;

// The counter layoutObjects should be children of :before or :after pseudo-elements.

@@ -843,7 +843,7 @@ String counterValueForElement(Element* element)

String markerTextForListItem(Element* element)

{

- element->document().updateLayout();

+ element->document().updateStyleAndLayout();

LayoutObject* layoutObject = element->layoutObject();

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