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

Unified Diff: third_party/WebKit/Source/core/css/CSSQuadValue.h

Issue 1731583003: blink: Rename enums and functions to not collide with chromium style. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: get-names-2: . Created 4 years, 10 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/core/css/CSSQuadValue.h
diff --git a/third_party/WebKit/Source/core/css/CSSQuadValue.h b/third_party/WebKit/Source/core/css/CSSQuadValue.h
index 32693f1f928808f19f890e1a11498b5b14a433f0..538b75e9e4221268c942751346297331aa2f934d 100644
--- a/third_party/WebKit/Source/core/css/CSSQuadValue.h
+++ b/third_party/WebKit/Source/core/css/CSSQuadValue.h
@@ -30,12 +30,12 @@ namespace blink {
class CORE_EXPORT CSSQuadValue : public CSSValue {
public:
- enum SerializationType {
+ enum TypeForSerialization {
SerializeAsRect,
SerializeAsQuad
};
- static PassRefPtrWillBeRawPtr<CSSQuadValue> create(PassRefPtrWillBeRawPtr<CSSPrimitiveValue> top, PassRefPtrWillBeRawPtr<CSSPrimitiveValue> right, PassRefPtrWillBeRawPtr<CSSPrimitiveValue> bottom, PassRefPtrWillBeRawPtr<CSSPrimitiveValue> left, SerializationType serializationType)
+ static PassRefPtrWillBeRawPtr<CSSQuadValue> create(PassRefPtrWillBeRawPtr<CSSPrimitiveValue> top, PassRefPtrWillBeRawPtr<CSSPrimitiveValue> right, PassRefPtrWillBeRawPtr<CSSPrimitiveValue> bottom, PassRefPtrWillBeRawPtr<CSSPrimitiveValue> left, TypeForSerialization serializationType)
{
return adoptRefWillBeNoop(new CSSQuadValue(top, right, bottom, left, serializationType));
}
@@ -45,7 +45,7 @@ public:
CSSPrimitiveValue* bottom() const { return m_bottom.get(); }
CSSPrimitiveValue* left() const { return m_left.get(); }
- SerializationType serializationType() { return m_serializationType; }
+ TypeForSerialization serializationType() { return m_serializationType; }
String customCSSText() const;
@@ -60,7 +60,7 @@ public:
DECLARE_TRACE_AFTER_DISPATCH();
protected:
- CSSQuadValue(PassRefPtrWillBeRawPtr<CSSPrimitiveValue> top, PassRefPtrWillBeRawPtr<CSSPrimitiveValue> right, PassRefPtrWillBeRawPtr<CSSPrimitiveValue> bottom, PassRefPtrWillBeRawPtr<CSSPrimitiveValue> left, SerializationType serializationType)
+ CSSQuadValue(PassRefPtrWillBeRawPtr<CSSPrimitiveValue> top, PassRefPtrWillBeRawPtr<CSSPrimitiveValue> right, PassRefPtrWillBeRawPtr<CSSPrimitiveValue> bottom, PassRefPtrWillBeRawPtr<CSSPrimitiveValue> left, TypeForSerialization serializationType)
: CSSValue(QuadClass)
, m_serializationType(serializationType)
, m_top(top)
@@ -69,7 +69,7 @@ protected:
, m_left(left) { }
private:
- SerializationType m_serializationType;
+ TypeForSerialization m_serializationType;
RefPtrWillBeMember<CSSPrimitiveValue> m_top;
RefPtrWillBeMember<CSSPrimitiveValue> m_right;
RefPtrWillBeMember<CSSPrimitiveValue> m_bottom;
« no previous file with comments | « third_party/WebKit/Source/core/css/CSSBasicShapeValues.h ('k') | third_party/WebKit/Source/core/css/CSSQuadValue.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698