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

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

Issue 1829403002: Clean up font loading (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@Resource_status
Patch Set: Address hiroshige's comments 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) 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 687 matching lines...) Expand 10 before | Expand all | Expand 10 after
698 void StyleResolver::adjustComputedStyle(StyleResolverState& state, Element* elem ent) 698 void StyleResolver::adjustComputedStyle(StyleResolverState& state, Element* elem ent)
699 { 699 {
700 StyleAdjuster adjuster; 700 StyleAdjuster adjuster;
701 adjuster.adjustComputedStyle(state.mutableStyleRef(), *state.parentStyle(), element); 701 adjuster.adjustComputedStyle(state.mutableStyleRef(), *state.parentStyle(), element);
702 } 702 }
703 703
704 // Start loading resources referenced by this style. 704 // Start loading resources referenced by this style.
705 void StyleResolver::loadPendingResources(StyleResolverState& state) 705 void StyleResolver::loadPendingResources(StyleResolverState& state)
706 { 706 {
707 state.elementStyleResources().loadPendingResources(state.style()); 707 state.elementStyleResources().loadPendingResources(state.style());
708 document().styleEngine().fontSelector()->fontLoader()->loadPendingFonts();
709 } 708 }
710 709
711 PassRefPtr<ComputedStyle> StyleResolver::styleForElement(Element* element, const ComputedStyle* defaultParent, StyleSharingBehavior sharingBehavior, 710 PassRefPtr<ComputedStyle> StyleResolver::styleForElement(Element* element, const ComputedStyle* defaultParent, StyleSharingBehavior sharingBehavior,
712 RuleMatchingBehavior matchingBehavior) 711 RuleMatchingBehavior matchingBehavior)
713 { 712 {
714 ASSERT(document().frame()); 713 ASSERT(document().frame());
715 ASSERT(document().settings()); 714 ASSERT(document().settings());
716 ASSERT(!hasPendingAuthorStyleSheets()); 715 ASSERT(!hasPendingAuthorStyleSheets());
717 ASSERT(!m_needCollectFeatures); 716 ASSERT(!m_needCollectFeatures);
718 717
(...skipping 1015 matching lines...) Expand 10 before | Expand all | Expand 10 after
1734 visitor->trace(m_siblingRuleSet); 1733 visitor->trace(m_siblingRuleSet);
1735 visitor->trace(m_uncommonAttributeRuleSet); 1734 visitor->trace(m_uncommonAttributeRuleSet);
1736 visitor->trace(m_watchedSelectorsRules); 1735 visitor->trace(m_watchedSelectorsRules);
1737 visitor->trace(m_treeBoundaryCrossingScopes); 1736 visitor->trace(m_treeBoundaryCrossingScopes);
1738 visitor->trace(m_styleSharingLists); 1737 visitor->trace(m_styleSharingLists);
1739 visitor->trace(m_pendingStyleSheets); 1738 visitor->trace(m_pendingStyleSheets);
1740 visitor->trace(m_document); 1739 visitor->trace(m_document);
1741 } 1740 }
1742 1741
1743 } // namespace blink 1742 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698