third_party/WebKit/Source/core/page/PrintContext.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/page/PrintContext.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/page/FocusController.cpp ('k') | third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.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/page/PrintContext.cpp

diff --git a/third_party/WebKit/Source/core/page/PrintContext.cpp b/third_party/WebKit/Source/core/page/PrintContext.cpp

index 98606292834d3d73b83a5eed4662cc89685f35e9..e20c84d2abc5c323672ad907266c41431bc4071c 100644

--- a/third_party/WebKit/Source/core/page/PrintContext.cpp

+++ b/third_party/WebKit/Source/core/page/PrintContext.cpp

@@ -188,7 +188,7 @@ static LayoutBoxModelObject* enclosingBoxModelObject(LayoutObject* object)

int PrintContext::pageNumberForElement(Element* element, const FloatSize& pageSizeInPixels)

{

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

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

LayoutBoxModelObject* box = enclosingBoxModelObject(element->layoutObject());

if (!box)

@@ -302,7 +302,7 @@ String PrintContext::pageSizeAndMarginsInPixels(LocalFrame* frame, int pageNumbe

int PrintContext::numberOfPages(LocalFrame* frame, const FloatSize& pageSizeInPixels)

{

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

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

FloatRect pageRect(FloatPoint(0, 0), pageSizeInPixels);

PrintContext printContext(frame);