From 660956f58af305d72c64bb87c05f694469846df2 Mon Sep 17 00:00:00 2001 From: tsepez Date: Wed, 6 Apr 2016 06:27:29 -0700 Subject: 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 --- xfa/fde/css/fde_cssstyleselector.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'xfa/fde/css/fde_cssstyleselector.cpp') 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) { -- cgit v1.2.3