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

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

Issue 211073002: [Oilpan]: Move CSSFontSelectorClient to the oilpan heap using transition types. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Adding StyleEngine.cpp change (forgot to upload diff again with WTF change) Created 6 years, 9 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 379 matching lines...) Expand 10 before | Expand all | Expand 10 after
390 } 390 }
391 391
392 void StyleResolver::popParentShadowRoot(const ShadowRoot& shadowRoot) 392 void StyleResolver::popParentShadowRoot(const ShadowRoot& shadowRoot)
393 { 393 {
394 ASSERT(shadowRoot.host()); 394 ASSERT(shadowRoot.host());
395 m_styleTree.popStyleCache(shadowRoot); 395 m_styleTree.popStyleCache(shadowRoot);
396 } 396 }
397 397
398 StyleResolver::~StyleResolver() 398 StyleResolver::~StyleResolver()
399 { 399 {
400 m_viewportStyleResolver->clearDocument();
401 } 400 }
402 401
403 inline void StyleResolver::collectTreeBoundaryCrossingRules(Element* element, El ementRuleCollector& collector, bool includeEmptyRules) 402 inline void StyleResolver::collectTreeBoundaryCrossingRules(Element* element, El ementRuleCollector& collector, bool includeEmptyRules)
404 { 403 {
405 if (m_treeBoundaryCrossingRules.isEmpty()) 404 if (m_treeBoundaryCrossingRules.isEmpty())
406 return; 405 return;
407 406
408 RuleRange ruleRange = collector.matchedResult().ranges.authorRuleRange(); 407 RuleRange ruleRange = collector.matchedResult().ranges.authorRuleRange();
409 408
410 // When comparing rules declared in outer treescopes, outer's rules win. 409 // When comparing rules declared in outer treescopes, outer's rules win.
(...skipping 1007 matching lines...) Expand 10 before | Expand all | Expand 10 after
1418 1417
1419 bool StyleResolver::mediaQueryAffectedByViewportChange() const 1418 bool StyleResolver::mediaQueryAffectedByViewportChange() const
1420 { 1419 {
1421 for (unsigned i = 0; i < m_viewportDependentMediaQueryResults.size(); ++i) { 1420 for (unsigned i = 0; i < m_viewportDependentMediaQueryResults.size(); ++i) {
1422 if (m_medium->eval(&m_viewportDependentMediaQueryResults[i]->m_expressio n) != m_viewportDependentMediaQueryResults[i]->m_result) 1421 if (m_medium->eval(&m_viewportDependentMediaQueryResults[i]->m_expressio n) != m_viewportDependentMediaQueryResults[i]->m_result)
1423 return true; 1422 return true;
1424 } 1423 }
1425 return false; 1424 return false;
1426 } 1425 }
1427 1426
1427 void StyleResolver::trace(Visitor* visitor)
1428 {
1429 visitor->trace(m_keyframesRuleMap);
1430 visitor->trace(m_viewportDependentMediaQueryResults);
1431 visitor->trace(m_viewportStyleResolver);
1432 visitor->trace(m_siblingRuleSet);
1433 visitor->trace(m_uncommonAttributeRuleSet);
1434 visitor->trace(m_watchedSelectorsRules);
1435 visitor->trace(m_treeBoundaryCrossingRules);
1436 }
1437
1428 } // namespace WebCore 1438 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698