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

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

Issue 1743803002: Rename enums/functions that collide in chromium style in core/style/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get-names-8
Patch Set: get-names-9: rebase Created 4 years, 9 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 {% from 'macros.tmpl' import license %} 1 {% from 'macros.tmpl' import license %}
2 {{license()}} 2 {{license()}}
3 3
4 #include "core/css/resolver/StyleBuilder.h" 4 #include "core/css/resolver/StyleBuilder.h"
5 5
6 #include "StyleBuilderFunctions.h" 6 #include "StyleBuilderFunctions.h"
7 #include "core/css/CSSProperty.h" 7 #include "core/css/CSSProperty.h"
8 #include "core/css/resolver/StyleResolverState.h" 8 #include "core/css/resolver/StyleResolverState.h"
9 9
10 // FIXME: currently we're just generating a switch statement, but we should 10 // FIXME: currently we're just generating a switch statement, but we should
(...skipping 18 matching lines...) Expand all
29 29
30 {% endfor %} 30 {% endfor %}
31 case CSSPropertyVariable: 31 case CSSPropertyVariable:
32 ASSERT(!isInitial && !isInherit); 32 ASSERT(!isInitial && !isInherit);
33 StyleBuilderFunctions::applyValueCSSPropertyVariable(state, value); 33 StyleBuilderFunctions::applyValueCSSPropertyVariable(state, value);
34 return; 34 return;
35 {% for property_id, property in properties.items() if property.direction_awa re %} 35 {% for property_id, property in properties.items() if property.direction_awa re %}
36 case {{property_id}}: 36 case {{property_id}}:
37 {% endfor %} 37 {% endfor %}
38 { 38 {
39 CSSPropertyID resolvedProperty = CSSProperty::resolveDirectionAwarePrope rty(property, state.style()->direction(), state.style()->writingMode()); 39 CSSPropertyID resolvedProperty = CSSProperty::resolveDirectionAwarePrope rty(property, state.style()->direction(), state.style()->getWritingMode());
40 ASSERT(resolvedProperty != property); 40 ASSERT(resolvedProperty != property);
41 applyProperty(resolvedProperty, state, value); 41 applyProperty(resolvedProperty, state, value);
42 return; 42 return;
43 } 43 }
44 {% for property_id, property in properties.items() if property.builder_skip %} 44 {% for property_id, property in properties.items() if property.builder_skip %}
45 case {{property_id}}: 45 case {{property_id}}:
46 {% endfor %} 46 {% endfor %}
47 return; 47 return;
48 default: 48 default:
49 ASSERT_NOT_REACHED(); 49 ASSERT_NOT_REACHED();
50 } 50 }
51 } 51 }
52 52
53 } // namespace blink 53 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698