| Index: fpdfsdk/javascript/global.cpp
|
| diff --git a/fpdfsdk/src/javascript/global.cpp b/fpdfsdk/javascript/global.cpp
|
| similarity index 95%
|
| rename from fpdfsdk/src/javascript/global.cpp
|
| rename to fpdfsdk/javascript/global.cpp
|
| index 234e132d46fa66b8a2d78d69cea66a35849cc01f..c22c05d1dba9cc9f305224446b9a8f0971266df5 100644
|
| --- a/fpdfsdk/src/javascript/global.cpp
|
| +++ b/fpdfsdk/javascript/global.cpp
|
| @@ -4,19 +4,19 @@
|
|
|
| // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
|
|
|
| -#include "fpdfsdk/src/javascript/global.h"
|
| +#include "fpdfsdk/javascript/global.h"
|
|
|
| #include <vector>
|
|
|
| #include "core/include/fxcrt/fx_ext.h"
|
| #include "fpdfsdk/include/javascript/IJavaScript.h"
|
| -#include "fpdfsdk/src/javascript/JS_Context.h"
|
| -#include "fpdfsdk/src/javascript/JS_Define.h"
|
| -#include "fpdfsdk/src/javascript/JS_EventHandler.h"
|
| -#include "fpdfsdk/src/javascript/JS_GlobalData.h"
|
| -#include "fpdfsdk/src/javascript/JS_Object.h"
|
| -#include "fpdfsdk/src/javascript/JS_Value.h"
|
| -#include "fpdfsdk/src/javascript/resource.h"
|
| +#include "fpdfsdk/javascript/JS_Context.h"
|
| +#include "fpdfsdk/javascript/JS_Define.h"
|
| +#include "fpdfsdk/javascript/JS_EventHandler.h"
|
| +#include "fpdfsdk/javascript/JS_GlobalData.h"
|
| +#include "fpdfsdk/javascript/JS_Object.h"
|
| +#include "fpdfsdk/javascript/JS_Value.h"
|
| +#include "fpdfsdk/javascript/resource.h"
|
|
|
| /* ---------------------------- global ---------------------------- */
|
|
|
| @@ -97,8 +97,7 @@ void CJS_Global::InitInstance(IJS_Runtime* pIRuntime) {
|
| }
|
|
|
| JSGlobalAlternate::JSGlobalAlternate(CJS_Object* pJSObject)
|
| - : CJS_EmbedObj(pJSObject), m_pApp(NULL) {
|
| -}
|
| + : CJS_EmbedObj(pJSObject), m_pApp(NULL) {}
|
|
|
| JSGlobalAlternate::~JSGlobalAlternate() {
|
| DestroyGlobalPersisitentVariables();
|
| @@ -298,17 +297,14 @@ void JSGlobalAlternate::CommitGlobalPersisitentVariables(IJS_Context* cc) {
|
| m_pGlobalData->SetGlobalVariableString(name, pData->sData);
|
| m_pGlobalData->SetGlobalVariablePersistent(name, pData->bPersistent);
|
| break;
|
| - case JS_GLOBALDATA_TYPE_OBJECT:
|
| - {
|
| - CJS_GlobalVariableArray array;
|
| - v8::Local<v8::Object> obj = v8::Local<v8::Object>::New(
|
| - GetJSObject()->GetIsolate(), pData->pData);
|
| - ObjectToArray(cc, obj, array);
|
| - m_pGlobalData->SetGlobalVariableObject(name, array);
|
| - m_pGlobalData->SetGlobalVariablePersistent(name,
|
| - pData->bPersistent);
|
| - }
|
| - break;
|
| + case JS_GLOBALDATA_TYPE_OBJECT: {
|
| + CJS_GlobalVariableArray array;
|
| + v8::Local<v8::Object> obj = v8::Local<v8::Object>::New(
|
| + GetJSObject()->GetIsolate(), pData->pData);
|
| + ObjectToArray(cc, obj, array);
|
| + m_pGlobalData->SetGlobalVariableObject(name, array);
|
| + m_pGlobalData->SetGlobalVariablePersistent(name, pData->bPersistent);
|
| + } break;
|
| case JS_GLOBALDATA_TYPE_NULL:
|
| m_pGlobalData->SetGlobalVariableNull(name);
|
| m_pGlobalData->SetGlobalVariablePersistent(name, pData->bPersistent);
|
|
|