Fix enum value style in CFX_Value.
Bug: pdfium:547
Change-Id: I4282f8451fd73d2c57cc20d256d1d75f689efa29
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/70254
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
diff --git a/fxjs/cfx_globaldata.cpp b/fxjs/cfx_globaldata.cpp
index 1cc1247..3ad8294 100644
--- a/fxjs/cfx_globaldata.cpp
+++ b/fxjs/cfx_globaldata.cpp
@@ -52,31 +52,31 @@
const CFX_KeyValue& pData,
CFX_BinaryBuf* result) {
switch (pData.nType) {
- case CFX_Value::DataType::NUMBER: {
+ case CFX_Value::DataType::kNumber: {
MakeNameTypeString(name, pData.nType, result);
double dData = pData.dData;
result->AppendBlock(&dData, sizeof(double));
return true;
}
- case CFX_Value::DataType::BOOLEAN: {
+ case CFX_Value::DataType::kBoolean: {
MakeNameTypeString(name, pData.nType, result);
uint16_t wData = static_cast<uint16_t>(pData.bData);
result->AppendBlock(&wData, sizeof(uint16_t));
return true;
}
- case CFX_Value::DataType::STRING: {
+ case CFX_Value::DataType::kString: {
MakeNameTypeString(name, pData.nType, result);
uint32_t dwDataLen = (uint32_t)pData.sData.GetLength();
result->AppendBlock(&dwDataLen, sizeof(uint32_t));
result->AppendString(pData.sData);
return true;
}
- case CFX_Value::DataType::NULLOBJ: {
+ case CFX_Value::DataType::kNull: {
MakeNameTypeString(name, pData.nType, result);
return true;
}
// Arrays don't get persisted per JS spec page 484.
- case CFX_Value::DataType::OBJECT:
+ case CFX_Value::DataType::kObject:
default:
break;
}
@@ -134,13 +134,13 @@
CFX_GlobalData::Element* pData = GetGlobalVariable(sPropName);
if (pData) {
- pData->data.nType = CFX_Value::DataType::NUMBER;
+ pData->data.nType = CFX_Value::DataType::kNumber;
pData->data.dData = dData;
return;
}
auto pNewData = std::make_unique<CFX_GlobalData::Element>();
pNewData->data.sKey = std::move(sPropName);
- pNewData->data.nType = CFX_Value::DataType::NUMBER;
+ pNewData->data.nType = CFX_Value::DataType::kNumber;
pNewData->data.dData = dData;
m_arrayGlobalData.push_back(std::move(pNewData));
}
@@ -152,13 +152,13 @@
CFX_GlobalData::Element* pData = GetGlobalVariable(sPropName);
if (pData) {
- pData->data.nType = CFX_Value::DataType::BOOLEAN;
+ pData->data.nType = CFX_Value::DataType::kBoolean;
pData->data.bData = bData;
return;
}
auto pNewData = std::make_unique<CFX_GlobalData::Element>();
pNewData->data.sKey = std::move(sPropName);
- pNewData->data.nType = CFX_Value::DataType::BOOLEAN;
+ pNewData->data.nType = CFX_Value::DataType::kBoolean;
pNewData->data.bData = bData;
m_arrayGlobalData.push_back(std::move(pNewData));
}
@@ -170,13 +170,13 @@
CFX_GlobalData::Element* pData = GetGlobalVariable(sPropName);
if (pData) {
- pData->data.nType = CFX_Value::DataType::STRING;
+ pData->data.nType = CFX_Value::DataType::kString;
pData->data.sData = sData;
return;
}
auto pNewData = std::make_unique<CFX_GlobalData::Element>();
pNewData->data.sKey = std::move(sPropName);
- pNewData->data.nType = CFX_Value::DataType::STRING;
+ pNewData->data.nType = CFX_Value::DataType::kString;
pNewData->data.sData = sData;
m_arrayGlobalData.push_back(std::move(pNewData));
}
@@ -189,13 +189,13 @@
CFX_GlobalData::Element* pData = GetGlobalVariable(sPropName);
if (pData) {
- pData->data.nType = CFX_Value::DataType::OBJECT;
+ pData->data.nType = CFX_Value::DataType::kObject;
pData->data.objData = std::move(array);
return;
}
auto pNewData = std::make_unique<CFX_GlobalData::Element>();
pNewData->data.sKey = std::move(sPropName);
- pNewData->data.nType = CFX_Value::DataType::OBJECT;
+ pNewData->data.nType = CFX_Value::DataType::kObject;
pNewData->data.objData = std::move(array);
m_arrayGlobalData.push_back(std::move(pNewData));
}
@@ -206,12 +206,12 @@
CFX_GlobalData::Element* pData = GetGlobalVariable(sPropName);
if (pData) {
- pData->data.nType = CFX_Value::DataType::NULLOBJ;
+ pData->data.nType = CFX_Value::DataType::kNull;
return;
}
auto pNewData = std::make_unique<CFX_GlobalData::Element>();
pNewData->data.sKey = std::move(sPropName);
- pNewData->data.nType = CFX_Value::DataType::NULLOBJ;
+ pNewData->data.nType = CFX_Value::DataType::kNull;
m_arrayGlobalData.push_back(std::move(pNewData));
}
@@ -311,7 +311,7 @@
p += sizeof(uint16_t);
switch (wDataType) {
- case CFX_Value::DataType::NUMBER: {
+ case CFX_Value::DataType::kNumber: {
double dData = 0;
switch (wVersion) {
case 1: {
@@ -327,13 +327,13 @@
SetGlobalVariableNumber(sEntry, dData);
SetGlobalVariablePersistent(sEntry, true);
} break;
- case CFX_Value::DataType::BOOLEAN: {
+ case CFX_Value::DataType::kBoolean: {
uint16_t wData = *((uint16_t*)p);
p += sizeof(uint16_t);
SetGlobalVariableBoolean(sEntry, (bool)(wData == 1));
SetGlobalVariablePersistent(sEntry, true);
} break;
- case CFX_Value::DataType::STRING: {
+ case CFX_Value::DataType::kString: {
uint32_t dwLength = *((uint32_t*)p);
p += sizeof(uint32_t);
if (p + dwLength > buffer.end())
@@ -343,11 +343,11 @@
SetGlobalVariablePersistent(sEntry, true);
p += sizeof(char) * dwLength;
} break;
- case CFX_Value::DataType::NULLOBJ: {
+ case CFX_Value::DataType::kNull: {
SetGlobalVariableNull(sEntry);
SetGlobalVariablePersistent(sEntry, true);
} break;
- case CFX_Value::DataType::OBJECT:
+ case CFX_Value::DataType::kObject:
default:
// Arrays aren't allowed in these buffers, nor are unrecoginzed tags.
return false;
diff --git a/fxjs/cfx_globaldata_unittest.cpp b/fxjs/cfx_globaldata_unittest.cpp
index b0e4253..9a204e9 100644
--- a/fxjs/cfx_globaldata_unittest.cpp
+++ b/fxjs/cfx_globaldata_unittest.cpp
@@ -73,25 +73,25 @@
auto* element = pInstance->GetAt(0);
ASSERT_TRUE(element);
EXPECT_EQ("double", element->data.sKey);
- EXPECT_EQ(CFX_Value::DataType::NUMBER, element->data.nType);
+ EXPECT_EQ(CFX_Value::DataType::kNumber, element->data.nType);
EXPECT_EQ(2.0, element->data.dData);
element = pInstance->GetAt(1);
ASSERT_TRUE(element);
EXPECT_EQ("string", element->data.sKey);
- EXPECT_EQ(CFX_Value::DataType::STRING, element->data.nType);
+ EXPECT_EQ(CFX_Value::DataType::kString, element->data.nType);
EXPECT_EQ("clams", element->data.sData);
element = pInstance->GetAt(2);
ASSERT_TRUE(element);
EXPECT_EQ("boolean", element->data.sKey);
- EXPECT_EQ(CFX_Value::DataType::BOOLEAN, element->data.nType);
+ EXPECT_EQ(CFX_Value::DataType::kBoolean, element->data.nType);
EXPECT_EQ(true, element->data.bData);
element = pInstance->GetAt(3);
ASSERT_TRUE(element);
EXPECT_EQ("null", element->data.sKey);
- EXPECT_EQ(CFX_Value::DataType::NULLOBJ, element->data.nType);
+ EXPECT_EQ(CFX_Value::DataType::kNull, element->data.nType);
// Arrays don't get persisted.
element = pInstance->GetAt(4);
@@ -115,25 +115,25 @@
auto* element = pInstance->GetAt(0);
ASSERT_TRUE(element);
EXPECT_EQ("double", element->data.sKey);
- EXPECT_EQ(CFX_Value::DataType::NUMBER, element->data.nType);
+ EXPECT_EQ(CFX_Value::DataType::kNumber, element->data.nType);
EXPECT_EQ(2.0, element->data.dData);
element = pInstance->GetAt(1);
ASSERT_TRUE(element);
EXPECT_EQ("string", element->data.sKey);
- EXPECT_EQ(CFX_Value::DataType::STRING, element->data.nType);
+ EXPECT_EQ(CFX_Value::DataType::kString, element->data.nType);
EXPECT_EQ("clams", element->data.sData);
element = pInstance->GetAt(2);
ASSERT_TRUE(element);
EXPECT_EQ("boolean", element->data.sKey);
- EXPECT_EQ(CFX_Value::DataType::BOOLEAN, element->data.nType);
+ EXPECT_EQ(CFX_Value::DataType::kBoolean, element->data.nType);
EXPECT_EQ(true, element->data.bData);
element = pInstance->GetAt(3);
ASSERT_TRUE(element);
EXPECT_EQ("null", element->data.sKey);
- EXPECT_EQ(CFX_Value::DataType::NULLOBJ, element->data.nType);
+ EXPECT_EQ(CFX_Value::DataType::kNull, element->data.nType);
ASSERT_TRUE(pInstance->Release());
}
diff --git a/fxjs/cfx_keyvalue.h b/fxjs/cfx_keyvalue.h
index b66dc12..3f6dd42 100644
--- a/fxjs/cfx_keyvalue.h
+++ b/fxjs/cfx_keyvalue.h
@@ -17,17 +17,17 @@
class CFX_Value {
public:
enum class DataType : uint8_t {
- NUMBER = 0,
- BOOLEAN,
- STRING,
- OBJECT,
- NULLOBJ
+ kNumber = 0,
+ kBoolean,
+ kString,
+ kObject,
+ kNull
};
CFX_Value();
~CFX_Value();
- DataType nType = DataType::NULLOBJ;
+ DataType nType = DataType::kNull;
bool bData;
double dData;
ByteString sData;
diff --git a/fxjs/cjs_global.cpp b/fxjs/cjs_global.cpp
index ed50c93..85b8b8f 100644
--- a/fxjs/cjs_global.cpp
+++ b/fxjs/cjs_global.cpp
@@ -237,17 +237,17 @@
return CJS_Result::Success();
switch (pData->nType) {
- case CFX_Value::DataType::NUMBER:
+ case CFX_Value::DataType::kNumber:
return CJS_Result::Success(pRuntime->NewNumber(pData->dData));
- case CFX_Value::DataType::BOOLEAN:
+ case CFX_Value::DataType::kBoolean:
return CJS_Result::Success(pRuntime->NewBoolean(pData->bData));
- case CFX_Value::DataType::STRING:
+ case CFX_Value::DataType::kString:
return CJS_Result::Success(pRuntime->NewString(
WideString::FromDefANSI(pData->sData.AsStringView()).AsStringView()));
- case CFX_Value::DataType::OBJECT:
+ case CFX_Value::DataType::kObject:
return CJS_Result::Success(
v8::Local<v8::Object>::New(pRuntime->GetIsolate(), pData->pData));
- case CFX_Value::DataType::NULLOBJ:
+ case CFX_Value::DataType::kNull:
return CJS_Result::Success(pRuntime->NewNull());
default:
break;
@@ -260,26 +260,26 @@
v8::Local<v8::Value> vp) {
ByteString sPropName = WideString(propname).ToDefANSI();
if (vp->IsNumber()) {
- return SetGlobalVariables(sPropName, CFX_Value::DataType::NUMBER,
+ return SetGlobalVariables(sPropName, CFX_Value::DataType::kNumber,
pRuntime->ToDouble(vp), false, ByteString(),
v8::Local<v8::Object>(), false);
}
if (vp->IsBoolean()) {
- return SetGlobalVariables(sPropName, CFX_Value::DataType::BOOLEAN, 0,
+ return SetGlobalVariables(sPropName, CFX_Value::DataType::kBoolean, 0,
pRuntime->ToBoolean(vp), ByteString(),
v8::Local<v8::Object>(), false);
}
if (vp->IsString()) {
- return SetGlobalVariables(sPropName, CFX_Value::DataType::STRING, 0, false,
+ return SetGlobalVariables(sPropName, CFX_Value::DataType::kString, 0, false,
pRuntime->ToWideString(vp).ToDefANSI(),
v8::Local<v8::Object>(), false);
}
if (vp->IsObject()) {
- return SetGlobalVariables(sPropName, CFX_Value::DataType::OBJECT, 0, false,
+ return SetGlobalVariables(sPropName, CFX_Value::DataType::kObject, 0, false,
ByteString(), pRuntime->ToObject(vp), false);
}
if (vp->IsNull()) {
- return SetGlobalVariables(sPropName, CFX_Value::DataType::NULLOBJ, 0, false,
+ return SetGlobalVariables(sPropName, CFX_Value::DataType::kNull, 0, false,
ByteString(), v8::Local<v8::Object>(), false);
}
if (vp->IsUndefined()) {
@@ -311,24 +311,24 @@
for (int i = 0, sz = m_pGlobalData->GetSize(); i < sz; i++) {
CFX_GlobalData::Element* pData = m_pGlobalData->GetAt(i);
switch (pData->data.nType) {
- case CFX_Value::DataType::NUMBER:
- SetGlobalVariables(pData->data.sKey, CFX_Value::DataType::NUMBER,
+ case CFX_Value::DataType::kNumber:
+ SetGlobalVariables(pData->data.sKey, CFX_Value::DataType::kNumber,
pData->data.dData, false, ByteString(),
v8::Local<v8::Object>(), pData->bPersistent == 1);
pRuntime->PutObjectProperty(ToV8Object(),
pData->data.sKey.AsStringView(),
pRuntime->NewNumber(pData->data.dData));
break;
- case CFX_Value::DataType::BOOLEAN:
- SetGlobalVariables(pData->data.sKey, CFX_Value::DataType::BOOLEAN, 0,
+ case CFX_Value::DataType::kBoolean:
+ SetGlobalVariables(pData->data.sKey, CFX_Value::DataType::kBoolean, 0,
pData->data.bData == 1, ByteString(),
v8::Local<v8::Object>(), pData->bPersistent == 1);
pRuntime->PutObjectProperty(
ToV8Object(), pData->data.sKey.AsStringView(),
pRuntime->NewBoolean(pData->data.bData == 1));
break;
- case CFX_Value::DataType::STRING:
- SetGlobalVariables(pData->data.sKey, CFX_Value::DataType::STRING, 0,
+ case CFX_Value::DataType::kString:
+ SetGlobalVariables(pData->data.sKey, CFX_Value::DataType::kString, 0,
false, pData->data.sData, v8::Local<v8::Object>(),
pData->bPersistent == 1);
pRuntime->PutObjectProperty(
@@ -337,19 +337,19 @@
WideString::FromUTF8(pData->data.sData.AsStringView())
.AsStringView()));
break;
- case CFX_Value::DataType::OBJECT: {
+ case CFX_Value::DataType::kObject: {
v8::Local<v8::Object> pObj = pRuntime->NewObject();
if (!pObj.IsEmpty()) {
PutObjectProperty(pObj, &pData->data);
- SetGlobalVariables(pData->data.sKey, CFX_Value::DataType::OBJECT, 0,
+ SetGlobalVariables(pData->data.sKey, CFX_Value::DataType::kObject, 0,
false, ByteString(), pObj,
pData->bPersistent == 1);
pRuntime->PutObjectProperty(ToV8Object(),
pData->data.sKey.AsStringView(), pObj);
}
} break;
- case CFX_Value::DataType::NULLOBJ:
- SetGlobalVariables(pData->data.sKey, CFX_Value::DataType::NULLOBJ, 0,
+ case CFX_Value::DataType::kNull:
+ SetGlobalVariables(pData->data.sKey, CFX_Value::DataType::kNull, 0,
false, ByteString(), v8::Local<v8::Object>(),
pData->bPersistent == 1);
pRuntime->PutObjectProperty(
@@ -368,19 +368,19 @@
continue;
}
switch (pData->nType) {
- case CFX_Value::DataType::NUMBER:
+ case CFX_Value::DataType::kNumber:
m_pGlobalData->SetGlobalVariableNumber(name, pData->dData);
m_pGlobalData->SetGlobalVariablePersistent(name, pData->bPersistent);
break;
- case CFX_Value::DataType::BOOLEAN:
+ case CFX_Value::DataType::kBoolean:
m_pGlobalData->SetGlobalVariableBoolean(name, pData->bData);
m_pGlobalData->SetGlobalVariablePersistent(name, pData->bPersistent);
break;
- case CFX_Value::DataType::STRING:
+ case CFX_Value::DataType::kString:
m_pGlobalData->SetGlobalVariableString(name, pData->sData);
m_pGlobalData->SetGlobalVariablePersistent(name, pData->bPersistent);
break;
- case CFX_Value::DataType::OBJECT: {
+ case CFX_Value::DataType::kObject: {
std::vector<std::unique_ptr<CFX_KeyValue>> array;
v8::Local<v8::Object> obj =
v8::Local<v8::Object>::New(GetIsolate(), pData->pData);
@@ -388,7 +388,7 @@
m_pGlobalData->SetGlobalVariableObject(name, std::move(array));
m_pGlobalData->SetGlobalVariablePersistent(name, pData->bPersistent);
} break;
- case CFX_Value::DataType::NULLOBJ:
+ case CFX_Value::DataType::kNull:
m_pGlobalData->SetGlobalVariableNull(name);
m_pGlobalData->SetGlobalVariablePersistent(name, pData->bPersistent);
break;
@@ -407,7 +407,7 @@
pRuntime->GetObjectProperty(pObj, sKey.AsStringView());
if (v->IsNumber()) {
auto pObjElement = std::make_unique<CFX_KeyValue>();
- pObjElement->nType = CFX_Value::DataType::NUMBER;
+ pObjElement->nType = CFX_Value::DataType::kNumber;
pObjElement->sKey = sKey;
pObjElement->dData = pRuntime->ToDouble(v);
pArray->push_back(std::move(pObjElement));
@@ -415,7 +415,7 @@
}
if (v->IsBoolean()) {
auto pObjElement = std::make_unique<CFX_KeyValue>();
- pObjElement->nType = CFX_Value::DataType::BOOLEAN;
+ pObjElement->nType = CFX_Value::DataType::kBoolean;
pObjElement->sKey = sKey;
pObjElement->dData = pRuntime->ToBoolean(v);
pArray->push_back(std::move(pObjElement));
@@ -424,7 +424,7 @@
if (v->IsString()) {
ByteString sValue = pRuntime->ToWideString(v).ToDefANSI();
auto pObjElement = std::make_unique<CFX_KeyValue>();
- pObjElement->nType = CFX_Value::DataType::STRING;
+ pObjElement->nType = CFX_Value::DataType::kString;
pObjElement->sKey = sKey;
pObjElement->sData = sValue;
pArray->push_back(std::move(pObjElement));
@@ -432,7 +432,7 @@
}
if (v->IsObject()) {
auto pObjElement = std::make_unique<CFX_KeyValue>();
- pObjElement->nType = CFX_Value::DataType::OBJECT;
+ pObjElement->nType = CFX_Value::DataType::kObject;
pObjElement->sKey = sKey;
ObjectToArray(pRuntime, pRuntime->ToObject(v), &pObjElement->objData);
pArray->push_back(std::move(pObjElement));
@@ -440,7 +440,7 @@
}
if (v->IsNull()) {
auto pObjElement = std::make_unique<CFX_KeyValue>();
- pObjElement->nType = CFX_Value::DataType::NULLOBJ;
+ pObjElement->nType = CFX_Value::DataType::kNull;
pObjElement->sKey = sKey;
pArray->push_back(std::move(pObjElement));
}
@@ -456,22 +456,22 @@
for (size_t i = 0; i < pData->objData.size(); ++i) {
CFX_KeyValue* pObjData = pData->objData.at(i).get();
switch (pObjData->nType) {
- case CFX_Value::DataType::NUMBER:
+ case CFX_Value::DataType::kNumber:
pRuntime->PutObjectProperty(pObj, pObjData->sKey.AsStringView(),
pRuntime->NewNumber(pObjData->dData));
break;
- case CFX_Value::DataType::BOOLEAN:
+ case CFX_Value::DataType::kBoolean:
pRuntime->PutObjectProperty(pObj, pObjData->sKey.AsStringView(),
pRuntime->NewBoolean(pObjData->bData == 1));
break;
- case CFX_Value::DataType::STRING:
+ case CFX_Value::DataType::kString:
pRuntime->PutObjectProperty(
pObj, pObjData->sKey.AsStringView(),
pRuntime->NewString(
WideString::FromUTF8(pObjData->sData.AsStringView())
.AsStringView()));
break;
- case CFX_Value::DataType::OBJECT: {
+ case CFX_Value::DataType::kObject: {
v8::Local<v8::Object> pNewObj = pRuntime->NewObject();
if (!pNewObj.IsEmpty()) {
PutObjectProperty(pNewObj, pObjData);
@@ -479,7 +479,7 @@
pNewObj);
}
} break;
- case CFX_Value::DataType::NULLOBJ:
+ case CFX_Value::DataType::kNull:
pRuntime->PutObjectProperty(pObj, pObjData->sKey.AsStringView(),
pRuntime->NewNull());
break;
@@ -512,19 +512,19 @@
}
pTemp->bDeleted = false;
switch (nType) {
- case CFX_Value::DataType::NUMBER:
+ case CFX_Value::DataType::kNumber:
pTemp->dData = dData;
break;
- case CFX_Value::DataType::BOOLEAN:
+ case CFX_Value::DataType::kBoolean:
pTemp->bData = bData;
break;
- case CFX_Value::DataType::STRING:
+ case CFX_Value::DataType::kString:
pTemp->sData = sData;
break;
- case CFX_Value::DataType::OBJECT:
+ case CFX_Value::DataType::kObject:
pTemp->pData.Reset(pData->GetIsolate(), pData);
break;
- case CFX_Value::DataType::NULLOBJ:
+ case CFX_Value::DataType::kNull:
break;
default:
return CJS_Result::Failure(JSMessage::kObjectTypeError);
@@ -534,28 +534,28 @@
auto pNewData = std::make_unique<JSGlobalData>();
switch (nType) {
- case CFX_Value::DataType::NUMBER:
- pNewData->nType = CFX_Value::DataType::NUMBER;
+ case CFX_Value::DataType::kNumber:
+ pNewData->nType = CFX_Value::DataType::kNumber;
pNewData->dData = dData;
pNewData->bPersistent = bDefaultPersistent;
break;
- case CFX_Value::DataType::BOOLEAN:
- pNewData->nType = CFX_Value::DataType::BOOLEAN;
+ case CFX_Value::DataType::kBoolean:
+ pNewData->nType = CFX_Value::DataType::kBoolean;
pNewData->bData = bData;
pNewData->bPersistent = bDefaultPersistent;
break;
- case CFX_Value::DataType::STRING:
- pNewData->nType = CFX_Value::DataType::STRING;
+ case CFX_Value::DataType::kString:
+ pNewData->nType = CFX_Value::DataType::kString;
pNewData->sData = sData;
pNewData->bPersistent = bDefaultPersistent;
break;
- case CFX_Value::DataType::OBJECT:
- pNewData->nType = CFX_Value::DataType::OBJECT;
+ case CFX_Value::DataType::kObject:
+ pNewData->nType = CFX_Value::DataType::kObject;
pNewData->pData.Reset(pData->GetIsolate(), pData);
pNewData->bPersistent = bDefaultPersistent;
break;
- case CFX_Value::DataType::NULLOBJ:
- pNewData->nType = CFX_Value::DataType::NULLOBJ;
+ case CFX_Value::DataType::kNull:
+ pNewData->nType = CFX_Value::DataType::kNull;
pNewData->bPersistent = bDefaultPersistent;
break;
default:
