diff options
| author | dsinclair <dsinclair@chromium.org> | 2016-05-18 13:16:12 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-05-18 13:16:12 -0700 |
| commit | cbfef5772c52fbd3378905a61fc9432da1515433 (patch) | |
| tree | be4c25e41d2467609612232a92e598ccd9baa7eb /xfa/fxfa/parser/xfa_script_resolveprocessor.cpp | |
| parent | 1763f62972a3ebf080f645899a8de79b00dbfb23 (diff) | |
| download | pdfium-cbfef5772c52fbd3378905a61fc9432da1515433.tar.xz | |
Cleanup XFA_HASHCODE usage.
This CL cleans up several uses of XFA_HASHCODE. The defines have been converted
into an enum.
For the SavePackage call the type is now used as the param instead of a string.
The callers pass in the correct type instead of doing an internal conversion.
The GetXFAObject accepting a string was removed as it was unused. The other
variant was changed to accept the XFA_HashCode type instead of uint32_t.
GetPackageData was removed as it is unused.
Review-Url: https://codereview.chromium.org/1989313002
Diffstat (limited to 'xfa/fxfa/parser/xfa_script_resolveprocessor.cpp')
| -rw-r--r-- | xfa/fxfa/parser/xfa_script_resolveprocessor.cpp | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/xfa/fxfa/parser/xfa_script_resolveprocessor.cpp b/xfa/fxfa/parser/xfa_script_resolveprocessor.cpp index fa21a50b3e..138ac66165 100644 --- a/xfa/fxfa/parser/xfa_script_resolveprocessor.cpp +++ b/xfa/fxfa/parser/xfa_script_resolveprocessor.cpp @@ -49,7 +49,7 @@ int32_t CXFA_ResolveProcessor::XFA_ResolveNodes(CXFA_ResolveNodesData& rnd) { return XFA_ResolveNodes_NumberSign(rnd); case '*': return XFA_ResolveNodes_Asterisk(rnd); - // TODO(dsinclair@chromium.org): We could probably remove this. + // TODO(dsinclair): We could probably remove this. case '.': return XFA_ResolveNodes_AnyChild(rnd); default: @@ -119,8 +119,8 @@ int32_t CXFA_ResolveProcessor::XFA_ResolveNodes_Dollar( if (rnd.m_nLevel > 0) { return -1; } - uint32_t dwNameHash = FX_HashCode_GetW( - CFX_WideStringC(wsName.c_str() + 1, iNameLen - 1), false); + XFA_HashCode dwNameHash = static_cast<XFA_HashCode>(FX_HashCode_GetW( + CFX_WideStringC(wsName.c_str() + 1, iNameLen - 1), false)); if (dwNameHash == XFA_HASHCODE_Xfa) { nodes.Add(rnd.m_pSC->GetDocument()->GetRoot()); } else { @@ -148,7 +148,8 @@ int32_t CXFA_ResolveProcessor::XFA_ResolveNodes_Excalmatory( rndFind.m_pSC = rnd.m_pSC; rndFind.m_CurNode = datasets; rndFind.m_wsName = rnd.m_wsName.Right(rnd.m_wsName.GetLength() - 1); - rndFind.m_uHashName = FX_HashCode_GetW(rndFind.m_wsName.AsStringC(), false); + rndFind.m_uHashName = static_cast<XFA_HashCode>( + FX_HashCode_GetW(rndFind.m_wsName.AsStringC(), false)); rndFind.m_nLevel = rnd.m_nLevel + 1; rndFind.m_dwStyles = XFA_RESOLVENODE_Children; rndFind.m_wsCondition = rnd.m_wsCondition; @@ -174,7 +175,8 @@ int32_t CXFA_ResolveProcessor::XFA_ResolveNodes_NumberSign( rndFind.m_dwStyles |= XFA_RESOLVENODE_TagName; rndFind.m_dwStyles &= ~XFA_RESOLVENODE_Attributes; rndFind.m_wsName = wsName; - rndFind.m_uHashName = FX_HashCode_GetW(rndFind.m_wsName.AsStringC(), false); + rndFind.m_uHashName = static_cast<XFA_HashCode>( + FX_HashCode_GetW(rndFind.m_wsName.AsStringC(), false)); rndFind.m_wsCondition = wsCondition; rndFind.m_CurNode = curNode; XFA_ResolveNodes_Normal(rndFind); @@ -215,7 +217,7 @@ int32_t CXFA_ResolveProcessor::XFA_ResolveNodes_Normal( int32_t nNum = nodes.GetSize(); uint32_t dwStyles = rnd.m_dwStyles; CFX_WideString& wsName = rnd.m_wsName; - uint32_t uNameHash = rnd.m_uHashName; + XFA_HashCode uNameHash = rnd.m_uHashName; CFX_WideString& wsCondition = rnd.m_wsCondition; CXFA_ResolveNodesData rndFind; rndFind.m_wsName = rnd.m_wsName; @@ -612,7 +614,8 @@ int32_t CXFA_ResolveProcessor::XFA_ResolveNodes_GetFilter( wsCondition.ReleaseBuffer(nConditionCount); wsCondition.TrimLeft(); wsCondition.TrimRight(); - rnd.m_uHashName = FX_HashCode_GetW(wsName.AsStringC(), false); + rnd.m_uHashName = + static_cast<XFA_HashCode>(FX_HashCode_GetW(wsName.AsStringC(), false)); return nStart; } void CXFA_ResolveProcessor::XFA_ResolveNode_ConditionArray( |