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

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

Issue 2279133002: Remove CSSVariables RuntimeEnabledFeatures flag (status=stable) (Closed)
Patch Set: Created 4 years, 3 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) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 3 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
4 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) 4 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
5 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) 5 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved. 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. 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. (http://www.t orchmobile.com/) 9 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
10 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. 10 * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 return true; 100 return true;
101 default: 101 default:
102 return false; 102 return false;
103 } 103 }
104 } 104 }
105 105
106 } // namespace 106 } // namespace
107 107
108 void StyleBuilder::applyProperty(CSSPropertyID id, StyleResolverState& state, co nst CSSValue& value) 108 void StyleBuilder::applyProperty(CSSPropertyID id, StyleResolverState& state, co nst CSSValue& value)
109 { 109 {
110 if (RuntimeEnabledFeatures::cssVariablesEnabled() && id != CSSPropertyVariab le 110 if (id != CSSPropertyVariable
111 && (value.isVariableReferenceValue() || value.isPendingSubstitutionValue ())) { 111 && (value.isVariableReferenceValue() || value.isPendingSubstitutionValue ())) {
112 112
113 const CSSValue* resolvedValue = value.isVariableReferenceValue() ? 113 const CSSValue* resolvedValue = value.isVariableReferenceValue() ?
114 CSSVariableResolver::resolveVariableReferences(state, id, toCSSVaria bleReferenceValue(value)) : 114 CSSVariableResolver::resolveVariableReferences(state, id, toCSSVaria bleReferenceValue(value)) :
115 CSSVariableResolver::resolvePendingSubstitutions(state, id, toCSSPen dingSubstitutionValue(value)); 115 CSSVariableResolver::resolvePendingSubstitutions(state, id, toCSSPen dingSubstitutionValue(value));
116 applyProperty(id, state, *resolvedValue); 116 applyProperty(id, state, *resolvedValue);
117 117
118 if (!state.style()->hasVariableReferenceFromNonInheritedProperty() && !C SSPropertyMetadata::isInheritedProperty(id)) 118 if (!state.style()->hasVariableReferenceFromNonInheritedProperty() && !C SSPropertyMetadata::isInheritedProperty(id))
119 state.style()->setHasVariableReferenceFromNonInheritedProperty(); 119 state.style()->setHasVariableReferenceFromNonInheritedProperty();
120 return; 120 return;
(...skipping 737 matching lines...) Expand 10 before | Expand all | Expand 10 after
858 } 858 }
859 } 859 }
860 860
861 void StyleBuilderFunctions::applyInheritCSSPropertyPosition(StyleResolverState& state) 861 void StyleBuilderFunctions::applyInheritCSSPropertyPosition(StyleResolverState& state)
862 { 862 {
863 if (!state.parentNode()->isDocumentNode()) 863 if (!state.parentNode()->isDocumentNode())
864 state.style()->setPosition(state.parentStyle()->position()); 864 state.style()->setPosition(state.parentStyle()->position());
865 } 865 }
866 866
867 } // namespace blink 867 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698