Move fpdfsdk/src up to fpdfsdk/.

fpdfsdk/javascript/global.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // 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 ---------------------------- */
 
 // Helper class for compile-time calculation of hash values in order to
 // avoid having global object initializers.
 template <unsigned ACC, wchar_t... Ns>
 struct CHash;
 
 // Only needed to hash single-character strings.
 template <wchar_t N>
@@ skipping 60 matching lines @@
 IMPLEMENT_SPECIAL_JS_CLASS(CJS_Global, JSGlobalAlternate, global);
 
 void CJS_Global::InitInstance(IJS_Runtime* pIRuntime) {
   CJS_Runtime* pRuntime = static_cast<CJS_Runtime*>(pIRuntime);
   JSGlobalAlternate* pGlobal =
       static_cast<JSGlobalAlternate*>(GetEmbedObject());
   pGlobal->Initial(pRuntime->GetReaderApp());
 }
 
 JSGlobalAlternate::JSGlobalAlternate(CJS_Object* pJSObject)
-    : CJS_EmbedObj(pJSObject), m_pApp(NULL) {
-}
+    : CJS_EmbedObj(pJSObject), m_pApp(NULL) {}
 
 JSGlobalAlternate::~JSGlobalAlternate() {
   DestroyGlobalPersisitentVariables();
   m_pGlobalData->Release();
 }
 
 void JSGlobalAlternate::Initial(CPDFDoc_Environment* pApp) {
   m_pApp = pApp;
   m_pGlobalData = CJS_GlobalData::GetRetainedInstance(pApp);
   UpdateGlobalPersistentVariables();
@@ skipping 179 matching lines @@
           m_pGlobalData->SetGlobalVariablePersistent(name, pData->bPersistent);
           break;
         case JS_GLOBALDATA_TYPE_BOOLEAN:
           m_pGlobalData->SetGlobalVariableBoolean(name, pData->bData);
           m_pGlobalData->SetGlobalVariablePersistent(name, pData->bPersistent);
           break;
         case JS_GLOBALDATA_TYPE_STRING:
           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);
           break;
       }
     }
   }
 }
 
 void JSGlobalAlternate::ObjectToArray(IJS_Context* cc,
@@ skipping 189 matching lines @@
     return CJS_Value::VT_boolean;
   if (nHash == JSCONST_nDateHash)
     return CJS_Value::VT_date;
   if (nHash == JSCONST_nObjectHash)
     return CJS_Value::VT_object;
   if (nHash == JSCONST_nFXobjHash)
     return CJS_Value::VT_fxobject;
 
   return CJS_Value::VT_unknown;
 }