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

Side by Side Diff: Source/core/css/resolver/StyleResolver.cpp

Issue 423013002: Oilpan: Remove Element* raw pointers in objects (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 4 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) 3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) 4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved. 5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> 7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. 9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
10 * Copyright (C) Research In Motion Limited 2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2011. All rights reserved.
(...skipping 323 matching lines...) Expand 10 before | Expand all | Expand 10 after
334 334
335 StyleSharingList& StyleResolver::styleSharingList() 335 StyleSharingList& StyleResolver::styleSharingList()
336 { 336 {
337 m_styleSharingLists.resize(styleSharingMaxDepth); 337 m_styleSharingLists.resize(styleSharingMaxDepth);
338 338
339 // We never put things at depth 0 into the list since that's only the <html> element 339 // We never put things at depth 0 into the list since that's only the <html> element
340 // and it has no siblings or cousins to share with. 340 // and it has no siblings or cousins to share with.
341 unsigned depth = std::max(std::min(m_styleSharingDepth, styleSharingMaxDepth ), 1u) - 1u; 341 unsigned depth = std::max(std::min(m_styleSharingDepth, styleSharingMaxDepth ), 1u) - 1u;
342 342
343 if (!m_styleSharingLists[depth]) 343 if (!m_styleSharingLists[depth])
344 m_styleSharingLists[depth] = adoptPtr(new StyleSharingList); 344 m_styleSharingLists[depth] = adoptPtrWillBeNoop(new StyleSharingList);
345 return *m_styleSharingLists[depth]; 345 return *m_styleSharingLists[depth];
346 } 346 }
347 347
348 void StyleResolver::clearStyleSharingList() 348 void StyleResolver::clearStyleSharingList()
349 { 349 {
350 m_styleSharingLists.resize(0); 350 m_styleSharingLists.resize(0);
351 } 351 }
352 352
353 void StyleResolver::pushParentElement(Element& parent) 353 void StyleResolver::pushParentElement(Element& parent)
354 { 354 {
(...skipping 1200 matching lines...) Expand 10 before | Expand all | Expand 10 after
1555 #if ENABLE(OILPAN) 1555 #if ENABLE(OILPAN)
1556 visitor->trace(m_keyframesRuleMap); 1556 visitor->trace(m_keyframesRuleMap);
1557 visitor->trace(m_matchedPropertiesCache); 1557 visitor->trace(m_matchedPropertiesCache);
1558 visitor->trace(m_viewportDependentMediaQueryResults); 1558 visitor->trace(m_viewportDependentMediaQueryResults);
1559 visitor->trace(m_viewportStyleResolver); 1559 visitor->trace(m_viewportStyleResolver);
1560 visitor->trace(m_features); 1560 visitor->trace(m_features);
1561 visitor->trace(m_siblingRuleSet); 1561 visitor->trace(m_siblingRuleSet);
1562 visitor->trace(m_uncommonAttributeRuleSet); 1562 visitor->trace(m_uncommonAttributeRuleSet);
1563 visitor->trace(m_watchedSelectorsRules); 1563 visitor->trace(m_watchedSelectorsRules);
1564 visitor->trace(m_treeBoundaryCrossingRules); 1564 visitor->trace(m_treeBoundaryCrossingRules);
1565 visitor->trace(m_styleSharingLists);
1565 visitor->trace(m_pendingStyleSheets); 1566 visitor->trace(m_pendingStyleSheets);
1566 visitor->trace(m_styleTree); 1567 visitor->trace(m_styleTree);
1567 visitor->trace(m_scopedStyleResolvers); 1568 visitor->trace(m_scopedStyleResolvers);
1568 #endif 1569 #endif
1569 } 1570 }
1570 1571
1571 } // namespace blink 1572 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698