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

Unified Diff: third_party/WebKit/Source/build/scripts/templates/ComputedStyleBase.h.tmpl

Issue 2329463004: ABANDONED CL: Changes needed to make things compile after running rewrite_to_chrome_style tool. (Closed)
Patch Set: More fixes - things build fine at this point. Created 3 years, 8 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 side-by-side diff with in-line comments
Download patch
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 5325ec38c198d96b7d453f67c4d1f67c532034ab..03a48012e77dde6c9d76d4582bd0b1692826e4ba 100644
--- a/third_party/WebKit/Source/build/scripts/templates/ComputedStyleBase.h.tmpl
+++ b/third_party/WebKit/Source/build/scripts/templates/ComputedStyleBase.h.tmpl
@@ -33,7 +33,7 @@ namespace blink {
// in ComputedStyle.h.
class CORE_EXPORT ComputedStyleBase {
public:
- inline bool independentInheritedEqual(const ComputedStyleBase& o) const {
+ inline bool IndependentInheritedEqual(const ComputedStyleBase& o) const {
return (
{% for field in fields if field.is_inherited and field.is_independent %}
{{field.name}} == o.{{field.name}}{{print_if(not loop.last, ' &&')}}
@@ -41,7 +41,7 @@ class CORE_EXPORT ComputedStyleBase {
);
}
- inline bool nonIndependentInheritedEqual(const ComputedStyleBase& o) const {
+ inline bool NonIndependentInheritedEqual(const ComputedStyleBase& o) const {
return (
{% for field in fields if field.is_inherited and not field.is_independent %}
{{field.name}} == o.{{field.name}}{{print_if(not loop.last, ' &&')}}
@@ -49,11 +49,11 @@ class CORE_EXPORT ComputedStyleBase {
);
}
- inline bool inheritedEqual(const ComputedStyleBase& o) const {
- return independentInheritedEqual(o) && nonIndependentInheritedEqual(o);
+ inline bool InheritedEqual(const ComputedStyleBase& o) const {
+ return IndependentInheritedEqual(o) && NonIndependentInheritedEqual(o);
}
- inline bool nonInheritedEqual(const ComputedStyleBase& o) const {
+ inline bool NonInheritedEqual(const ComputedStyleBase& o) const {
return (
{% for field in fields if field.is_property and not field.is_inherited %}
{{field.name}} == o.{{field.name}}{{print_if(not loop.last, ' &&')}}
@@ -62,17 +62,17 @@ class CORE_EXPORT ComputedStyleBase {
}
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.

Powered by Google App Engine
This is Rietveld 408576698