Store object definition ID in each js_class.

fpdfsdk/src/javascript/JS_Runtime.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 "../../include/javascript/JavaScript.h"
 #include "../../include/javascript/IJavaScript.h"
 #include "../../include/javascript/JS_EventHandler.h"
 #include "../../include/javascript/JS_Runtime.h"
@@ skipping 63 matching lines @@
 }
 
 void CJS_Runtime::DefineJSObjects() {
   v8::Isolate::Scope isolate_scope(GetIsolate());
   v8::HandleScope handle_scope(GetIsolate());
   v8::Local<v8::Context> context = v8::Context::New(GetIsolate());
   v8::Context::Scope context_scope(context);
 
   // The call order determines the "ObjDefID" assigned to each class.
   // ObjDefIDs 0 - 2
-  CJS_Border::DefineJSObjects(GetIsolate(), FXJS_STATIC);
-  CJS_Display::DefineJSObjects(GetIsolate(), FXJS_STATIC);
-  CJS_Font::DefineJSObjects(GetIsolate(), FXJS_STATIC);
+  CJS_Border::DefineJSObjects(GetIsolate(), FXJSOBJTYPE_STATIC);
+  CJS_Display::DefineJSObjects(GetIsolate(), FXJSOBJTYPE_STATIC);
+  CJS_Font::DefineJSObjects(GetIsolate(), FXJSOBJTYPE_STATIC);
 
   // ObjDefIDs 3 - 5
-  CJS_Highlight::DefineJSObjects(GetIsolate(), FXJS_STATIC);
-  CJS_Position::DefineJSObjects(GetIsolate(), FXJS_STATIC);
-  CJS_ScaleHow::DefineJSObjects(GetIsolate(), FXJS_STATIC);
+  CJS_Highlight::DefineJSObjects(GetIsolate(), FXJSOBJTYPE_STATIC);
+  CJS_Position::DefineJSObjects(GetIsolate(), FXJSOBJTYPE_STATIC);
+  CJS_ScaleHow::DefineJSObjects(GetIsolate(), FXJSOBJTYPE_STATIC);
 
   // ObjDefIDs 6 - 8
-  CJS_ScaleWhen::DefineJSObjects(GetIsolate(), FXJS_STATIC);
-  CJS_Style::DefineJSObjects(GetIsolate(), FXJS_STATIC);
-  CJS_Zoomtype::DefineJSObjects(GetIsolate(), FXJS_STATIC);
+  CJS_ScaleWhen::DefineJSObjects(GetIsolate(), FXJSOBJTYPE_STATIC);
+  CJS_Style::DefineJSObjects(GetIsolate(), FXJSOBJTYPE_STATIC);
+  CJS_Zoomtype::DefineJSObjects(GetIsolate(), FXJSOBJTYPE_STATIC);
 
   // ObjDefIDs 9 - 11
-  CJS_App::DefineJSObjects(GetIsolate(), FXJS_STATIC);
-  CJS_Color::DefineJSObjects(GetIsolate(), FXJS_STATIC);
-  CJS_Console::DefineJSObjects(GetIsolate(), FXJS_STATIC);
+  CJS_App::DefineJSObjects(GetIsolate(), FXJSOBJTYPE_STATIC);
+  CJS_Color::DefineJSObjects(GetIsolate(), FXJSOBJTYPE_STATIC);
+  CJS_Console::DefineJSObjects(GetIsolate(), FXJSOBJTYPE_STATIC);
 
   // ObjDefIDs 12 - 14
-  CJS_Document::DefineJSObjects(GetIsolate(), FXJS_DYNAMIC);
-  CJS_Event::DefineJSObjects(GetIsolate(), FXJS_STATIC);
-  CJS_Field::DefineJSObjects(GetIsolate(), FXJS_DYNAMIC);
+  CJS_Document::DefineJSObjects(GetIsolate(), FXJSOBJTYPE_GLOBAL);
+  CJS_Event::DefineJSObjects(GetIsolate(), FXJSOBJTYPE_STATIC);
+  CJS_Field::DefineJSObjects(GetIsolate(), FXJSOBJTYPE_DYNAMIC);
 
   // ObjDefIDs 15 - 17
-  CJS_Global::DefineJSObjects(GetIsolate(), FXJS_STATIC);
-  CJS_Icon::DefineJSObjects(GetIsolate(), FXJS_DYNAMIC);
-  CJS_Util::DefineJSObjects(GetIsolate(), FXJS_STATIC);
+  CJS_Global::DefineJSObjects(GetIsolate(), FXJSOBJTYPE_STATIC);
+  CJS_Icon::DefineJSObjects(GetIsolate(), FXJSOBJTYPE_DYNAMIC);
+  CJS_Util::DefineJSObjects(GetIsolate(), FXJSOBJTYPE_STATIC);
 
   // ObjDefIDs 18 - 20 (these can't fail, return void).
   CJS_PublicMethods::DefineJSObjects(GetIsolate());
   CJS_GlobalConsts::DefineJSObjects(GetIsolate());
   CJS_GlobalArrays::DefineJSObjects(GetIsolate());
 
   // ObjDefIDs 21 - 22.
-  CJS_TimerObj::DefineJSObjects(GetIsolate(), FXJS_DYNAMIC);
-  CJS_PrintParamsObj::DefineJSObjects(GetIsolate(), FXJS_DYNAMIC);
+  CJS_TimerObj::DefineJSObjects(GetIsolate(), FXJSOBJTYPE_DYNAMIC);
+  CJS_PrintParamsObj::DefineJSObjects(GetIsolate(), FXJSOBJTYPE_DYNAMIC);
 }
 
 IFXJS_Context* CJS_Runtime::NewContext() {
   CJS_Context* p = new CJS_Context(this);
   m_ContextArray.Add(p);
   return p;
 }
 
 void CJS_Runtime::ReleaseContext(IFXJS_Context* pContext) {
   CJS_Context* pJSContext = (CJS_Context*)pContext;
@@ skipping 18 matching lines @@
     v8::Isolate::Scope isolate_scope(m_isolate);
     v8::HandleScope handle_scope(m_isolate);
     v8::Local<v8::Context> context =
         v8::Local<v8::Context>::New(m_isolate, m_context);
     v8::Context::Scope context_scope(context);
 
     m_pDocument = pReaderDoc;
     if (pReaderDoc) {
       v8::Local<v8::Object> pThis = FXJS_GetThisObj(GetIsolate());
       if (!pThis.IsEmpty()) {
-        if (FXJS_GetObjDefnID(pThis) ==
-            FXJS_GetObjDefnID(GetIsolate(), L"Document")) {
+        if (FXJS_GetObjDefnID(pThis) == CJS_Document::g_nObjDefnID) {
           if (CJS_Document* pJSDocument =
                   (CJS_Document*)FXJS_GetPrivate(GetIsolate(), pThis)) {
             if (Document* pDocument = (Document*)pJSDocument->GetEmbedObject())
               pDocument->AttachDoc(pReaderDoc);
           }
         }
       }
     }
   }
 }
 
 bool CJS_Runtime::AddEventToSet(const FieldEvent& event) {
   return m_FieldEventSet.insert(event).second;
 }
 
 void CJS_Runtime::RemoveEventFromSet(const FieldEvent& event) {
   m_FieldEventSet.erase(event);
 }
 
 v8::Local<v8::Context> CJS_Runtime::NewJSContext() {
   return v8::Local<v8::Context>::New(m_isolate, m_context);
 }
 
 CFX_WideString ChangeObjName(const CFX_WideString& str) {
   CFX_WideString sRet = str;
   sRet.Replace(L"_", L".");
   return sRet;
 }