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

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

Issue 304083003: Made StyleEngine CSSFontSelectorClient instead of StyleResolver. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 6 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
« no previous file with comments | « Source/core/css/resolver/StyleResolver.h ('k') | Source/core/dom/StyleEngine.h » ('j') | 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) 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 329 matching lines...) Expand 10 before | Expand all | Expand 10 after
340 if (!m_styleSharingLists[depth]) 340 if (!m_styleSharingLists[depth])
341 m_styleSharingLists[depth] = adoptPtr(new StyleSharingList); 341 m_styleSharingLists[depth] = adoptPtr(new StyleSharingList);
342 return *m_styleSharingLists[depth]; 342 return *m_styleSharingLists[depth];
343 } 343 }
344 344
345 void StyleResolver::clearStyleSharingList() 345 void StyleResolver::clearStyleSharingList()
346 { 346 {
347 m_styleSharingLists.resize(0); 347 m_styleSharingLists.resize(0);
348 } 348 }
349 349
350 void StyleResolver::fontsNeedUpdate(CSSFontSelector* fontSelector)
351 {
352 invalidateMatchedPropertiesCache();
353 m_document.setNeedsStyleRecalc(SubtreeStyleChange);
354 }
355
356 void StyleResolver::pushParentElement(Element& parent) 350 void StyleResolver::pushParentElement(Element& parent)
357 { 351 {
358 const ContainerNode* parentsParent = parent.parentOrShadowHostElement(); 352 const ContainerNode* parentsParent = parent.parentOrShadowHostElement();
359 353
360 // We are not always invoked consistently. For example, script execution can cause us to enter 354 // We are not always invoked consistently. For example, script execution can cause us to enter
361 // style recalc in the middle of tree building. We may also be invoked from somewhere within the tree. 355 // style recalc in the middle of tree building. We may also be invoked from somewhere within the tree.
362 // Reset the stack in this case, or if we see a new root element. 356 // Reset the stack in this case, or if we see a new root element.
363 // Otherwise just push the new parent. 357 // Otherwise just push the new parent.
364 if (!parentsParent || m_selectorFilter.parentStackIsEmpty()) 358 if (!parentsParent || m_selectorFilter.parentStackIsEmpty())
365 m_selectorFilter.setupParentStack(parent); 359 m_selectorFilter.setupParentStack(parent);
(...skipping 1133 matching lines...) Expand 10 before | Expand all | Expand 10 after
1499 { 1493 {
1500 visitor->trace(m_keyframesRuleMap); 1494 visitor->trace(m_keyframesRuleMap);
1501 visitor->trace(m_viewportDependentMediaQueryResults); 1495 visitor->trace(m_viewportDependentMediaQueryResults);
1502 visitor->trace(m_viewportStyleResolver); 1496 visitor->trace(m_viewportStyleResolver);
1503 visitor->trace(m_features); 1497 visitor->trace(m_features);
1504 visitor->trace(m_siblingRuleSet); 1498 visitor->trace(m_siblingRuleSet);
1505 visitor->trace(m_uncommonAttributeRuleSet); 1499 visitor->trace(m_uncommonAttributeRuleSet);
1506 visitor->trace(m_watchedSelectorsRules); 1500 visitor->trace(m_watchedSelectorsRules);
1507 visitor->trace(m_treeBoundaryCrossingRules); 1501 visitor->trace(m_treeBoundaryCrossingRules);
1508 visitor->trace(m_pendingStyleSheets); 1502 visitor->trace(m_pendingStyleSheets);
1509 CSSFontSelectorClient::trace(visitor);
1510 } 1503 }
1511 1504
1512 } // namespace WebCore 1505 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/css/resolver/StyleResolver.h ('k') | Source/core/dom/StyleEngine.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698