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

Side by Side Diff: third_party/WebKit/Source/core/layout/svg/SVGResources.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
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 261 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 registerPendingResource(extensions, id, element); 272 registerPendingResource(extensions, id, element);
273 } 273 }
274 } 274 }
275 275
276 if (chainableResourceTags().contains(tagName)) { 276 if (chainableResourceTags().contains(tagName)) {
277 AtomicString id = targetReferenceFromResource(*element); 277 AtomicString id = targetReferenceFromResource(*element);
278 if (!ensureResources(resources).setLinkedResource(getLayoutSVGResourceCo ntainerById(treeScope, id))) 278 if (!ensureResources(resources).setLinkedResource(getLayoutSVGResourceCo ntainerById(treeScope, id)))
279 registerPendingResource(extensions, id, element); 279 registerPendingResource(extensions, id, element);
280 } 280 }
281 281
282 return (!resources || !resources->hasResourceData()) ? nullptr : resources.r elease(); 282 return (!resources || !resources->hasResourceData()) ? nullptr : std::move(r esources);
283 } 283 }
284 284
285 void SVGResources::layoutIfNeeded() 285 void SVGResources::layoutIfNeeded()
286 { 286 {
287 if (m_clipperFilterMaskerData) { 287 if (m_clipperFilterMaskerData) {
288 if (LayoutSVGResourceClipper* clipper = m_clipperFilterMaskerData->clipp er) 288 if (LayoutSVGResourceClipper* clipper = m_clipperFilterMaskerData->clipp er)
289 clipper->layoutIfNeeded(); 289 clipper->layoutIfNeeded();
290 if (LayoutSVGResourceMasker* masker = m_clipperFilterMaskerData->masker) 290 if (LayoutSVGResourceMasker* masker = m_clipperFilterMaskerData->masker)
291 masker->layoutIfNeeded(); 291 masker->layoutIfNeeded();
292 if (LayoutSVGResourceFilter* filter = m_clipperFilterMaskerData->filter) 292 if (LayoutSVGResourceFilter* filter = m_clipperFilterMaskerData->filter)
(...skipping 371 matching lines...) Expand 10 before | Expand all | Expand 10 after
664 if (LayoutSVGResourcePaintServer* stroke = m_fillStrokeData->stroke) 664 if (LayoutSVGResourcePaintServer* stroke = m_fillStrokeData->stroke)
665 fprintf(stderr, " |-> Stroke : %p (node=%p)\n", stroke, stroke-> element()); 665 fprintf(stderr, " |-> Stroke : %p (node=%p)\n", stroke, stroke-> element());
666 } 666 }
667 667
668 if (m_linkedResource) 668 if (m_linkedResource)
669 fprintf(stderr, " |-> xlink:href : %p (node=%p)\n", m_linkedResource, m_ linkedResource->element()); 669 fprintf(stderr, " |-> xlink:href : %p (node=%p)\n", m_linkedResource, m_ linkedResource->element());
670 } 670 }
671 #endif 671 #endif
672 672
673 } // namespace blink 673 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698