summaryrefslogtreecommitdiff
path: root/fxjs
diff options
context:
space:
mode:
Diffstat (limited to 'fxjs')
-rw-r--r--fxjs/cfxjse_arguments.cpp12
-rw-r--r--fxjs/cfxjse_arguments.h4
-rw-r--r--fxjs/cfxjse_class.cpp34
-rw-r--r--fxjs/cfxjse_class.h11
-rw-r--r--fxjs/cfxjse_context.cpp44
-rw-r--r--fxjs/cfxjse_context.h15
6 files changed, 61 insertions, 59 deletions
diff --git a/fxjs/cfxjse_arguments.cpp b/fxjs/cfxjse_arguments.cpp
index 323134dcf5..f406ba34de 100644
--- a/fxjs/cfxjse_arguments.cpp
+++ b/fxjs/cfxjse_arguments.cpp
@@ -8,20 +8,16 @@
#include "fxjs/cfxjse_context.h"
#include "fxjs/cfxjse_value.h"
-
-v8::Isolate* CFXJSE_Arguments::GetRuntime() const {
- return m_pRetValue->GetIsolate();
-}
+#include "third_party/base/ptr_util.h"
int32_t CFXJSE_Arguments::GetLength() const {
return m_pInfo->Length();
}
std::unique_ptr<CFXJSE_Value> CFXJSE_Arguments::GetValue(int32_t index) const {
- std::unique_ptr<CFXJSE_Value> lpArgValue(
- new CFXJSE_Value(v8::Isolate::GetCurrent()));
- lpArgValue->ForceSetValue((*m_pInfo)[index]);
- return lpArgValue;
+ auto pArgValue = pdfium::MakeUnique<CFXJSE_Value>(v8::Isolate::GetCurrent());
+ pArgValue->ForceSetValue((*m_pInfo)[index]);
+ return pArgValue;
}
bool CFXJSE_Arguments::GetBoolean(int32_t index) const {
diff --git a/fxjs/cfxjse_arguments.h b/fxjs/cfxjse_arguments.h
index 4f18082f84..beaf1525bb 100644
--- a/fxjs/cfxjse_arguments.h
+++ b/fxjs/cfxjse_arguments.h
@@ -9,17 +9,15 @@
#include <memory>
+#include "fxjs/cfxjse_class.h"
#include "fxjs/fxjse.h"
-class CFXJSE_Class;
-
class CFXJSE_Arguments {
public:
CFXJSE_Arguments(const v8::FunctionCallbackInfo<v8::Value>* pInfo,
CFXJSE_Value* pRetValue)
: m_pInfo(pInfo), m_pRetValue(pRetValue) {}
- v8::Isolate* GetRuntime() const;
int32_t GetLength() const;
std::unique_ptr<CFXJSE_Value> GetValue(int32_t index) const;
bool GetBoolean(int32_t index) const;
diff --git a/fxjs/cfxjse_class.cpp b/fxjs/cfxjse_class.cpp
index 8924a48a47..da70583f45 100644
--- a/fxjs/cfxjse_class.cpp
+++ b/fxjs/cfxjse_class.cpp
@@ -7,7 +7,9 @@
#include "fxjs/cfxjse_class.h"
#include <memory>
+#include <utility>
+#include "fxjs/cfxjse_arguments.h"
#include "fxjs/cfxjse_context.h"
#include "fxjs/cfxjse_value.h"
#include "third_party/base/ptr_util.h"
@@ -311,13 +313,13 @@ CFXJSE_Class* CFXJSE_Class::Create(
if (!lpContext || !lpClassDefinition)
return nullptr;
- CFXJSE_Class* pClass =
- GetClassFromContext(lpContext, lpClassDefinition->name);
- if (pClass)
- return pClass;
+ CFXJSE_Class* pExistingClass =
+ lpContext->GetClassByName(lpClassDefinition->name);
+ if (pExistingClass)
+ return pExistingClass;
- v8::Isolate* pIsolate = lpContext->m_pIsolate;
- pClass = new CFXJSE_Class(lpContext);
+ v8::Isolate* pIsolate = lpContext->GetIsolate();
+ auto pClass = pdfium::MakeUnique<CFXJSE_Class>(lpContext);
pClass->m_szClassName = lpClassDefinition->name;
pClass->m_lpClassDefinition = lpClassDefinition;
CFXJSE_ScopeUtil_IsolateHandleRootContext scope(pIsolate);
@@ -369,8 +371,7 @@ CFXJSE_Class* CFXJSE_Class::Create(
lpClassDefinition))),
static_cast<v8::PropertyAttribute>(v8::ReadOnly | v8::DontDelete));
} else {
- v8::Local<v8::Context> hLocalContext =
- v8::Local<v8::Context>::New(pIsolate, lpContext->m_hContext);
+ v8::Local<v8::Context> hLocalContext = lpContext->GetContext();
FXJSE_GetGlobalObjectFromContext(hLocalContext)
->Set(v8::String::NewFromUtf8(pIsolate, lpClassDefinition->name),
v8::Function::New(
@@ -388,19 +389,10 @@ CFXJSE_Class* CFXJSE_Class::Create(
fun->RemovePrototype();
hObjectTemplate->Set(v8::String::NewFromUtf8(pIsolate, "toString"), fun);
}
- pClass->m_hTemplate.Reset(lpContext->m_pIsolate, hFunctionTemplate);
- lpContext->m_rgClasses.push_back(std::unique_ptr<CFXJSE_Class>(pClass));
- return pClass;
-}
-
-// static
-CFXJSE_Class* CFXJSE_Class::GetClassFromContext(CFXJSE_Context* pContext,
- const CFX_ByteStringC& szName) {
- for (const auto& pClass : pContext->m_rgClasses) {
- if (pClass->m_szClassName == szName)
- return pClass.get();
- }
- return nullptr;
+ pClass->m_hTemplate.Reset(lpContext->GetIsolate(), hFunctionTemplate);
+ CFXJSE_Class* pResult = pClass.get();
+ lpContext->AddClass(std::move(pClass));
+ return pResult;
}
// static
diff --git a/fxjs/cfxjse_class.h b/fxjs/cfxjse_class.h
index 1b3528a5c0..04354941fa 100644
--- a/fxjs/cfxjse_class.h
+++ b/fxjs/cfxjse_class.h
@@ -7,7 +7,6 @@
#ifndef FXJS_CFXJSE_CLASS_H_
#define FXJS_CFXJSE_CLASS_H_
-#include "fxjs/cfxjse_arguments.h"
#include "fxjs/fxjse.h"
#include "v8/include/v8.h"
@@ -18,22 +17,20 @@ class CFXJSE_Class {
public:
static CFXJSE_Class* Create(CFXJSE_Context* pContext,
const FXJSE_CLASS_DESCRIPTOR* lpClassDefintion,
- bool bIsJSGlobal = false);
- static CFXJSE_Class* GetClassFromContext(CFXJSE_Context* pContext,
- const CFX_ByteStringC& szName);
+ bool bIsJSGlobal);
+
static void SetUpNamedPropHandler(
v8::Isolate* pIsolate,
v8::Local<v8::ObjectTemplate>& hObjectTemplate,
const FXJSE_CLASS_DESCRIPTOR* lpClassDefinition);
+ explicit CFXJSE_Class(CFXJSE_Context* lpContext);
~CFXJSE_Class();
- CFXJSE_Context* GetContext() { return m_pContext; }
+ CFXJSE_Context* GetContext() const { return m_pContext; }
v8::Global<v8::FunctionTemplate>& GetTemplate() { return m_hTemplate; }
protected:
- explicit CFXJSE_Class(CFXJSE_Context* lpContext);
-
CFX_ByteString m_szClassName;
const FXJSE_CLASS_DESCRIPTOR* m_lpClassDefinition;
CFXJSE_Context* m_pContext;
diff --git a/fxjs/cfxjse_context.cpp b/fxjs/cfxjse_context.cpp
index d3b55ff43e..183d6363eb 100644
--- a/fxjs/cfxjse_context.cpp
+++ b/fxjs/cfxjse_context.cpp
@@ -6,6 +6,8 @@
#include "fxjs/cfxjse_context.h"
+#include <utility>
+
#include "fxjs/cfxjse_class.h"
#include "fxjs/cfxjse_value.h"
#include "third_party/base/ptr_util.h"
@@ -102,7 +104,7 @@ CFXJSE_HostObject* FXJSE_RetrieveObjectBinding(
if (lpClass) {
v8::Local<v8::FunctionTemplate> hClass =
v8::Local<v8::FunctionTemplate>::New(
- lpClass->GetContext()->GetRuntime(), lpClass->GetTemplate());
+ lpClass->GetContext()->GetIsolate(), lpClass->GetTemplate());
if (!hClass->HasInstance(hObject))
return nullptr;
}
@@ -148,20 +150,20 @@ v8::Local<v8::Object> FXJSE_CreateReturnValue(v8::Isolate* pIsolate,
}
// static
-CFXJSE_Context* CFXJSE_Context::Create(
+std::unique_ptr<CFXJSE_Context> CFXJSE_Context::Create(
v8::Isolate* pIsolate,
- const FXJSE_CLASS_DESCRIPTOR* lpGlobalClass,
- CFXJSE_HostObject* lpGlobalObject) {
+ const FXJSE_CLASS_DESCRIPTOR* pGlobalClass,
+ CFXJSE_HostObject* pGlobalObject) {
CFXJSE_ScopeUtil_IsolateHandle scope(pIsolate);
- CFXJSE_Context* pContext = new CFXJSE_Context(pIsolate);
- CFXJSE_Class* lpGlobalClassObj = nullptr;
+ auto pContext = pdfium::MakeUnique<CFXJSE_Context>(pIsolate);
+ CFXJSE_Class* pGlobalClassObj = nullptr;
v8::Local<v8::ObjectTemplate> hObjectTemplate;
- if (lpGlobalClass) {
- lpGlobalClassObj = CFXJSE_Class::Create(pContext, lpGlobalClass, true);
- ASSERT(lpGlobalClassObj);
+ if (pGlobalClass) {
+ pGlobalClassObj = CFXJSE_Class::Create(pContext.get(), pGlobalClass, true);
+ ASSERT(pGlobalClassObj);
v8::Local<v8::FunctionTemplate> hFunctionTemplate =
v8::Local<v8::FunctionTemplate>::New(pIsolate,
- lpGlobalClassObj->m_hTemplate);
+ pGlobalClassObj->m_hTemplate);
hObjectTemplate = hFunctionTemplate->InstanceTemplate();
} else {
hObjectTemplate = v8::ObjectTemplate::New(pIsolate);
@@ -178,7 +180,7 @@ CFXJSE_Context* CFXJSE_Context::Create(
hNewContext->SetSecurityToken(hRootContext->GetSecurityToken());
v8::Local<v8::Object> hGlobalObject =
FXJSE_GetGlobalObjectFromContext(hNewContext);
- FXJSE_UpdateObjectBinding(hGlobalObject, lpGlobalObject);
+ FXJSE_UpdateObjectBinding(hGlobalObject, pGlobalObject);
pContext->m_hContext.Reset(pIsolate, hNewContext);
return pContext;
}
@@ -189,16 +191,32 @@ CFXJSE_Context::~CFXJSE_Context() {}
std::unique_ptr<CFXJSE_Value> CFXJSE_Context::GetGlobalObject() {
auto pValue = pdfium::MakeUnique<CFXJSE_Value>(m_pIsolate);
-
CFXJSE_ScopeUtil_IsolateHandleContext scope(this);
v8::Local<v8::Context> hContext =
v8::Local<v8::Context>::New(m_pIsolate, m_hContext);
v8::Local<v8::Object> hGlobalObject = hContext->Global();
pValue->ForceSetValue(hGlobalObject);
-
return pValue;
}
+v8::Local<v8::Context> CFXJSE_Context::GetContext() {
+ return v8::Local<v8::Context>::New(m_pIsolate, m_hContext);
+}
+
+void CFXJSE_Context::AddClass(std::unique_ptr<CFXJSE_Class> pClass) {
+ m_rgClasses.push_back(std::move(pClass));
+}
+
+CFXJSE_Class* CFXJSE_Context::GetClassByName(
+ const CFX_ByteStringC& szName) const {
+ auto pClass =
+ std::find_if(m_rgClasses.begin(), m_rgClasses.end(),
+ [szName](const std::unique_ptr<CFXJSE_Class>& item) {
+ return szName == item->m_szClassName;
+ });
+ return pClass != m_rgClasses.end() ? pClass->get() : nullptr;
+}
+
void CFXJSE_Context::EnableCompatibleMode() {
ExecuteScript(szCompatibleModeScript, nullptr, nullptr);
}
diff --git a/fxjs/cfxjse_context.h b/fxjs/cfxjse_context.h
index 7b83aee4aa..35d5b59cea 100644
--- a/fxjs/cfxjse_context.h
+++ b/fxjs/cfxjse_context.h
@@ -20,28 +20,29 @@ struct FXJSE_CLASS_DESCRIPTOR;
class CFXJSE_Context {
public:
- static CFXJSE_Context* Create(
+ static std::unique_ptr<CFXJSE_Context> Create(
v8::Isolate* pIsolate,
- const FXJSE_CLASS_DESCRIPTOR* lpGlobalClass = nullptr,
- CFXJSE_HostObject* lpGlobalObject = nullptr);
+ const FXJSE_CLASS_DESCRIPTOR* pGlobalClass,
+ CFXJSE_HostObject* pGlobalObject);
+ explicit CFXJSE_Context(v8::Isolate* pIsolate);
~CFXJSE_Context();
- v8::Isolate* GetRuntime() { return m_pIsolate; }
+ v8::Isolate* GetIsolate() const { return m_pIsolate; }
+ v8::Local<v8::Context> GetContext();
std::unique_ptr<CFXJSE_Value> GetGlobalObject();
+ void AddClass(std::unique_ptr<CFXJSE_Class> pClass);
+ CFXJSE_Class* GetClassByName(const CFX_ByteStringC& szName) const;
void EnableCompatibleMode();
bool ExecuteScript(const char* szScript,
CFXJSE_Value* lpRetValue,
CFXJSE_Value* lpNewThisObject = nullptr);
protected:
- friend class CFXJSE_Class;
friend class CFXJSE_ScopeUtil_IsolateHandleContext;
CFXJSE_Context();
CFXJSE_Context(const CFXJSE_Context&);
- explicit CFXJSE_Context(v8::Isolate* pIsolate);
-
CFXJSE_Context& operator=(const CFXJSE_Context&);
v8::Global<v8::Context> m_hContext;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 20:24:56 +0000