Remove redundant calls to GetScriptContext()
Change-Id: Iffbccea19a1137df680e5f2c05315d5eb58722de
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/107531
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
diff --git a/fxjs/xfa/cjx_eventpseudomodel.cpp b/fxjs/xfa/cjx_eventpseudomodel.cpp
index d40d919..66dbb07 100644
--- a/fxjs/xfa/cjx_eventpseudomodel.cpp
+++ b/fxjs/xfa/cjx_eventpseudomodel.cpp
@@ -11,7 +11,6 @@
#include "fxjs/fxv8.h"
#include "fxjs/xfa/cfxjse_engine.h"
-#include "third_party/base/check_op.h"
#include "third_party/base/notreached.h"
#include "third_party/base/numerics/safe_conversions.h"
#include "v8/include/v8-primitive.h"
@@ -127,8 +126,8 @@
if (bSetting)
return;
- CFXJSE_Engine* pScriptContext = GetDocument()->GetScriptContext();
- CXFA_EventParam* pEventParam = pScriptContext->GetEventParam();
+ CXFA_EventParam* pEventParam =
+ GetDocument()->GetScriptContext()->GetEventParam();
if (!pEventParam)
return;
@@ -202,8 +201,7 @@
CJS_Result CJX_EventPseudoModel::emit(
CFXJSE_Engine* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
- CFXJSE_Engine* pScriptContext = GetDocument()->GetScriptContext();
- CXFA_EventParam* pEventParam = pScriptContext->GetEventParam();
+ CXFA_EventParam* pEventParam = runtime->GetEventParam();
if (!pEventParam)
return CJS_Result::Success();
@@ -211,16 +209,14 @@
if (!pNotify)
return CJS_Result::Success();
- pNotify->HandleWidgetEvent(pScriptContext->GetEventTarget(), pEventParam);
+ pNotify->HandleWidgetEvent(runtime->GetEventTarget(), pEventParam);
return CJS_Result::Success();
}
CJS_Result CJX_EventPseudoModel::reset(
CFXJSE_Engine* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
- CHECK_EQ(runtime, GetDocument()->GetScriptContext());
- CFXJSE_Engine* pScriptContext = GetDocument()->GetScriptContext();
- CXFA_EventParam* pEventParam = pScriptContext->GetEventParam();
+ CXFA_EventParam* pEventParam = runtime->GetEventParam();
if (pEventParam)
*pEventParam = CXFA_EventParam();
diff --git a/fxjs/xfa/cjx_exclgroup.cpp b/fxjs/xfa/cjx_exclgroup.cpp
index f27ece1..641f0f2 100644
--- a/fxjs/xfa/cjx_exclgroup.cpp
+++ b/fxjs/xfa/cjx_exclgroup.cpp
@@ -13,7 +13,6 @@
#include "fxjs/xfa/cfxjse_engine.h"
#include "v8/include/v8-object.h"
#include "v8/include/v8-primitive.h"
-#include "third_party/base/check_op.h"
#include "xfa/fxfa/cxfa_eventparam.h"
#include "xfa/fxfa/cxfa_ffnotify.h"
#include "xfa/fxfa/fxfa.h"
@@ -93,7 +92,6 @@
CJS_Result CJX_ExclGroup::selectedMember(
CFXJSE_Engine* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
- CHECK_EQ(runtime, GetDocument()->GetScriptContext());
if (!params.empty())
return CJS_Result::Failure(JSMessage::kParamError);
@@ -111,9 +109,7 @@
if (!pReturnNode)
return CJS_Result::Success(runtime->NewNull());
- return CJS_Result::Success(
- GetDocument()->GetScriptContext()->GetOrCreateJSBindingFromMap(
- pReturnNode));
+ return CJS_Result::Success(runtime->GetOrCreateJSBindingFromMap(pReturnNode));
}
void CJX_ExclGroup::defaultValue(v8::Isolate* pIsolate,
diff --git a/fxjs/xfa/cjx_form.cpp b/fxjs/xfa/cjx_form.cpp
index d4e0441..ec68b70 100644
--- a/fxjs/xfa/cjx_form.cpp
+++ b/fxjs/xfa/cjx_form.cpp
@@ -11,7 +11,6 @@
#include "fxjs/fxv8.h"
#include "fxjs/js_resources.h"
#include "fxjs/xfa/cfxjse_engine.h"
-#include "third_party/base/check_op.h"
#include "v8/include/cppgc/allocation.h"
#include "v8/include/v8-object.h"
#include "v8/include/v8-primitive.h"
@@ -83,9 +82,7 @@
CJS_Result CJX_Form::recalculate(
CFXJSE_Engine* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
- CHECK_EQ(runtime, GetDocument()->GetScriptContext());
- CXFA_EventParam* pEventParam =
- GetDocument()->GetScriptContext()->GetEventParam();
+ CXFA_EventParam* pEventParam = runtime->GetEventParam();
if (pEventParam && (pEventParam->m_eType == XFA_EVENT_Calculate ||
pEventParam->m_eType == XFA_EVENT_InitCalculate)) {
return CJS_Result::Success();
diff --git a/fxjs/xfa/cjx_hostpseudomodel.cpp b/fxjs/xfa/cjx_hostpseudomodel.cpp
index e549752..f79a0cd 100644
--- a/fxjs/xfa/cjx_hostpseudomodel.cpp
+++ b/fxjs/xfa/cjx_hostpseudomodel.cpp
@@ -12,7 +12,6 @@
#include "fxjs/js_resources.h"
#include "fxjs/xfa/cfxjse_engine.h"
#include "third_party/base/check.h"
-#include "third_party/base/check_op.h"
#include "v8/include/v8-object.h"
#include "xfa/fxfa/cxfa_ffdoc.h"
#include "xfa/fxfa/cxfa_ffnotify.h"
@@ -260,9 +259,9 @@
CJS_Result CJX_HostPseudoModel::gotoURL(
CFXJSE_Engine* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
- CHECK_EQ(runtime, GetDocument()->GetScriptContext());
- if (!GetDocument()->GetScriptContext()->IsRunAtClient())
+ if (!runtime->IsRunAtClient()) {
return CJS_Result::Success();
+ }
if (params.size() != 1)
return CJS_Result::Failure(JSMessage::kParamError);
@@ -278,9 +277,9 @@
CJS_Result CJX_HostPseudoModel::openList(
CFXJSE_Engine* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
- CHECK_EQ(runtime, GetDocument()->GetScriptContext());
- if (!GetDocument()->GetScriptContext()->IsRunAtClient())
+ if (!runtime->IsRunAtClient()) {
return CJS_Result::Success();
+ }
if (params.size() != 1)
return CJS_Result::Failure(JSMessage::kParamError);
@@ -293,8 +292,7 @@
if (params[0]->IsObject()) {
pNode = ToNode(runtime->ToXFAObject(params[0]));
} else if (params[0]->IsString()) {
- CFXJSE_Engine* pScriptContext = GetDocument()->GetScriptContext();
- CXFA_Object* pObject = pScriptContext->GetThisObject();
+ CXFA_Object* pObject = runtime->GetThisObject();
if (!pObject)
return CJS_Result::Success();
@@ -302,7 +300,7 @@
XFA_ResolveFlag::kParent,
XFA_ResolveFlag::kSiblings};
absl::optional<CFXJSE_Engine::ResolveResult> maybeResult =
- pScriptContext->ResolveObjects(
+ runtime->ResolveObjects(
pObject, runtime->ToWideString(params[0]).AsStringView(), kFlags);
if (!maybeResult.has_value() ||
!maybeResult.value().objects.front()->IsNode()) {
@@ -357,7 +355,6 @@
CJS_Result CJX_HostPseudoModel::resetData(
CFXJSE_Engine* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
- CHECK_EQ(runtime, GetDocument()->GetScriptContext());
if (params.size() > 1)
return CJS_Result::Failure(JSMessage::kParamError);
@@ -380,8 +377,7 @@
const size_t nExpLength = expression.GetLength();
while (nStart < nExpLength) {
nStart = FilterName(expression.AsStringView(), nStart, wsName);
- CFXJSE_Engine* pScriptContext = GetDocument()->GetScriptContext();
- CXFA_Object* pObject = pScriptContext->GetThisObject();
+ CXFA_Object* pObject = runtime->GetThisObject();
if (!pObject)
return CJS_Result::Success();
@@ -389,7 +385,7 @@
XFA_ResolveFlag::kParent,
XFA_ResolveFlag::kSiblings};
absl::optional<CFXJSE_Engine::ResolveResult> maybeResult =
- pScriptContext->ResolveObjects(pObject, wsName.AsStringView(), kFlags);
+ runtime->ResolveObjects(pObject, wsName.AsStringView(), kFlags);
if (!maybeResult.has_value() ||
!maybeResult.value().objects.front()->IsNode())
continue;
@@ -406,9 +402,9 @@
CJS_Result CJX_HostPseudoModel::beep(
CFXJSE_Engine* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
- CHECK_EQ(runtime, GetDocument()->GetScriptContext());
- if (!GetDocument()->GetScriptContext()->IsRunAtClient())
+ if (!runtime->IsRunAtClient()) {
return CJS_Result::Success();
+ }
if (params.size() > 1)
return CJS_Result::Failure(JSMessage::kParamError);
@@ -428,9 +424,9 @@
CJS_Result CJX_HostPseudoModel::setFocus(
CFXJSE_Engine* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
- CHECK_EQ(runtime, GetDocument()->GetScriptContext());
- if (!GetDocument()->GetScriptContext()->IsRunAtClient())
+ if (!runtime->IsRunAtClient()) {
return CJS_Result::Success();
+ }
if (params.size() != 1)
return CJS_Result::Failure(JSMessage::kParamError);
@@ -444,8 +440,7 @@
if (params[0]->IsObject()) {
pNode = ToNode(runtime->ToXFAObject(params[0]));
} else if (params[0]->IsString()) {
- CFXJSE_Engine* pScriptContext = GetDocument()->GetScriptContext();
- CXFA_Object* pObject = pScriptContext->GetThisObject();
+ CXFA_Object* pObject = runtime->GetThisObject();
if (!pObject)
return CJS_Result::Success();
@@ -453,7 +448,7 @@
XFA_ResolveFlag::kParent,
XFA_ResolveFlag::kSiblings};
absl::optional<CFXJSE_Engine::ResolveResult> maybeResult =
- pScriptContext->ResolveObjects(
+ runtime->ResolveObjects(
pObject, runtime->ToWideString(params[0]).AsStringView(), kFlags);
if (!maybeResult.has_value() ||
!maybeResult.value().objects.front()->IsNode()) {
@@ -469,7 +464,6 @@
CJS_Result CJX_HostPseudoModel::getFocus(
CFXJSE_Engine* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
- CHECK_EQ(runtime, GetDocument()->GetScriptContext());
CXFA_FFNotify* pNotify = GetDocument()->GetNotify();
if (!pNotify)
return CJS_Result::Success();
@@ -478,18 +472,15 @@
if (!pNode)
return CJS_Result::Success();
- v8::Local<v8::Value> value =
- GetDocument()->GetScriptContext()->GetOrCreateJSBindingFromMap(pNode);
-
- return CJS_Result::Success(value);
+ return CJS_Result::Success(runtime->GetOrCreateJSBindingFromMap(pNode));
}
CJS_Result CJX_HostPseudoModel::messageBox(
CFXJSE_Engine* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
- CHECK_EQ(runtime, GetDocument()->GetScriptContext());
- if (!GetDocument()->GetScriptContext()->IsRunAtClient())
+ if (!runtime->IsRunAtClient()) {
return CJS_Result::Success();
+ }
if (params.empty() || params.size() > 4)
return CJS_Result::Failure(JSMessage::kParamError);
@@ -534,9 +525,9 @@
CJS_Result CJX_HostPseudoModel::print(
CFXJSE_Engine* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
- CHECK_EQ(runtime, GetDocument()->GetScriptContext());
- if (!GetDocument()->GetScriptContext()->IsRunAtClient())
+ if (!runtime->IsRunAtClient()) {
return CJS_Result::Success();
+ }
if (params.size() != 8)
return CJS_Result::Failure(JSMessage::kParamError);
diff --git a/fxjs/xfa/cjx_instancemanager.cpp b/fxjs/xfa/cjx_instancemanager.cpp
index 8293de7..f5b4d61 100644
--- a/fxjs/xfa/cjx_instancemanager.cpp
+++ b/fxjs/xfa/cjx_instancemanager.cpp
@@ -12,7 +12,6 @@
#include "fxjs/fxv8.h"
#include "fxjs/js_resources.h"
#include "fxjs/xfa/cfxjse_engine.h"
-#include "third_party/base/check_op.h"
#include "third_party/base/notreached.h"
#include "v8/include/v8-object.h"
#include "v8/include/v8-primitive.h"
@@ -221,7 +220,6 @@
CJS_Result CJX_InstanceManager::addInstance(
CFXJSE_Engine* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
- CHECK_EQ(runtime, GetDocument()->GetScriptContext());
CXFA_Document* doc = runtime->GetDocument();
if (doc->GetFormType() != FormType::kXFAFull)
return CJS_Result::Failure(JSMessage::kNotSupportedError);
@@ -252,14 +250,12 @@
}
return CJS_Result::Success(
- GetDocument()->GetScriptContext()->GetOrCreateJSBindingFromMap(
- pNewInstance));
+ runtime->GetOrCreateJSBindingFromMap(pNewInstance));
}
CJS_Result CJX_InstanceManager::insertInstance(
CFXJSE_Engine* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
- CHECK_EQ(runtime, GetDocument()->GetScriptContext());
CXFA_Document* doc = runtime->GetDocument();
if (doc->GetFormType() != FormType::kXFAFull)
return CJS_Result::Failure(JSMessage::kNotSupportedError);
@@ -294,8 +290,7 @@
}
return CJS_Result::Success(
- GetDocument()->GetScriptContext()->GetOrCreateJSBindingFromMap(
- pNewInstance));
+ runtime->GetOrCreateJSBindingFromMap(pNewInstance));
}
void CJX_InstanceManager::max(v8::Isolate* pIsolate,
diff --git a/fxjs/xfa/cjx_model.cpp b/fxjs/xfa/cjx_model.cpp
index 0d1141c..e94954e 100644
--- a/fxjs/xfa/cjx_model.cpp
+++ b/fxjs/xfa/cjx_model.cpp
@@ -11,7 +11,6 @@
#include "fxjs/js_resources.h"
#include "fxjs/xfa/cfxjse_engine.h"
#include "fxjs/xfa/cfxjse_value.h"
-#include "third_party/base/check_op.h"
#include "v8/include/v8-object.h"
#include "xfa/fxfa/parser/cxfa_delta.h"
#include "xfa/fxfa/parser/cxfa_document.h"
@@ -41,7 +40,6 @@
CJS_Result CJX_Model::createNode(
CFXJSE_Engine* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
- CHECK_EQ(runtime, GetDocument()->GetScriptContext());
if (params.empty() || params.size() > 3)
return CJS_Result::Failure(JSMessage::kParamError);
@@ -67,11 +65,7 @@
if (pNewNode->GetPacketType() == XFA_PacketType::Datasets)
pNewNode->CreateXMLMappingNode();
}
-
- v8::Local<v8::Value> value =
- GetDocument()->GetScriptContext()->GetOrCreateJSBindingFromMap(pNewNode);
-
- return CJS_Result::Success(value);
+ return CJS_Result::Success(runtime->GetOrCreateJSBindingFromMap(pNewNode));
}
CJS_Result CJX_Model::isCompatibleNS(
diff --git a/fxjs/xfa/cjx_node.cpp b/fxjs/xfa/cjx_node.cpp
index 2eea6f0..9db88ba 100644
--- a/fxjs/xfa/cjx_node.cpp
+++ b/fxjs/xfa/cjx_node.cpp
@@ -19,7 +19,6 @@
#include "fxjs/fxv8.h"
#include "fxjs/js_resources.h"
#include "fxjs/xfa/cfxjse_engine.h"
-#include "third_party/base/check_op.h"
#include "v8/include/v8-object.h"
#include "xfa/fxfa/cxfa_eventparam.h"
#include "xfa/fxfa/cxfa_ffdoc.h"
@@ -134,14 +133,11 @@
CJS_Result CJX_Node::clone(CFXJSE_Engine* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
- CHECK_EQ(runtime, GetDocument()->GetScriptContext());
if (params.size() != 1)
return CJS_Result::Failure(JSMessage::kParamError);
CXFA_Node* pCloneNode = GetXFANode()->Clone(runtime->ToBoolean(params[0]));
- return CJS_Result::Success(
- GetDocument()->GetScriptContext()->GetOrCreateJSBindingFromMap(
- pCloneNode));
+ return CJS_Result::Success(runtime->GetOrCreateJSBindingFromMap(pCloneNode));
}
CJS_Result CJX_Node::getAttribute(
@@ -158,7 +154,6 @@
CJS_Result CJX_Node::getElement(
CFXJSE_Engine* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
- CHECK_EQ(runtime, GetDocument()->GetScriptContext());
if (params.empty() || params.size() > 2)
return CJS_Result::Failure(JSMessage::kParamError);
@@ -172,8 +167,7 @@
if (!pNode)
return CJS_Result::Success(runtime->NewNull());
- return CJS_Result::Success(
- GetDocument()->GetScriptContext()->GetOrCreateJSBindingFromMap(pNode));
+ return CJS_Result::Success(runtime->GetOrCreateJSBindingFromMap(pNode));
}
CJS_Result CJX_Node::isPropertySpecified(
diff --git a/fxjs/xfa/cjx_tree.cpp b/fxjs/xfa/cjx_tree.cpp
index a356973..daabd09 100644
--- a/fxjs/xfa/cjx_tree.cpp
+++ b/fxjs/xfa/cjx_tree.cpp
@@ -12,7 +12,6 @@
#include "fxjs/js_resources.h"
#include "fxjs/xfa/cfxjse_class.h"
#include "fxjs/xfa/cfxjse_engine.h"
-#include "third_party/base/check_op.h"
#include "third_party/base/numerics/safe_conversions.h"
#include "v8/include/cppgc/allocation.h"
#include "v8/include/v8-object.h"
@@ -40,18 +39,16 @@
CJS_Result CJX_Tree::resolveNode(
CFXJSE_Engine* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
- CHECK_EQ(runtime, GetDocument()->GetScriptContext());
if (params.size() != 1)
return CJS_Result::Failure(JSMessage::kParamError);
WideString wsExpression = runtime->ToWideString(params[0]);
- CFXJSE_Engine* pScriptContext = GetDocument()->GetScriptContext();
CXFA_Object* pRefNode = GetXFAObject();
if (pRefNode->GetElementType() == XFA_Element::Xfa)
- pRefNode = pScriptContext->GetThisObject();
+ pRefNode = runtime->GetThisObject();
absl::optional<CFXJSE_Engine::ResolveResult> maybeResult =
- pScriptContext->ResolveObjects(
+ runtime->ResolveObjects(
ToNode(pRefNode), wsExpression.AsStringView(),
Mask<XFA_ResolveFlag>{
XFA_ResolveFlag::kChildren, XFA_ResolveFlag::kAttributes,
@@ -61,9 +58,8 @@
return CJS_Result::Success(runtime->NewNull());
if (maybeResult.value().type == CFXJSE_Engine::ResolveResult::Type::kNodes) {
- return CJS_Result::Success(
- GetDocument()->GetScriptContext()->GetOrCreateJSBindingFromMap(
- maybeResult.value().objects.front().Get()));
+ return CJS_Result::Success(runtime->GetOrCreateJSBindingFromMap(
+ maybeResult.value().objects.front().Get()));
}
if (!maybeResult.value().script_attribute.callback ||
@@ -83,20 +79,18 @@
CJS_Result CJX_Tree::resolveNodes(
CFXJSE_Engine* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
- CHECK_EQ(runtime, GetDocument()->GetScriptContext());
if (params.size() != 1)
return CJS_Result::Failure(JSMessage::kParamError);
CXFA_Object* refNode = GetXFAObject();
if (refNode->GetElementType() == XFA_Element::Xfa)
- refNode = GetDocument()->GetScriptContext()->GetThisObject();
+ refNode = runtime->GetThisObject();
- CFXJSE_Engine* pScriptContext = GetDocument()->GetScriptContext();
const Mask<XFA_ResolveFlag> kFlags = {
XFA_ResolveFlag::kChildren, XFA_ResolveFlag::kAttributes,
XFA_ResolveFlag::kProperties, XFA_ResolveFlag::kParent,
XFA_ResolveFlag::kSiblings};
- return CJS_Result::Success(ResolveNodeList(pScriptContext->GetIsolate(),
+ return CJS_Result::Success(ResolveNodeList(runtime->GetIsolate(),
runtime->ToWideString(params[0]),
kFlags, ToNode(refNode)));
}
diff --git a/fxjs/xfa/cjx_treelist.cpp b/fxjs/xfa/cjx_treelist.cpp
index 1bfde7d..a721349 100644
--- a/fxjs/xfa/cjx_treelist.cpp
+++ b/fxjs/xfa/cjx_treelist.cpp
@@ -11,7 +11,6 @@
#include "fxjs/js_resources.h"
#include "fxjs/xfa/cfxjse_engine.h"
#include "fxjs/xfa/cfxjse_value.h"
-#include "third_party/base/check_op.h"
#include "v8/include/v8-object.h"
#include "xfa/fxfa/parser/cxfa_document.h"
#include "xfa/fxfa/parser/cxfa_node.h"
@@ -37,7 +36,6 @@
CJS_Result CJX_TreeList::namedItem(
CFXJSE_Engine* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
- CHECK_EQ(runtime, GetDocument()->GetScriptContext());
if (params.size() != 1)
return CJS_Result::Failure(JSMessage::kParamError);
@@ -46,6 +44,5 @@
if (!pNode)
return CJS_Result::Success();
- return CJS_Result::Success(
- GetDocument()->GetScriptContext()->GetOrCreateJSBindingFromMap(pNode));
+ return CJS_Result::Success(runtime->GetOrCreateJSBindingFromMap(pNode));
}
