third_party/WebKit/Source/core/layout/LayoutImageResourceStyleImage.cpp - Issue 1667843003: Make Resource RefCountedWillBeGarbageCollectedFinalized, attempt #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/LayoutImageResourceStyleImage.cpp

Issue 1667843003: Make Resource RefCountedWillBeGarbageCollectedFinalized, attempt #2 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase + address review comments Created 4 years, 10 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/LayoutImageResource.h ('k') | third_party/WebKit/Source/core/loader/DocumentLoader.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 36add16256d5b4e112fc3fb49da733da1c05761e..be7e3e0f30a3bff6336e4ef504f3612bb40c0212 100644

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

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

@@ -41,6 +41,7 @@ LayoutImageResourceStyleImage::LayoutImageResourceStyleImage(StyleImage* styleIm

LayoutImageResourceStyleImage::~LayoutImageResourceStyleImage()

{

+ ASSERT(!m_cachedImage);

}

void LayoutImageResourceStyleImage::initialize(LayoutObject* layoutObject)

@@ -57,7 +58,7 @@ void LayoutImageResourceStyleImage::shutdown()

{

ASSERT(m_layoutObject);

m_styleImage->removeClient(m_layoutObject);

- m_cachedImage = 0;

+ m_cachedImage = nullptr;

}

PassRefPtr<Image> LayoutImageResourceStyleImage::image(const IntSize& size, float zoom) const