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

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

Issue 2382653006: Split CSSPrimitiveValue into CSSPrimitiveValue and CSSIdentifierValue (Closed)
Patch Set: Make check-webkit-style happy 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. 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 27 matching lines...) Expand all
38 #include "core/animation/InvalidatableInterpolation.h" 38 #include "core/animation/InvalidatableInterpolation.h"
39 #include "core/animation/KeyframeEffect.h" 39 #include "core/animation/KeyframeEffect.h"
40 #include "core/animation/StyleInterpolation.h" 40 #include "core/animation/StyleInterpolation.h"
41 #include "core/animation/animatable/AnimatableValue.h" 41 #include "core/animation/animatable/AnimatableValue.h"
42 #include "core/animation/css/CSSAnimatableValueFactory.h" 42 #include "core/animation/css/CSSAnimatableValueFactory.h"
43 #include "core/animation/css/CSSAnimations.h" 43 #include "core/animation/css/CSSAnimations.h"
44 #include "core/css/CSSCalculationValue.h" 44 #include "core/css/CSSCalculationValue.h"
45 #include "core/css/CSSCustomIdentValue.h" 45 #include "core/css/CSSCustomIdentValue.h"
46 #include "core/css/CSSDefaultStyleSheets.h" 46 #include "core/css/CSSDefaultStyleSheets.h"
47 #include "core/css/CSSFontSelector.h" 47 #include "core/css/CSSFontSelector.h"
48 #include "core/css/CSSIdentifierValue.h"
48 #include "core/css/CSSKeyframeRule.h" 49 #include "core/css/CSSKeyframeRule.h"
49 #include "core/css/CSSKeyframesRule.h" 50 #include "core/css/CSSKeyframesRule.h"
50 #include "core/css/CSSReflectValue.h" 51 #include "core/css/CSSReflectValue.h"
51 #include "core/css/CSSRuleList.h" 52 #include "core/css/CSSRuleList.h"
52 #include "core/css/CSSSelector.h" 53 #include "core/css/CSSSelector.h"
53 #include "core/css/CSSStyleRule.h" 54 #include "core/css/CSSStyleRule.h"
54 #include "core/css/CSSValueList.h" 55 #include "core/css/CSSValueList.h"
55 #include "core/css/ElementRuleCollector.h" 56 #include "core/css/ElementRuleCollector.h"
56 #include "core/css/FontFace.h" 57 #include "core/css/FontFace.h"
57 #include "core/css/MediaQueryEvaluator.h" 58 #include "core/css/MediaQueryEvaluator.h"
(...skipping 788 matching lines...) Expand 10 before | Expand all | Expand 10 after
846 matchAllRules(state, collector, 847 matchAllRules(state, collector,
847 matchingBehavior != MatchAllRulesExcludingSMIL); 848 matchingBehavior != MatchAllRulesExcludingSMIL);
848 849
849 // TODO(dominicc): Remove this counter when Issue 590014 is fixed. 850 // TODO(dominicc): Remove this counter when Issue 590014 is fixed.
850 if (element->hasTagName(HTMLNames::summaryTag)) { 851 if (element->hasTagName(HTMLNames::summaryTag)) {
851 MatchedPropertiesRange properties = 852 MatchedPropertiesRange properties =
852 collector.matchedResult().authorRules(); 853 collector.matchedResult().authorRules();
853 for (auto it = properties.begin(); it != properties.end(); ++it) { 854 for (auto it = properties.begin(); it != properties.end(); ++it) {
854 const CSSValue* value = 855 const CSSValue* value =
855 it->properties->getPropertyCSSValue(CSSPropertyDisplay); 856 it->properties->getPropertyCSSValue(CSSPropertyDisplay);
856 if (value && value->isPrimitiveValue() && 857 if (value && value->isIdentifierValue() &&
857 toCSSPrimitiveValue(*value).getValueID() == CSSValueBlock) 858 toCSSIdentifierValue(*value).getValueID() == CSSValueBlock)
858 UseCounter::count( 859 UseCounter::count(
859 element->document(), 860 element->document(),
860 UseCounter::SummaryElementWithDisplayBlockAuthorRule); 861 UseCounter::SummaryElementWithDisplayBlockAuthorRule);
861 } 862 }
862 } 863 }
863 864
864 if (element->computedStyle() && 865 if (element->computedStyle() &&
865 element->computedStyle()->textAutosizingMultiplier() != 866 element->computedStyle()->textAutosizingMultiplier() !=
866 state.style()->textAutosizingMultiplier()) { 867 state.style()->textAutosizingMultiplier()) {
867 // Preserve the text autosizing multiplier on style recalc. Autosizer will update it during layout if needed. 868 // Preserve the text autosizing multiplier on style recalc. Autosizer will update it during layout if needed.
(...skipping 1044 matching lines...) Expand 10 before | Expand all | Expand 10 after
1912 visitor->trace(m_siblingRuleSet); 1913 visitor->trace(m_siblingRuleSet);
1913 visitor->trace(m_uncommonAttributeRuleSet); 1914 visitor->trace(m_uncommonAttributeRuleSet);
1914 visitor->trace(m_watchedSelectorsRules); 1915 visitor->trace(m_watchedSelectorsRules);
1915 visitor->trace(m_treeBoundaryCrossingScopes); 1916 visitor->trace(m_treeBoundaryCrossingScopes);
1916 visitor->trace(m_styleSharingLists); 1917 visitor->trace(m_styleSharingLists);
1917 visitor->trace(m_pendingStyleSheets); 1918 visitor->trace(m_pendingStyleSheets);
1918 visitor->trace(m_document); 1919 visitor->trace(m_document);
1919 } 1920 }
1920 1921
1921 } // namespace blink 1922 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698