Rename FXJSE_CLASS_DESCRIPTOR constants. Make their names consistent, in the kFoo format. Change-Id: I25b399a255d5b0b2d961ec7299382e80ba984471 Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/90950 Auto-Submit: Lei Zhang <thestig@chromium.org> Reviewed-by: Tom Sepez <tsepez@chromium.org> Commit-Queue: Tom Sepez <tsepez@chromium.org>
diff --git a/fxjs/README b/fxjs/README index 852a170..59b55a2 100644 --- a/fxjs/README +++ b/fxjs/README
@@ -23,9 +23,9 @@ kFXJSEHostObjectTag for FXJSE Host objects, or kFXJSEProxyObjectTag for a global proxy object under FXJSE, or One of 4 specific FXJSE_CLASS_DESCRIPTOR globals for FXJSE classes: - GlobalClassDescriptor - NormalClassDescriptor - VariablesClassDescriptor + kGlobalClassDescriptor + kNormalClassDescriptor + kVariablesClassDescriptor kFormCalcDescriptor Slot 1's contents are determined by these tags:
diff --git a/fxjs/xfa/cfxjse_class.cpp b/fxjs/xfa/cfxjse_class.cpp index 58100a2..5f4cb00 100644 --- a/fxjs/xfa/cfxjse_class.cpp +++ b/fxjs/xfa/cfxjse_class.cpp
@@ -95,9 +95,9 @@ auto* pClassDescriptor = static_cast<const FXJSE_CLASS_DESCRIPTOR*>( hCallBackInfo->GetAlignedPointerFromInternalField(0)); - if (pClassDescriptor != &GlobalClassDescriptor && - pClassDescriptor != &NormalClassDescriptor && - pClassDescriptor != &VariablesClassDescriptor && + if (pClassDescriptor != &kGlobalClassDescriptor && + pClassDescriptor != &kNormalClassDescriptor && + pClassDescriptor != &kVariablesClassDescriptor && pClassDescriptor != &kFormCalcDescriptor) { return; }
diff --git a/fxjs/xfa/cfxjse_engine.cpp b/fxjs/xfa/cfxjse_engine.cpp index e99af44..8eacbdd 100644 --- a/fxjs/xfa/cfxjse_engine.cpp +++ b/fxjs/xfa/cfxjse_engine.cpp
@@ -39,7 +39,7 @@ using pdfium::fxjse::kClassTag; -const FXJSE_CLASS_DESCRIPTOR GlobalClassDescriptor = { +const FXJSE_CLASS_DESCRIPTOR kGlobalClassDescriptor = { kClassTag, // tag "Root", // name nullptr, // methods @@ -50,7 +50,7 @@ CFXJSE_Engine::NormalMethodCall, }; -const FXJSE_CLASS_DESCRIPTOR NormalClassDescriptor = { +const FXJSE_CLASS_DESCRIPTOR kNormalClassDescriptor = { kClassTag, // tag "XFAObject", // name nullptr, // methods @@ -61,7 +61,7 @@ CFXJSE_Engine::NormalMethodCall, }; -const FXJSE_CLASS_DESCRIPTOR VariablesClassDescriptor = { +const FXJSE_CLASS_DESCRIPTOR kVariablesClassDescriptor = { kClassTag, // tag "XFAScriptObject", // name nullptr, // methods @@ -124,7 +124,7 @@ m_pSubordinateRuntime(fxjs_runtime), m_pDocument(pDocument), m_JsContext(CFXJSE_Context::Create(fxjs_runtime->GetIsolate(), - &GlobalClassDescriptor, + &kGlobalClassDescriptor, pDocument->GetRoot()->JSObject(), nullptr)), m_ResolveProcessor(std::make_unique<CFXJSE_ResolveProcessor>()) { @@ -134,7 +134,7 @@ // Don't know if this can happen before we remove the builtin objs and set // compatibility mode. m_pJsClass = - CFXJSE_Class::Create(m_JsContext.get(), &NormalClassDescriptor, false); + CFXJSE_Class::Create(m_JsContext.get(), &kNormalClassDescriptor, false); } CFXJSE_Engine::~CFXJSE_Engine() { @@ -544,7 +544,7 @@ pScriptNode->GetDocument()->GetHeap()->GetAllocationHandle(), pSubform, pScriptNode); auto pNewContext = CFXJSE_Context::Create( - GetIsolate(), &VariablesClassDescriptor, proxy->JSObject(), proxy); + GetIsolate(), &kVariablesClassDescriptor, proxy->JSObject(), proxy); RemoveBuiltInObjs(pNewContext.get()); pNewContext->EnableCompatibleMode(); CFXJSE_Context* pResult = pNewContext.get();
diff --git a/fxjs/xfa/fxjse.h b/fxjs/xfa/fxjse.h index b30c832..0cda496 100644 --- a/fxjs/xfa/fxjse.h +++ b/fxjs/xfa/fxjse.h
@@ -86,9 +86,9 @@ FXJSE_MethodCallback dynMethodCall; }; -extern const FXJSE_CLASS_DESCRIPTOR GlobalClassDescriptor; -extern const FXJSE_CLASS_DESCRIPTOR NormalClassDescriptor; -extern const FXJSE_CLASS_DESCRIPTOR VariablesClassDescriptor; +extern const FXJSE_CLASS_DESCRIPTOR kGlobalClassDescriptor; +extern const FXJSE_CLASS_DESCRIPTOR kNormalClassDescriptor; +extern const FXJSE_CLASS_DESCRIPTOR kVariablesClassDescriptor; extern const FXJSE_CLASS_DESCRIPTOR kFormCalcDescriptor; void FXJSE_ThrowMessage(v8::Isolate* pIsolate, ByteStringView utf8Message);