Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3)

Side by Side Diff: third_party/WebKit/Source/core/style/StyleFetchedImage.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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Antti Koivisto (koivisto@kde.org) 3 * (C) 2000 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2003, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. 5 * Copyright (C) 2003, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 StyleFetchedImage::~StyleFetchedImage() 46 StyleFetchedImage::~StyleFetchedImage()
47 { 47 {
48 #if !ENABLE(OILPAN) 48 #if !ENABLE(OILPAN)
49 dispose(); 49 dispose();
50 #endif 50 #endif
51 } 51 }
52 52
53 void StyleFetchedImage::dispose() 53 void StyleFetchedImage::dispose()
54 { 54 {
55 m_image->removeClient(this); 55 m_image->removeClient(this);
56 m_image = nullptr;
56 } 57 }
57 58
58 WrappedImagePtr StyleFetchedImage::data() const 59 WrappedImagePtr StyleFetchedImage::data() const
59 { 60 {
60 return m_image.get(); 61 return m_image.get();
61 } 62 }
62 63
63 ImageResource* StyleFetchedImage::cachedImage() const 64 ImageResource* StyleFetchedImage::cachedImage() const
64 { 65 {
65 return m_image.get(); 66 return m_image.get();
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 } 138 }
138 139
139 bool StyleFetchedImage::knownToBeOpaque(const LayoutObject* layoutObject) const 140 bool StyleFetchedImage::knownToBeOpaque(const LayoutObject* layoutObject) const
140 { 141 {
141 TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "PaintImage", " data", InspectorPaintImageEvent::data(layoutObject, *m_image.get())); 142 TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "PaintImage", " data", InspectorPaintImageEvent::data(layoutObject, *m_image.get()));
142 return m_image->image()->currentFrameKnownToBeOpaque(Image::PreCacheMetadata ); 143 return m_image->image()->currentFrameKnownToBeOpaque(Image::PreCacheMetadata );
143 } 144 }
144 145
145 DEFINE_TRACE(StyleFetchedImage) 146 DEFINE_TRACE(StyleFetchedImage)
146 { 147 {
148 visitor->trace(m_image);
147 visitor->trace(m_document); 149 visitor->trace(m_document);
148 StyleImage::trace(visitor); 150 StyleImage::trace(visitor);
149 } 151 }
150 152
151 } // namespace blink 153 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/style/StyleFetchedImage.h ('k') | third_party/WebKit/Source/core/style/StyleFetchedImageSet.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698