summaryrefslogtreecommitdiff
path: root/xfa/fxfa/parser/cscript_layoutpseudomodel.cpp
diff options
context:
space:
mode:
authorRyan Harrison <rharrison@chromium.org>2017-09-18 14:23:18 -0400
committerChromium commit bot <commit-bot@chromium.org>2017-09-18 18:40:16 +0000
commit275e260a6cd4a8e506ba974feb85ebcd926c1739 (patch)
tree2029b9158ec044764ceff122fe5fb5d0a3f123d1 /xfa/fxfa/parser/cscript_layoutpseudomodel.cpp
parent450fbeaaabf1ab340c1018de2e58f1950657517e (diff)
downloadpdfium-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/cscript_layoutpseudomodel.cpp')
-rw-r--r--xfa/fxfa/parser/cscript_layoutpseudomodel.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/xfa/fxfa/parser/cscript_layoutpseudomodel.cpp b/xfa/fxfa/parser/cscript_layoutpseudomodel.cpp
index 46db2ca78c..e35a3b8aa0 100644
--- a/xfa/fxfa/parser/cscript_layoutpseudomodel.cpp
+++ b/xfa/fxfa/parser/cscript_layoutpseudomodel.cpp
@@ -28,7 +28,7 @@ CScript_LayoutPseudoModel::CScript_LayoutPseudoModel(CXFA_Document* pDocument)
: CXFA_Object(pDocument,
XFA_ObjectType::Object,
XFA_Element::LayoutPseudoModel,
- CFX_WideStringC(L"layoutPseudoModel")) {}
+ WideStringView(L"layoutPseudoModel")) {}
CScript_LayoutPseudoModel::~CScript_LayoutPseudoModel() {}
@@ -73,11 +73,11 @@ void CScript_LayoutPseudoModel::HWXY(CFXJSE_Arguments* pArguments,
if (!pNode)
return;
- CFX_WideString wsUnit(L"pt");
+ WideString wsUnit(L"pt");
if (iLength >= 2) {
- CFX_ByteString bsUnit = pArguments->GetUTF8String(1);
+ ByteString bsUnit = pArguments->GetUTF8String(1);
if (!bsUnit.IsEmpty())
- wsUnit = CFX_WideString::FromUTF8(bsUnit.AsStringC());
+ wsUnit = WideString::FromUTF8(bsUnit.AsStringView());
}
int32_t iIndex = iLength >= 3 ? pArguments->GetInt32(2) : 0;
@@ -116,8 +116,8 @@ void CScript_LayoutPseudoModel::HWXY(CFXJSE_Arguments* pArguments,
measure.Set(rtRect.top, XFA_UNIT_Pt);
break;
}
- float fValue =
- measure.ToUnit(CXFA_Measurement::GetUnitFromString(wsUnit.AsStringC()));
+ float fValue = measure.ToUnit(
+ CXFA_Measurement::GetUnitFromString(wsUnit.AsStringView()));
fValue = FXSYS_round(fValue * 1000) / 1000.0f;
pValue->SetFloat(fValue);
}
@@ -203,7 +203,7 @@ void CScript_LayoutPseudoModel::Page(CFXJSE_Arguments* pArguments) {
std::vector<CXFA_Node*> CScript_LayoutPseudoModel::GetObjArray(
CXFA_LayoutProcessor* pDocLayout,
int32_t iPageNo,
- const CFX_WideString& wsType,
+ const WideString& wsType,
bool bOnPageArea) {
CXFA_ContainerLayoutItem* pLayoutPage = pDocLayout->GetPage(iPageNo);
if (!pLayoutPage)
@@ -338,14 +338,14 @@ void CScript_LayoutPseudoModel::PageContent(CFXJSE_Arguments* pArguments) {
return;
}
int32_t iIndex = 0;
- CFX_WideString wsType;
+ WideString wsType;
bool bOnPageArea = false;
if (iLength >= 1)
iIndex = pArguments->GetInt32(0);
if (iLength >= 2) {
- CFX_ByteString bsType = pArguments->GetUTF8String(1);
- wsType = CFX_WideString::FromUTF8(bsType.AsStringC());
+ ByteString bsType = pArguments->GetUTF8String(1);
+ wsType = WideString::FromUTF8(bsType.AsStringView());
}
if (iLength >= 3)
bOnPageArea = pArguments->GetInt32(2) == 0 ? false : true;