third_party/WebKit/Source/core/layout/LayoutObject.cpp - Issue 1706083002: Split ImageResourceClient into ResourceClient and ImageResourceObserver [1/2]

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/LayoutObject.cpp

Issue 1706083002: Split ImageResourceClient into ResourceClient and ImageResourceObserver [1/2] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: More consistent Client/Observer Created 4 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

View side-by-side diff with in-line comments

« third_party/WebKit/Source/core/fetch/Resource.h ('K') | « third_party/WebKit/Source/core/layout/LayoutObject.h ('k') | third_party/WebKit/Source/core/layout/svg/LayoutSVGImage.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index afc3f54de36afed8d746c40465cd7305f1cf7a91..5f6e04aa82b2610d8af272ab975ef75bf378d61f 100644

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

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

@@ -243,8 +243,7 @@ static WTF::RefCountedLeakCounter& layoutObjectCounter()

#endif

LayoutObject::LayoutObject(Node* node)

- : ImageResourceClient()

- , m_style(nullptr)

+ : m_style(nullptr)

, m_node(node)

, m_parent(nullptr)

, m_previous(nullptr)

@@ -3085,7 +3084,7 @@ void LayoutObject::addAnnotatedRegions(Vector<AnnotatedRegionValue>& regions)

regions.append(region);

}

-bool LayoutObject::willRenderImage(ImageResource*)

+bool LayoutObject::willRenderImage()

{

// Without visibility we won't render (and therefore don't care about animation).

if (style()->visibility() != VISIBLE)

@@ -3100,7 +3099,7 @@ bool LayoutObject::willRenderImage(ImageResource*)

return document().view()->isVisible();

}

-bool LayoutObject::getImageAnimationPolicy(ImageResource*, ImageAnimationPolicy& policy)

+bool LayoutObject::getImageAnimationPolicy(ImageAnimationPolicy& policy)

{

if (!document().settings())

return false;