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

Side by Side Diff: third_party/WebKit/Source/core/layout/svg/SVGResourcesCache.cpp

Issue 1979183002: Remove OwnPtr::release() calls in core/ (part 3). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge with trunk. 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 unified diff | Download patch
« no previous file with comments | « third_party/WebKit/Source/core/layout/svg/SVGResources.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 2 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public 5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 30 matching lines...) Expand all
41 ASSERT(!m_cache.contains(object)); 41 ASSERT(!m_cache.contains(object));
42 42
43 const SVGComputedStyle& svgStyle = style.svgStyle(); 43 const SVGComputedStyle& svgStyle = style.svgStyle();
44 44
45 // Build a list of all resources associated with the passed LayoutObject. 45 // Build a list of all resources associated with the passed LayoutObject.
46 OwnPtr<SVGResources> newResources = SVGResources::buildResources(object, svg Style); 46 OwnPtr<SVGResources> newResources = SVGResources::buildResources(object, svg Style);
47 if (!newResources) 47 if (!newResources)
48 return; 48 return;
49 49
50 // Put object in cache. 50 // Put object in cache.
51 SVGResources* resources = m_cache.set(object, newResources.release()).stored Value->value.get(); 51 SVGResources* resources = m_cache.set(object, std::move(newResources)).store dValue->value.get();
52 52
53 // Run cycle-detection _afterwards_, so self-references can be caught as wel l. 53 // Run cycle-detection _afterwards_, so self-references can be caught as wel l.
54 SVGResourcesCycleSolver solver(object, resources); 54 SVGResourcesCycleSolver solver(object, resources);
55 solver.resolveCycles(); 55 solver.resolveCycles();
56 56
57 // Walk resources and register the layout object as a client of each resourc e. 57 // Walk resources and register the layout object as a client of each resourc e.
58 HashSet<LayoutSVGResourceContainer*> resourceSet; 58 HashSet<LayoutSVGResourceContainer*> resourceSet;
59 resources->buildSetOfResources(resourceSet); 59 resources->buildSetOfResources(resourceSet);
60 60
61 for (auto* resourceContainer : resourceSet) 61 for (auto* resourceContainer : resourceSet)
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 ASSERT(layoutObject); 162 ASSERT(layoutObject);
163 163
164 SVGResources* resources = cachedResourcesForLayoutObject(layoutObject); 164 SVGResources* resources = cachedResourcesForLayoutObject(layoutObject);
165 if (resources) 165 if (resources)
166 resources->removeClientFromCache(layoutObject); 166 resources->removeClientFromCache(layoutObject);
167 SVGResourcesCache& cache = resourcesCache(layoutObject->document()); 167 SVGResourcesCache& cache = resourcesCache(layoutObject->document());
168 cache.removeResourcesFromLayoutObject(layoutObject); 168 cache.removeResourcesFromLayoutObject(layoutObject);
169 } 169 }
170 170
171 } // namespace blink 171 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/svg/SVGResources.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698