| Index: third_party/WebKit/Source/build/scripts/templates/ComputedStyleBase.h.tmpl
|
| diff --git a/third_party/WebKit/Source/build/scripts/templates/ComputedStyleBase.h.tmpl b/third_party/WebKit/Source/build/scripts/templates/ComputedStyleBase.h.tmpl
|
| index b72300c1096ea9e3790bef6a13b2bde3bb33fe0b..d8ca2fc8fb7c32abdfc2d619347bcb160d146a30 100644
|
| --- a/third_party/WebKit/Source/build/scripts/templates/ComputedStyleBase.h.tmpl
|
| +++ b/third_party/WebKit/Source/build/scripts/templates/ComputedStyleBase.h.tmpl
|
| @@ -46,7 +46,7 @@ class CORE_EXPORT ComputedStyleBase {
|
|
|
| bool operator!=(const ComputedStyleBase& o) const { return !(*this == o); }
|
|
|
| - inline bool inheritedEqual(const ComputedStyleBase& o) const {
|
| + inline bool InheritedEqual(const ComputedStyleBase& o) const {
|
| return true &&
|
| {% for field in fields if field.is_property and field.is_inherited %}
|
| {{field.name}} == o.{{field.name}} &&
|
| @@ -54,7 +54,7 @@ class CORE_EXPORT ComputedStyleBase {
|
| true;
|
| }
|
|
|
| - inline bool independentInheritedEqual(const ComputedStyleBase& o) const {
|
| + inline bool IndependentInheritedEqual(const ComputedStyleBase& o) const {
|
| return true &&
|
| {% for field in fields if field.is_property and field.is_inherited and field.is_independent %}
|
| {{field.name}} == o.{{field.name}} &&
|
| @@ -62,7 +62,7 @@ class CORE_EXPORT ComputedStyleBase {
|
| true;
|
| }
|
|
|
| - inline bool nonIndependentInheritedEqual(const ComputedStyleBase& o) const {
|
| + inline bool NonIndependentInheritedEqual(const ComputedStyleBase& o) const {
|
| return true &&
|
| {% for field in fields if field.is_property and field.is_inherited and not field.is_independent %}
|
| {{field.name}} == o.{{field.name}} &&
|
| @@ -70,7 +70,7 @@ class CORE_EXPORT ComputedStyleBase {
|
| true;
|
| }
|
|
|
| - inline bool nonInheritedEqual(const ComputedStyleBase& o) const {
|
| + inline bool NonInheritedEqual(const ComputedStyleBase& o) const {
|
| return true &&
|
| {% for field in fields if field.is_property and not field.is_inherited %}
|
| {{field.name}} == o.{{field.name}} &&
|
| @@ -78,24 +78,24 @@ class CORE_EXPORT ComputedStyleBase {
|
| true;
|
| }
|
|
|
| - void setBitDefaults() {
|
| + void SetBitDefaults() {
|
| {% for field in fields %}
|
| {{field.resetter_method_name}}();
|
| {% endfor %}
|
| }
|
|
|
| enum IsAtShadowBoundary {
|
| - AtShadowBoundary,
|
| - NotAtShadowBoundary,
|
| + kAtShadowBoundary,
|
| + kNotAtShadowBoundary,
|
| };
|
| - void inheritFrom(const ComputedStyleBase& inheritParent,
|
| - IsAtShadowBoundary isAtShadowBoundary = NotAtShadowBoundary);
|
| + void InheritFrom(const ComputedStyleBase& inheritParent,
|
| + IsAtShadowBoundary isAtShadowBoundary = kNotAtShadowBoundary);
|
|
|
| - void copyNonInheritedFromCached(const ComputedStyleBase& other);
|
| + void CopyNonInheritedFromCached(const ComputedStyleBase& other);
|
|
|
| // Copies the values of any independent inherited properties from the parent
|
| // style that are marked as inherited by this style.
|
| - void propagateIndependentInheritedProperties(
|
| + void PropagateIndependentInheritedProperties(
|
| const ComputedStyleBase& parentStyle);
|
|
|
| // Fields.
|
|
|