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

Side by Side Diff: third_party/WebKit/Source/build/scripts/templates/StyleBuilder.cpp.tmpl

Issue 1406993009: Revert "CSS Custom Properties (Variables)" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 {% from 'macros.tmpl' import license %} 1 {% from 'macros.tmpl' import license %}
2 {{license()}} 2 {{license()}}
3 3
4 #include "config.h" 4 #include "config.h"
5 #include "core/css/resolver/StyleBuilder.h" 5 #include "core/css/resolver/StyleBuilder.h"
6 6
7 #include "StyleBuilderFunctions.h" 7 #include "StyleBuilderFunctions.h"
8 #include "core/css/CSSProperty.h" 8 #include "core/css/CSSProperty.h"
9 #include "core/css/resolver/StyleResolverState.h" 9 #include "core/css/resolver/StyleResolverState.h"
10 10
(...skipping 11 matching lines...) Expand all
22 case {{property_id}}: 22 case {{property_id}}:
23 if (isInitial) 23 if (isInitial)
24 StyleBuilderFunctions::applyInitial{{used_property_id}}(state); 24 StyleBuilderFunctions::applyInitial{{used_property_id}}(state);
25 else if (isInherit) 25 else if (isInherit)
26 StyleBuilderFunctions::applyInherit{{used_property_id}}(state); 26 StyleBuilderFunctions::applyInherit{{used_property_id}}(state);
27 else 27 else
28 StyleBuilderFunctions::applyValue{{used_property_id}}(state, value); 28 StyleBuilderFunctions::applyValue{{used_property_id}}(state, value);
29 return; 29 return;
30 30
31 {% endfor %} 31 {% endfor %}
32 case CSSPropertyVariable:
33 ASSERT(!isInitial && !isInherit);
34 StyleBuilderFunctions::applyValueCSSPropertyVariable(state, value);
35 return;
36 {% for property_id, property in properties.items() if property.direction_awa re %} 32 {% for property_id, property in properties.items() if property.direction_awa re %}
37 case {{property_id}}: 33 case {{property_id}}:
38 {% endfor %} 34 {% endfor %}
39 { 35 {
40 CSSPropertyID resolvedProperty = CSSProperty::resolveDirectionAwarePrope rty(property, state.style()->direction(), state.style()->writingMode()); 36 CSSPropertyID resolvedProperty = CSSProperty::resolveDirectionAwarePrope rty(property, state.style()->direction(), state.style()->writingMode());
41 ASSERT(resolvedProperty != property); 37 ASSERT(resolvedProperty != property);
42 applyProperty(resolvedProperty, state, value); 38 applyProperty(resolvedProperty, state, value);
43 return; 39 return;
44 } 40 }
45 {% for property_id, property in properties.items() if property.builder_skip %} 41 {% for property_id, property in properties.items() if property.builder_skip %}
46 case {{property_id}}: 42 case {{property_id}}:
47 {% endfor %} 43 {% endfor %}
48 return; 44 return;
49 default: 45 default:
50 ASSERT_NOT_REACHED(); 46 ASSERT_NOT_REACHED();
51 } 47 }
52 } 48 }
53 49
54 } // namespace blink 50 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698