summaryrefslogtreecommitdiff
path: root/fxjs
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2017-11-06 21:36:01 +0000
committerChromium commit bot <commit-bot@chromium.org>2017-11-06 21:36:01 +0000
commit6c3665776eb6276be2b2314cd4242e7c21610ea2 (patch)
treeafe72e2a412d7d0de97d6444bcbc84aa5bb3c3fa /fxjs
parent67687896d2959494d2e689ffbbc9c86098e54280 (diff)
downloadpdfium-6c3665776eb6276be2b2314cd4242e7c21610ea2.tar.xz
Cleanup CFXJSE_Value::SetObject
All of the callers to SetObject pass in the class so we can remove the class check. The SetJSObject method is no longer needed. The SetHostObject method has been merged into the SetObject method. Change-Id: Id80931b88cc0656d021350ea8d62369513b86b9d Reviewed-on: https://pdfium-review.googlesource.com/17858 Commit-Queue: dsinclair <dsinclair@chromium.org> Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'fxjs')
-rw-r--r--fxjs/cfxjse_value.cpp18
-rw-r--r--fxjs/cfxjse_value.h2
2 files changed, 1 insertions, 19 deletions
diff --git a/fxjs/cfxjse_value.cpp b/fxjs/cfxjse_value.cpp
index 93e568c0ba..0a135951d9 100644
--- a/fxjs/cfxjse_value.cpp
+++ b/fxjs/cfxjse_value.cpp
@@ -83,20 +83,9 @@ CFXJSE_HostObject* CFXJSE_Value::ToHostObject(CFXJSE_Class* lpClass) const {
void CFXJSE_Value::SetObject(CFXJSE_HostObject* lpObject,
CFXJSE_Class* pClass) {
- if (!pClass) {
- ASSERT(!lpObject);
- SetJSObject();
- return;
- }
- SetHostObject(lpObject, pClass);
-}
-
-void CFXJSE_Value::SetHostObject(CFXJSE_HostObject* lpObject,
- CFXJSE_Class* lpClass) {
CFXJSE_ScopeUtil_IsolateHandleRootContext scope(m_pIsolate);
- ASSERT(lpClass);
v8::Local<v8::FunctionTemplate> hClass =
- v8::Local<v8::FunctionTemplate>::New(m_pIsolate, lpClass->m_hTemplate);
+ v8::Local<v8::FunctionTemplate>::New(m_pIsolate, pClass->m_hTemplate);
v8::Local<v8::Object> hObject = hClass->InstanceTemplate()->NewInstance();
FXJSE_UpdateObjectBinding(hObject, lpObject);
m_hValue.Reset(m_pIsolate, hObject);
@@ -510,8 +499,3 @@ void CFXJSE_Value::SetString(const ByteStringView& szString) {
m_hValue.Reset(m_pIsolate, hValue);
}
-void CFXJSE_Value::SetJSObject() {
- CFXJSE_ScopeUtil_IsolateHandleRootContext scope(m_pIsolate);
- v8::Local<v8::Value> hValue = v8::Object::New(m_pIsolate);
- m_hValue.Reset(m_pIsolate, hValue);
-}
diff --git a/fxjs/cfxjse_value.h b/fxjs/cfxjse_value.h
index f506857965..52905db90f 100644
--- a/fxjs/cfxjse_value.h
+++ b/fxjs/cfxjse_value.h
@@ -51,10 +51,8 @@ class CFXJSE_Value {
void SetDouble(double dDouble);
void SetString(const ByteStringView& szString);
void SetFloat(float fFloat);
- void SetJSObject();
void SetObject(CFXJSE_HostObject* lpObject, CFXJSE_Class* pClass);
- void SetHostObject(CFXJSE_HostObject* lpObject, CFXJSE_Class* lpClass);
void SetArray(const std::vector<std::unique_ptr<CFXJSE_Value>>& values);
void SetDate(double dDouble);