From ca3ac5e9ffc936066267fbb1c329e5297d8e23e6 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Wed, 10 Jun 2015 17:38:11 -0700 Subject: Merge to XFA: Remove FX_BSTR and FX_WSTR typedefs. Nearly automatic merge + re-run script on new files. Original Review URL: https://codereview.chromium.org/1180593004. TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1174303002. --- xfa/src/fdp/include/fde_css.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'xfa/src/fdp/include') diff --git a/xfa/src/fdp/include/fde_css.h b/xfa/src/fdp/include/fde_css.h index c55f6c471e..96d49250b9 100644 --- a/xfa/src/fdp/include/fde_css.h +++ b/xfa/src/fdp/include/fde_css.h @@ -475,9 +475,9 @@ public: static IFDE_CSSStyleSheetCache* Create(); virtual void Release() = 0; virtual void SetMaxItems(int32_t iMaxCount = 5) = 0; - virtual void AddStyleSheet(FX_BSTR szKey, IFDE_CSSStyleSheet *pStyleSheet) = 0; - virtual IFDE_CSSStyleSheet* GetStyleSheet(FX_BSTR szKey) const = 0; - virtual void RemoveStyleSheet(FX_BSTR szKey) = 0; + virtual void AddStyleSheet(const CFX_ByteStringC& szKey, IFDE_CSSStyleSheet *pStyleSheet) = 0; + virtual IFDE_CSSStyleSheet* GetStyleSheet(const CFX_ByteStringC& szKey) const = 0; + virtual void RemoveStyleSheet(const CFX_ByteStringC& szKey) = 0; }; enum FDE_CSSSYNTAXSTATUS { FDE_CSSSYNTAXSTATUS_Error, @@ -1036,7 +1036,7 @@ public: virtual IFDE_CSSTableStyle* GetTableStyle() const = 0; virtual IFDE_CSSGeneratedContentStyle* GetGeneratedContentStyle() const = 0; virtual IFDE_CSSRubyStyle* GetRubyStyle() const = 0; - virtual FX_BOOL GetCustomStyle(FX_WSTR wsName, CFX_WideString &wsValue) const = 0; + virtual FX_BOOL GetCustomStyle(const CFX_WideStringC& wsName, CFX_WideString &wsValue) const = 0; }; enum FDE_CSSSTYLESHEETGROUP { FDE_CSSSTYLESHEETGROUP_UserAgent, -- cgit v1.2.3