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

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

Issue 1850413002: Improve DEFINE_STATIC_LOCAL()'s handling of Blink GCed objects. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address compilation failure Created 4 years, 8 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) 2004, 2005, 2006, 2007, 2008 Nikolas Zimmermann <zimmermann@kde .org> 2 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Nikolas Zimmermann <zimmermann@kde .org>
3 * Copyright (C) 2004, 2005, 2006, 2008 Rob Buis <buis@kde.org> 3 * Copyright (C) 2004, 2005, 2006, 2008 Rob Buis <buis@kde.org>
4 * Copyright (C) 2008 Apple Inc. All rights reserved. 4 * Copyright (C) 2008 Apple Inc. All rights reserved.
5 * Copyright (C) 2008 Alp Toker <alp@atoker.com> 5 * Copyright (C) 2008 Alp Toker <alp@atoker.com>
6 * Copyright (C) 2009 Cameron McCormack <cam@mcc.id.au> 6 * Copyright (C) 2009 Cameron McCormack <cam@mcc.id.au>
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 520 matching lines...) Expand 10 before | Expand all | Expand 10 after
531 if (!hasSVGRareData()) 531 if (!hasSVGRareData())
532 return; 532 return;
533 533
534 HeapHashSet<WeakMember<SVGElement>>& instances = svgRareData()->elementInsta nces(); 534 HeapHashSet<WeakMember<SVGElement>>& instances = svgRareData()->elementInsta nces();
535 535
536 instances.remove(instance); 536 instances.remove(instance);
537 } 537 }
538 538
539 static HeapHashSet<WeakMember<SVGElement>>& emptyInstances() 539 static HeapHashSet<WeakMember<SVGElement>>& emptyInstances()
540 { 540 {
541 DEFINE_STATIC_LOCAL(Persistent<HeapHashSet<WeakMember<SVGElement>>>, emptyIn stances, (new HeapHashSet<WeakMember<SVGElement>>())); 541 DEFINE_STATIC_LOCAL(HeapHashSet<WeakMember<SVGElement>>, emptyInstances, (ne w HeapHashSet<WeakMember<SVGElement>>));
542 return *emptyInstances; 542 return emptyInstances;
543 } 543 }
544 544
545 const HeapHashSet<WeakMember<SVGElement>>& SVGElement::instancesForElement() con st 545 const HeapHashSet<WeakMember<SVGElement>>& SVGElement::instancesForElement() con st
546 { 546 {
547 if (!hasSVGRareData()) 547 if (!hasSVGRareData())
548 return emptyInstances(); 548 return emptyInstances();
549 return svgRareData()->elementInstances(); 549 return svgRareData()->elementInstances();
550 } 550 }
551 551
552 void SVGElement::setCursorElement(SVGCursorElement* cursorElement) 552 void SVGElement::setCursorElement(SVGCursorElement* cursorElement)
(...skipping 667 matching lines...) Expand 10 before | Expand all | Expand 10 after
1220 Element::trace(visitor); 1220 Element::trace(visitor);
1221 } 1221 }
1222 1222
1223 const AtomicString& SVGElement::eventParameterName() 1223 const AtomicString& SVGElement::eventParameterName()
1224 { 1224 {
1225 DEFINE_STATIC_LOCAL(const AtomicString, evtString, ("evt")); 1225 DEFINE_STATIC_LOCAL(const AtomicString, evtString, ("evt"));
1226 return evtString; 1226 return evtString;
1227 } 1227 }
1228 1228
1229 } // namespace blink 1229 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/style/ComputedStyle.cpp ('k') | third_party/WebKit/Source/core/svg/SVGStyleElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698