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

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

Issue 2419663009: Convert a few more CFI blacklist entries into DISABLE_CFI_PERF attributes. (Closed)
Patch Set: Created 4 years, 2 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. 5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc.
6 * All rights reserved. 6 * All rights reserved.
7 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 7 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
8 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> 8 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
9 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. 9 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
10 * (http://www.torchmobile.com/) 10 * (http://www.torchmobile.com/)
(...skipping 616 matching lines...) Expand 10 before | Expand all | Expand 10 after
627 collector.setMatchingUARules(false); 627 collector.setMatchingUARules(false);
628 } 628 }
629 629
630 void StyleResolver::matchRuleSet(ElementRuleCollector& collector, 630 void StyleResolver::matchRuleSet(ElementRuleCollector& collector,
631 RuleSet* rules) { 631 RuleSet* rules) {
632 collector.clearMatchedRules(); 632 collector.clearMatchedRules();
633 collector.collectMatchingRules(MatchRequest(rules)); 633 collector.collectMatchingRules(MatchRequest(rules));
634 collector.sortAndTransferMatchedRules(); 634 collector.sortAndTransferMatchedRules();
635 } 635 }
636 636
637 DISABLE_CFI_PERF
637 void StyleResolver::matchAllRules(StyleResolverState& state, 638 void StyleResolver::matchAllRules(StyleResolverState& state,
638 ElementRuleCollector& collector, 639 ElementRuleCollector& collector,
639 bool includeSMILProperties) { 640 bool includeSMILProperties) {
640 matchUARules(collector); 641 matchUARules(collector);
641 642
642 // Now check author rules, beginning first with presentational attributes 643 // Now check author rules, beginning first with presentational attributes
643 // mapped from HTML. 644 // mapped from HTML.
644 if (state.element()->isStyledElement()) { 645 if (state.element()->isStyledElement()) {
645 collector.addElementStyleProperties( 646 collector.addElementStyleProperties(
646 state.element()->presentationAttributeStyle()); 647 state.element()->presentationAttributeStyle());
(...skipping 1302 matching lines...) Expand 10 before | Expand all | Expand 10 after
1949 visitor->trace(m_siblingRuleSet); 1950 visitor->trace(m_siblingRuleSet);
1950 visitor->trace(m_uncommonAttributeRuleSet); 1951 visitor->trace(m_uncommonAttributeRuleSet);
1951 visitor->trace(m_watchedSelectorsRules); 1952 visitor->trace(m_watchedSelectorsRules);
1952 visitor->trace(m_treeBoundaryCrossingScopes); 1953 visitor->trace(m_treeBoundaryCrossingScopes);
1953 visitor->trace(m_styleSharingLists); 1954 visitor->trace(m_styleSharingLists);
1954 visitor->trace(m_pendingStyleSheets); 1955 visitor->trace(m_pendingStyleSheets);
1955 visitor->trace(m_document); 1956 visitor->trace(m_document);
1956 } 1957 }
1957 1958
1958 } // namespace blink 1959 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698