diff options
| author | tsepez <tsepez@chromium.org> | 2016-04-25 11:23:43 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-04-25 11:23:43 -0700 |
| commit | b6853cfe4fd1ee089dfdd0cb09bbc4063532ef82 (patch) | |
| tree | 1404031e845c8b4b09d5a68fd81f09a7d2865d59 /xfa/fxfa/parser/xfa_document_imp.cpp | |
| parent | 2a8a20cde4c8e2294f6868bb097fe450960a709f (diff) | |
| download | pdfium-b6853cfe4fd1ee089dfdd0cb09bbc4063532ef82.tar.xz | |
Pass CFX_*StringCs to FX_HashCode_GETA and _GETW hash functions.
Too many calls were of the form fn(x.c_str(), x.GetLength())
which is an anti-pattern given the StringC classes which tie
these together.
There are a few places where explicit CFX_*StringCs are
constructed, but this can be avoided by changing the args
to these functions in the same manner.
Removed String_ from name of functions since it added
little value. Also removed default argument.
Review URL: https://codereview.chromium.org/1919563002
Diffstat (limited to 'xfa/fxfa/parser/xfa_document_imp.cpp')
| -rw-r--r-- | xfa/fxfa/parser/xfa_document_imp.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/xfa/fxfa/parser/xfa_document_imp.cpp b/xfa/fxfa/parser/xfa_document_imp.cpp index 39bdf2503c..ad3fd70e0d 100644 --- a/xfa/fxfa/parser/xfa_document_imp.cpp +++ b/xfa/fxfa/parser/xfa_document_imp.cpp @@ -94,8 +94,7 @@ CXFA_FFNotify* CXFA_Document::GetNotify() const { return m_pParser->GetNotify(); } CXFA_Object* CXFA_Document::GetXFAObject(const CFX_WideStringC& wsNodeName) { - return GetXFAObject( - FX_HashCode_String_GetW(wsNodeName.c_str(), wsNodeName.GetLength())); + return GetXFAObject(FX_HashCode_GetW(wsNodeName, false)); } CXFA_Object* CXFA_Document::GetXFAObject(uint32_t dwNodeNameHash) { switch (dwNodeNameHash) { @@ -367,8 +366,7 @@ void CXFA_Document::DoProtoMerge() { pNode = sIterator.MoveToNext()) { CFX_WideStringC wsIDVal; if (pNode->TryCData(XFA_ATTRIBUTE_Id, wsIDVal) && !wsIDVal.IsEmpty()) { - mIDMap[FX_HashCode_String_GetW(wsIDVal.c_str(), wsIDVal.GetLength())] = - pNode; + mIDMap[FX_HashCode_GetW(wsIDVal, false)] = pNode; } CFX_WideStringC wsUseVal; if (pNode->TryCData(XFA_ATTRIBUTE_Use, wsUseVal) && !wsUseVal.IsEmpty()) { @@ -426,9 +424,7 @@ void CXFA_Document::DoProtoMerge() { pProtoNode = resoveNodeRS.nodes[0]->AsNode(); } } else if (!wsID.IsEmpty()) { - if (!mIDMap.Lookup( - FX_HashCode_String_GetW(wsID.c_str(), wsID.GetLength()), - pProtoNode)) { + if (!mIDMap.Lookup(FX_HashCode_GetW(wsID, false), pProtoNode)) { continue; } } |