third_party/WebKit/Source/core/html/HTMLImageElement.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/HTMLImageElement.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/html/HTMLFormElement.cpp ('k') | third_party/WebKit/Source/core/html/HTMLLabelElement.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/html/HTMLImageElement.cpp

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

index ff3b1017fc921d60d67e9ac3f59a75181aca43ca..d92d0d739fad69971443941a0fc8a9a3925f939d 100644

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

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

@@ -406,7 +406,7 @@ void HTMLImageElement::removedFrom(ContainerNode* insertionPoint)

int HTMLImageElement::width()

{

if (inActiveDocument())

- document().updateLayoutIgnorePendingStylesheets();

+ document().updateStyleAndLayoutIgnorePendingStylesheets();

if (!layoutObject()) {

// check the attribute first for an explicit pixel value

@@ -427,7 +427,7 @@ int HTMLImageElement::width()

int HTMLImageElement::height()

{

if (inActiveDocument())

- document().updateLayoutIgnorePendingStylesheets();

+ document().updateStyleAndLayoutIgnorePendingStylesheets();

if (!layoutObject()) {

// check the attribute first for an explicit pixel value

@@ -520,7 +520,7 @@ void HTMLImageElement::setWidth(int value)

int HTMLImageElement::x() const

{

- document().updateLayoutIgnorePendingStylesheets();

+ document().updateStyleAndLayoutIgnorePendingStylesheets();

LayoutObject* r = layoutObject();

if (!r)

return 0;

@@ -532,7 +532,7 @@ int HTMLImageElement::x() const

int HTMLImageElement::y() const

{

- document().updateLayoutIgnorePendingStylesheets();

+ document().updateStyleAndLayoutIgnorePendingStylesheets();

LayoutObject* r = layoutObject();

if (!r)

return 0;