diff options
| author | Ryan Harrison <rharrison@chromium.org> | 2017-09-18 14:23:18 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-09-18 18:40:16 +0000 |
| commit | 275e260a6cd4a8e506ba974feb85ebcd926c1739 (patch) | |
| tree | 2029b9158ec044764ceff122fe5fb5d0a3f123d1 /xfa/fxfa/parser/cxfa_resolveprocessor.h | |
| parent | 450fbeaaabf1ab340c1018de2e58f1950657517e (diff) | |
| download | pdfium-275e260a6cd4a8e506ba974feb85ebcd926c1739.tar.xz | |
Convert string class names
Automated using git grep & sed.
Replace StringC classes with StringView classes.
Remove the CFX_ prefix and put string classes in fxcrt namespace.
Change AsStringC() to AsStringView().
Rename tests from TEST(fxcrt, *String*Foo) to TEST(*String*,
Foo).
Couple of tests needed to have their names regularlized.
BUG=pdfium:894
Change-Id: I7ca038685c8d803795f3ed02545124f7a224c83d
Reviewed-on: https://pdfium-review.googlesource.com/14151
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Ryan Harrison <rharrison@chromium.org>
Diffstat (limited to 'xfa/fxfa/parser/cxfa_resolveprocessor.h')
| -rw-r--r-- | xfa/fxfa/parser/cxfa_resolveprocessor.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/xfa/fxfa/parser/cxfa_resolveprocessor.h b/xfa/fxfa/parser/cxfa_resolveprocessor.h index f4eafea023..b48ee36476 100644 --- a/xfa/fxfa/parser/cxfa_resolveprocessor.h +++ b/xfa/fxfa/parser/cxfa_resolveprocessor.h @@ -22,9 +22,9 @@ class CXFA_ResolveNodesData { CXFA_ScriptContext* m_pSC; CXFA_Object* m_CurObject; - CFX_WideString m_wsName; + WideString m_wsName; XFA_HashCode m_uHashName; - CFX_WideString m_wsCondition; + WideString m_wsCondition; int32_t m_nLevel; std::vector<CXFA_Object*> m_Objects; // Not owned. uint32_t m_dwStyles; @@ -38,12 +38,12 @@ class CXFA_ResolveProcessor { ~CXFA_ResolveProcessor(); int32_t Resolve(CXFA_ResolveNodesData& rnd); - int32_t GetFilter(const CFX_WideStringC& wsExpression, + int32_t GetFilter(const WideStringView& wsExpression, int32_t nStart, CXFA_ResolveNodesData& rnd); int32_t SetResultCreateNode(XFA_RESOLVENODE_RS& resolveNodeRS, - CFX_WideString& wsLastCondition); - void SetIndexDataBind(CFX_WideString& wsNextCondition, + WideString& wsLastCondition); + void SetIndexDataBind(WideString& wsNextCondition, int32_t& iIndex, int32_t iCount); void SetCurStart(int32_t start) { m_iCurStart = start; } @@ -53,7 +53,7 @@ class CXFA_ResolveProcessor { private: int32_t ResolveForAttributeRs(CXFA_Object* curNode, CXFA_ResolveNodesData& rnd, - const CFX_WideStringC& strAttr); + const WideStringView& strAttr); int32_t ResolveAnyChild(CXFA_ResolveNodesData& rnd); int32_t ResolveDollar(CXFA_ResolveNodesData& rnd); int32_t ResolveExcalmatory(CXFA_ResolveNodesData& rnd); @@ -64,14 +64,14 @@ class CXFA_ResolveProcessor { void SetStylesForChild(uint32_t dwParentStyles, CXFA_ResolveNodesData& rnd); void ConditionArray(int32_t iCurIndex, - CFX_WideString wsCondition, + WideString wsCondition, int32_t iFoundCount, CXFA_ResolveNodesData& rnd); void DoPredicateFilter(int32_t iCurIndex, - CFX_WideString wsCondition, + WideString wsCondition, int32_t iFoundCount, CXFA_ResolveNodesData& rnd); - void FilterCondition(CXFA_ResolveNodesData& rnd, CFX_WideString wsCondition); + void FilterCondition(CXFA_ResolveNodesData& rnd, WideString wsCondition); int32_t m_iCurStart; std::unique_ptr<CXFA_NodeHelper> m_pNodeHelper; |