diff options
| author | tsepez <tsepez@chromium.org> | 2016-04-06 06:27:29 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-04-06 06:27:29 -0700 |
| commit | 660956f58af305d72c64bb87c05f694469846df2 (patch) | |
| tree | 5a73d1df3512213bcecb28114f9d51cec86fca0d /xfa/fde/css | |
| parent | 54750b570d32898c8ebd4fa59105bfd3b96043af (diff) | |
| download | pdfium-660956f58af305d72c64bb87c05f694469846df2.tar.xz | |
Rename CFX_WideStringC::raw_str() to c_str()
No functional change intended.
This difference in naming is standing in the way of consolidating
some of the string code between Wide and Byte strings. The Wide
code wants to call raw_str() in exactly the same spots that the
Byte code calls c_str(). This makes sense, because in both places we
get a character type back, and not a uint*_t type. If WideStringC
had a raw_str() method, it would have to return uint32_t or similar.
R=dsinclair@chromium.org
Review URL: https://codereview.chromium.org/1863593004
Diffstat (limited to 'xfa/fde/css')
| -rw-r--r-- | xfa/fde/css/fde_csscache.cpp | 10 | ||||
| -rw-r--r-- | xfa/fde/css/fde_cssstyleselector.cpp | 6 |
2 files changed, 7 insertions, 9 deletions
diff --git a/xfa/fde/css/fde_csscache.cpp b/xfa/fde/css/fde_csscache.cpp index d8fc1a1b19..c68d4ddb49 100644 --- a/xfa/fde/css/fde_csscache.cpp +++ b/xfa/fde/css/fde_csscache.cpp @@ -107,23 +107,21 @@ FDE_CSSTagCache::FDE_CSSTagCache(FDE_CSSTagCache* parent, dwClassHashs(1) { FXSYS_assert(pTag != NULL); CFX_WideStringC wsValue, wsName = pTag->GetTagName(); - dwTagHash = - FX_HashCode_String_GetW(wsName.raw_str(), wsName.GetLength(), TRUE); + dwTagHash = FX_HashCode_String_GetW(wsName.c_str(), wsName.GetLength(), TRUE); FX_POSITION pos = pTag->GetFirstAttribute(); while (pos != NULL) { pTag->GetNextAttribute(pos, wsName, wsValue); uint32_t dwNameHash = - FX_HashCode_String_GetW(wsName.raw_str(), wsName.GetLength(), TRUE); + FX_HashCode_String_GetW(wsName.c_str(), wsName.GetLength(), TRUE); static const uint32_t s_dwIDHash = FX_HashCode_String_GetW(L"id", 2, TRUE); static const uint32_t s_dwClassHash = FX_HashCode_String_GetW(L"class", 5, TRUE); if (dwNameHash == s_dwClassHash) { uint32_t dwHash = - FX_HashCode_String_GetW(wsValue.raw_str(), wsValue.GetLength()); + FX_HashCode_String_GetW(wsValue.c_str(), wsValue.GetLength()); dwClassHashs.Add(dwHash); } else if (dwNameHash == s_dwIDHash) { - dwIDHash = - FX_HashCode_String_GetW(wsValue.raw_str(), wsValue.GetLength()); + dwIDHash = FX_HashCode_String_GetW(wsValue.c_str(), wsValue.GetLength()); } } } diff --git a/xfa/fde/css/fde_cssstyleselector.cpp b/xfa/fde/css/fde_cssstyleselector.cpp index 1a27a7e5c9..f1e73dd5d1 100644 --- a/xfa/fde/css/fde_cssstyleselector.cpp +++ b/xfa/fde/css/fde_cssstyleselector.cpp @@ -437,7 +437,7 @@ void CFDE_CSSStyleSelector::ComputeStyle( do { pTag->GetNextAttribute(pos, wsAttri, wsValue); dwAttriHash = - FX_HashCode_String_GetW(wsAttri.raw_str(), wsAttri.GetLength(), TRUE); + FX_HashCode_String_GetW(wsAttri.c_str(), wsAttri.GetLength(), TRUE); static const uint32_t s_dwStyleHash = FX_HashCode_String_GetW(L"style", 5, TRUE); static const uint32_t s_dwAlignHash = @@ -446,7 +446,7 @@ void CFDE_CSSStyleSelector::ComputeStyle( if (pDecl == NULL) { pDecl = FXTARGET_NewWith(m_pInlineStyleStore) CFDE_CSSDeclaration; } - AppendInlineStyle(pDecl, wsValue.raw_str(), wsValue.GetLength()); + AppendInlineStyle(pDecl, wsValue.c_str(), wsValue.GetLength()); } else if (dwAttriHash == s_dwAlignHash) { if (pDecl == NULL) { pDecl = FXTARGET_NewWith(m_pInlineStyleStore) CFDE_CSSDeclaration; @@ -455,7 +455,7 @@ void CFDE_CSSStyleSelector::ComputeStyle( args.pStringCache = NULL; args.pStaticStore = m_pInlineStyleStore; args.pProperty = FDE_GetCSSPropertyByEnum(FDE_CSSPROPERTY_TextAlign); - pDecl->AddProperty(&args, wsValue.raw_str(), wsValue.GetLength()); + pDecl->AddProperty(&args, wsValue.c_str(), wsValue.GetLength()); } } while (pos != NULL); if (pDecl != NULL) { |