third_party/WebKit/Source/core/html/ImageDocument.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/html/ImageDocument.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/html/HTMLTextFormControlElement.cpp ('k') | third_party/WebKit/Source/core/html/PluginDocument.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/html/ImageDocument.cpp

diff --git a/third_party/WebKit/Source/core/html/ImageDocument.cpp b/third_party/WebKit/Source/core/html/ImageDocument.cpp

index 0d312fce026acad9721e83db6b9086adecc1cc84..d51109ac339b4f337bdddb93890e3d954063525e 100644

--- a/third_party/WebKit/Source/core/html/ImageDocument.cpp

+++ b/third_party/WebKit/Source/core/html/ImageDocument.cpp

@@ -294,7 +294,7 @@ void ImageDocument::imageClicked(int x, int y)

} else {

restoreImageSize(ScaleZoomedDocument);

- updateLayout();

+ updateStyleAndLayout();

double scale = this->scale();

@@ -312,7 +312,7 @@ void ImageDocument::imageUpdated()

if (m_imageSizeIsKnown)

return;

- updateLayoutTree();

+ updateStyleAndLayoutTree();

if (!m_imageElement->cachedImage() || m_imageElement->cachedImage()->imageSize(LayoutObject::shouldRespectImageOrientation(m_imageElement->layoutObject()), pageZoomFactor(this)).isEmpty())

return;