From ca3ac5e9ffc936066267fbb1c329e5297d8e23e6 Mon Sep 17 00:00:00 2001
From: Tom Sepez <tsepez@chromium.org>
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 ++++----
 xfa/src/fdp/src/css/fde_csscache.cpp       | 6 +++---
 xfa/src/fdp/src/css/fde_csscache.h         | 6 +++---
 xfa/src/fdp/src/css/fde_cssstyleselector.h | 2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'xfa/src/fdp')

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,
diff --git a/xfa/src/fdp/src/css/fde_csscache.cpp b/xfa/src/fdp/src/css/fde_csscache.cpp
index 3c061082e2..b1207ae29e 100644
--- a/xfa/src/fdp/src/css/fde_csscache.cpp
+++ b/xfa/src/fdp/src/css/fde_csscache.cpp
@@ -42,7 +42,7 @@ CFDE_CSSStyleSheetCache::~CFDE_CSSStyleSheetCache()
         m_pFixedStore->Release();
     }
 }
-void CFDE_CSSStyleSheetCache::AddStyleSheet(FX_BSTR szKey, IFDE_CSSStyleSheet *pStyleSheet)
+void CFDE_CSSStyleSheetCache::AddStyleSheet(const CFX_ByteStringC& szKey, IFDE_CSSStyleSheet *pStyleSheet)
 {
     FXSYS_assert(pStyleSheet != NULL);
     if (m_pFixedStore == NULL) {
@@ -67,7 +67,7 @@ void CFDE_CSSStyleSheetCache::AddStyleSheet(FX_BSTR szKey, IFDE_CSSStyleSheet *p
         m_Stylesheets.SetAt(szKey, pItem);
     }
 }
-IFDE_CSSStyleSheet* CFDE_CSSStyleSheetCache::GetStyleSheet(FX_BSTR szKey) const
+IFDE_CSSStyleSheet* CFDE_CSSStyleSheetCache::GetStyleSheet(const CFX_ByteStringC& szKey) const
 {
     void* pValue = NULL;
     if (m_Stylesheets.Lookup(szKey, pValue)) {
@@ -78,7 +78,7 @@ IFDE_CSSStyleSheet* CFDE_CSSStyleSheetCache::GetStyleSheet(FX_BSTR szKey) const
     }
     return NULL;
 }
-void CFDE_CSSStyleSheetCache::RemoveStyleSheet(FX_BSTR szKey)
+void CFDE_CSSStyleSheetCache::RemoveStyleSheet(const CFX_ByteStringC& szKey)
 {
     void* pValue = NULL;
     if (!m_Stylesheets.Lookup(szKey, pValue)) {
diff --git a/xfa/src/fdp/src/css/fde_csscache.h b/xfa/src/fdp/src/css/fde_csscache.h
index 82c0e4f7e0..617009b398 100644
--- a/xfa/src/fdp/src/css/fde_csscache.h
+++ b/xfa/src/fdp/src/css/fde_csscache.h
@@ -28,9 +28,9 @@ public:
         m_iMaxItems = iMaxCount;
     }
 
-    virtual void					AddStyleSheet(FX_BSTR szKey, IFDE_CSSStyleSheet *pStyleSheet);
-    virtual IFDE_CSSStyleSheet*		GetStyleSheet(FX_BSTR szKey) const;
-    virtual void					RemoveStyleSheet(FX_BSTR szKey);
+    virtual void					AddStyleSheet(const CFX_ByteStringC& szKey, IFDE_CSSStyleSheet *pStyleSheet);
+    virtual IFDE_CSSStyleSheet*		GetStyleSheet(const CFX_ByteStringC& szKey) const;
+    virtual void					RemoveStyleSheet(const CFX_ByteStringC& szKey);
 protected:
     void							RemoveLowestActivityItem();
     CFX_MapByteStringToPtr			m_Stylesheets;
diff --git a/xfa/src/fdp/src/css/fde_cssstyleselector.h b/xfa/src/fdp/src/css/fde_cssstyleselector.h
index 36bf3f179d..9d1d02b333 100644
--- a/xfa/src/fdp/src/css/fde_cssstyleselector.h
+++ b/xfa/src/fdp/src/css/fde_cssstyleselector.h
@@ -411,7 +411,7 @@ public:
     {
         return (IFDE_CSSRubyStyle * const)this;
     }
-    virtual FX_BOOL					GetCustomStyle(FX_WSTR wsName, CFX_WideString &wsValue) const
+    virtual FX_BOOL					GetCustomStyle(const CFX_WideStringC& wsName, CFX_WideString &wsValue) const
     {
         for (int32_t i = m_CustomProperties.GetSize() - 2; i > -1; i -= 2) {
             if (wsName == m_CustomProperties[i]) {
-- 
cgit v1.2.3