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

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

Issue 2517653002: Convert a few more CFI blacklist entries into DISABLE_CFI_PERF attributes. (Closed)
Patch Set: Revert some of the changes which have a high risk of breaking things Created 4 years, 1 month 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 504 matching lines...) Expand 10 before | Expand all | Expand 10 after
515 collector.setMatchingUARules(false); 515 collector.setMatchingUARules(false);
516 } 516 }
517 517
518 void StyleResolver::matchRuleSet(ElementRuleCollector& collector, 518 void StyleResolver::matchRuleSet(ElementRuleCollector& collector,
519 RuleSet* rules) { 519 RuleSet* rules) {
520 collector.clearMatchedRules(); 520 collector.clearMatchedRules();
521 collector.collectMatchingRules(MatchRequest(rules)); 521 collector.collectMatchingRules(MatchRequest(rules));
522 collector.sortAndTransferMatchedRules(); 522 collector.sortAndTransferMatchedRules();
523 } 523 }
524 524
525 DISABLE_CFI_PERF
525 void StyleResolver::matchAllRules(StyleResolverState& state, 526 void StyleResolver::matchAllRules(StyleResolverState& state,
526 ElementRuleCollector& collector, 527 ElementRuleCollector& collector,
527 bool includeSMILProperties) { 528 bool includeSMILProperties) {
528 matchUARules(collector); 529 matchUARules(collector);
529 530
530 // Now check author rules, beginning first with presentational attributes 531 // Now check author rules, beginning first with presentational attributes
531 // mapped from HTML. 532 // mapped from HTML.
532 if (state.element()->isStyledElement()) { 533 if (state.element()->isStyledElement()) {
533 collector.addElementStyleProperties( 534 collector.addElementStyleProperties(
534 state.element()->presentationAttributeStyle()); 535 state.element()->presentationAttributeStyle());
(...skipping 1348 matching lines...) Expand 10 before | Expand all | Expand 10 after
1883 visitor->trace(m_viewportDependentMediaQueryResults); 1884 visitor->trace(m_viewportDependentMediaQueryResults);
1884 visitor->trace(m_deviceDependentMediaQueryResults); 1885 visitor->trace(m_deviceDependentMediaQueryResults);
1885 visitor->trace(m_selectorFilter); 1886 visitor->trace(m_selectorFilter);
1886 visitor->trace(m_styleSharingLists); 1887 visitor->trace(m_styleSharingLists);
1887 visitor->trace(m_pendingStyleSheets); 1888 visitor->trace(m_pendingStyleSheets);
1888 visitor->trace(m_document); 1889 visitor->trace(m_document);
1889 visitor->trace(m_tracker); 1890 visitor->trace(m_tracker);
1890 } 1891 }
1891 1892
1892 } // namespace blink 1893 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698