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

Unified Diff: xfa/fde/css/fde_css.h

Issue 2072803002: Make code compile with clang_use_chrome_plugin (final) (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: tidy Created 4 years, 6 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: xfa/fde/css/fde_css.h
diff --git a/xfa/fde/css/fde_css.h b/xfa/fde/css/fde_css.h
index 551f8f8962bdff30bf61c2db3798ed9165bb0938..30996ef036bd093aa196fd5656f9801480ef2c21 100644
--- a/xfa/fde/css/fde_css.h
+++ b/xfa/fde/css/fde_css.h
@@ -690,9 +690,9 @@ class IFDE_CSSValue {
class IFDE_CSSPrimitiveValue : public IFDE_CSSValue {
public:
- virtual FDE_CSSVALUETYPE GetType() const {
- return FDE_CSSVALUETYPE_Primitive;
- }
+ // IFDE_CSSValue
+ FDE_CSSVALUETYPE GetType() const override;
+
virtual FDE_CSSPRIMITIVETYPE GetPrimitiveType() const = 0;
virtual FX_ARGB GetRGBColor() const = 0;
virtual FX_FLOAT GetFloat() const = 0;
@@ -703,13 +703,23 @@ class IFDE_CSSPrimitiveValue : public IFDE_CSSValue {
virtual IFDE_CSSValue* GetArgs(int32_t index) const = 0;
};
+inline FDE_CSSVALUETYPE IFDE_CSSPrimitiveValue::GetType() const {
Lei Zhang 2016/06/17 03:10:05 Put these in xfa/fde/css/fde_cssdatatable.cpp?
Wei Li 2016/06/17 21:47:44 created fde_css.cpp, done
+ return FDE_CSSVALUETYPE_Primitive;
+}
+
class IFDE_CSSValueList : public IFDE_CSSValue {
public:
- virtual FDE_CSSVALUETYPE GetType() const { return FDE_CSSVALUETYPE_List; }
+ // IFDE_CSSValue
+ FDE_CSSVALUETYPE GetType() const override;
+
virtual int32_t CountValues() const = 0;
virtual IFDE_CSSValue* GetValue(int32_t index) const = 0;
};
+inline FDE_CSSVALUETYPE IFDE_CSSValueList::GetType() const {
+ return FDE_CSSVALUETYPE_List;
+}
+
class IFDE_CSSRule {
public:
virtual ~IFDE_CSSRule() {}
@@ -719,26 +729,44 @@ typedef CFX_MassArrayTemplate<IFDE_CSSRule*> CFDE_CSSRuleArray;
class IFDE_CSSStyleRule : public IFDE_CSSRule {
public:
- virtual FDE_CSSRULETYPE GetType() const { return FDE_CSSRULETYPE_Style; }
+ // IFDE_CSSValue
+ FDE_CSSRULETYPE GetType() const override;
+
virtual int32_t CountSelectorLists() const = 0;
virtual CFDE_CSSSelector* GetSelectorList(int32_t index) const = 0;
virtual CFDE_CSSDeclaration* GetDeclaration() = 0;
};
+inline FDE_CSSRULETYPE IFDE_CSSStyleRule::GetType() const {
+ return FDE_CSSRULETYPE_Style;
+}
+
class IFDE_CSSMediaRule : public IFDE_CSSRule {
public:
- virtual FDE_CSSRULETYPE GetType() const { return FDE_CSSRULETYPE_Media; }
+ // IFDE_CSSValue
+ FDE_CSSRULETYPE GetType() const override;
+
virtual uint32_t GetMediaList() const = 0;
virtual int32_t CountRules() const = 0;
virtual IFDE_CSSRule* GetRule(int32_t index) = 0;
};
+inline FDE_CSSRULETYPE IFDE_CSSMediaRule::GetType() const {
+ return FDE_CSSRULETYPE_Media;
+}
+
class IFDE_CSSFontFaceRule : public IFDE_CSSRule {
public:
- virtual FDE_CSSRULETYPE GetType() const { return FDE_CSSRULETYPE_FontFace; }
+ // IFDE_CSSValue
+ FDE_CSSRULETYPE GetType() const override;
+
virtual CFDE_CSSDeclaration* GetDeclaration() = 0;
};
+inline FDE_CSSRULETYPE IFDE_CSSFontFaceRule::GetType() const {
+ return FDE_CSSRULETYPE_FontFace;
+}
+
class IFDE_CSSStyleSheet : public IFX_Retainable {
public:
static IFDE_CSSStyleSheet* LoadHTMLStandardStyleSheet();

Powered by Google App Engine
This is Rietveld 408576698