Fix strings, remove stringify macros, void return types for Consts.h.

Replace multiple #defines of the same strings with externs.
Fix strings mangled by interaction of # and clang-format.
Remove macros as possible.
Make more JS_ functions void and simplify.

R=thestig@chromium.org

Review URL: https://codereview.chromium.org/1342433002 .

3 files changed, 97 insertions, 136 deletions

diff --git a/fpdfsdk/include/javascript/Consts.h b/fpdfsdk/include/javascript/Consts.h
index 778e2216f4..c6abd8549a 100644
--- a/fpdfsdk/include/javascript/Consts.h
+++ b/fpdfsdk/include/javascript/Consts.h
@@ -103,14 +103,14 @@ class CJS_Zoomtype : public CJS_Object {
 
 class CJS_GlobalConsts : public CJS_Object {
  public:
-  static int DefineJSObjects(v8::Isolate* pIsolate);
+  static void DefineJSObjects(v8::Isolate* pIsolate);
 };
 
 /* ------------------------------ CJS_GlobalArrays -------------------------- */
 
 class CJS_GlobalArrays : public CJS_Object {
  public:
-  static int DefineJSObjects(v8::Isolate* pIsolate);
+  static void DefineJSObjects(v8::Isolate* pIsolate);
 };
 
 #endif  // FPDFSDK_INCLUDE_JAVASCRIPT_CONSTS_H_
diff --git a/fpdfsdk/include/javascript/JS_Define.h b/fpdfsdk/include/javascript/JS_Define.h
index 0731212f67..ff9ab48817 100644
--- a/fpdfsdk/include/javascript/JS_Define.h
+++ b/fpdfsdk/include/javascript/JS_Define.h
@@ -189,52 +189,46 @@ void JSMethod(const char* method_name_string,
 /* ===================================== JS CLASS
  * =============================================== */
 
-#define DECLARE_JS_CLASS(js_class_name)                                    \
-  static void JSConstructor(IFXJS_Context* cc, v8::Local<v8::Object> obj,  \
-                            v8::Local<v8::Object> global);                 \
-  static void JSDestructor(v8::Local<v8::Object> obj);                     \
-  static int DefineJSObjects(v8::Isolate* pIsolate, FXJSOBJTYPE eObjType); \
-  static JSConstSpec JS_Class_Consts[];                                    \
-  static JSPropertySpec JS_Class_Properties[];                             \
-  static JSMethodSpec JS_Class_Methods[];                                  \
+#define DECLARE_JS_CLASS(js_class_name)                                     \
+  static void JSConstructor(IFXJS_Context* cc, v8::Local<v8::Object> obj,   \
+                            v8::Local<v8::Object> global);                  \
+  static void JSDestructor(v8::Local<v8::Object> obj);                      \
+  static void DefineJSObjects(v8::Isolate* pIsolate, FXJSOBJTYPE eObjType); \
+  static JSConstSpec JS_Class_Consts[];                                     \
+  static JSPropertySpec JS_Class_Properties[];                              \
+  static JSMethodSpec JS_Class_Methods[];                                   \
   static const wchar_t* m_pClassName
 
-#define IMPLEMENT_JS_CLASS_RICH(js_class_name, class_alternate, class_name)   \
-  const wchar_t* js_class_name::m_pClassName = JS_WIDESTRING(class_name);     \
-  void js_class_name::JSConstructor(IFXJS_Context* cc,                        \
-                                    v8::Local<v8::Object> obj,                \
-                                    v8::Local<v8::Object> global) {           \
-    CJS_Object* pObj = new js_class_name(obj);                                \
-    pObj->SetEmbedObject(new class_alternate(pObj));                          \
-    JS_SetPrivate(NULL, obj, (void*)pObj);                                    \
-    pObj->InitInstance(cc);                                                   \
-  }                                                                           \
-                                                                              \
-  void js_class_name::JSDestructor(v8::Local<v8::Object> obj) {               \
-    js_class_name* pObj = (js_class_name*)JS_GetPrivate(NULL, obj);           \
-    pObj->ExitInstance();                                                     \
-    delete pObj;                                                              \
-  }                                                                           \
-                                                                              \
-  int js_class_name::DefineJSObjects(v8::Isolate* pIsolate,                   \
-                                     FXJSOBJTYPE eObjType) {                  \
-    int nObjDefnID = JS_DefineObj(pIsolate, js_class_name::m_pClassName,      \
-                                  eObjType, JSConstructor, JSDestructor);     \
-    if (nObjDefnID < 0)                                                       \
-      return -1;                                                              \
-    for (int i = 0; i < FX_ArraySize(JS_Class_Properties) - 1; ++i) {         \
-      if (JS_DefineObjProperty(pIsolate, nObjDefnID,                          \
-                               JS_Class_Properties[i].pName,                  \
-                               JS_Class_Properties[i].pPropGet,               \
-                               JS_Class_Properties[i].pPropPut) < 0)          \
-        return -1;                                                            \
-    }                                                                         \
-    for (int i = 0; i < FX_ArraySize(JS_Class_Methods) - 1; ++i) {            \
-      if (JS_DefineObjMethod(pIsolate, nObjDefnID, JS_Class_Methods[i].pName, \
-                             JS_Class_Methods[i].pMethodCall) < 0)            \
-        return -1;                                                            \
-    }                                                                         \
-    return nObjDefnID;                                                        \
+#define IMPLEMENT_JS_CLASS_RICH(js_class_name, class_alternate, class_name)    \
+  const wchar_t* js_class_name::m_pClassName = JS_WIDESTRING(class_name);      \
+  void js_class_name::JSConstructor(IFXJS_Context* cc,                         \
+                                    v8::Local<v8::Object> obj,                 \
+                                    v8::Local<v8::Object> global) {            \
+    CJS_Object* pObj = new js_class_name(obj);                                 \
+    pObj->SetEmbedObject(new class_alternate(pObj));                           \
+    JS_SetPrivate(NULL, obj, (void*)pObj);                                     \
+    pObj->InitInstance(cc);                                                    \
+  }                                                                            \
+                                                                               \
+  void js_class_name::JSDestructor(v8::Local<v8::Object> obj) {                \
+    js_class_name* pObj = (js_class_name*)JS_GetPrivate(NULL, obj);            \
+    pObj->ExitInstance();                                                      \
+    delete pObj;                                                               \
+  }                                                                            \
+                                                                               \
+  void js_class_name::DefineJSObjects(v8::Isolate* pIsolate,                   \
+                                      FXJSOBJTYPE eObjType) {                  \
+    int nObjDefnID = JS_DefineObj(pIsolate, js_class_name::m_pClassName,       \
+                                  eObjType, JSConstructor, JSDestructor);      \
+    for (int i = 0; i < FX_ArraySize(JS_Class_Properties) - 1; ++i) {          \
+      JS_DefineObjProperty(pIsolate, nObjDefnID, JS_Class_Properties[i].pName, \
+                           JS_Class_Properties[i].pPropGet,                    \
+                           JS_Class_Properties[i].pPropPut);                   \
+    }                                                                          \
+    for (int i = 0; i < FX_ArraySize(JS_Class_Methods) - 1; ++i) {             \
+      JS_DefineObjMethod(pIsolate, nObjDefnID, JS_Class_Methods[i].pName,      \
+                         JS_Class_Methods[i].pMethodCall);                     \
+    }                                                                          \
   }
 
 #define IMPLEMENT_JS_CLASS(js_class_name, class_name) \
@@ -243,35 +237,24 @@ void JSMethod(const char* method_name_string,
 /* ======================================== CONST CLASS
  * ============================================ */
 
-#define DECLARE_JS_CLASS_CONST()                                           \
-  static int DefineJSObjects(v8::Isolate* pIsolate, FXJSOBJTYPE eObjType); \
-  static JSConstSpec JS_Class_Consts[];                                    \
+#define DECLARE_JS_CLASS_CONST()                                            \
+  static void DefineJSObjects(v8::Isolate* pIsolate, FXJSOBJTYPE eObjType); \
+  static JSConstSpec JS_Class_Consts[];                                     \
   static const wchar_t* m_pClassName
 
-#define IMPLEMENT_JS_CLASS_CONST(js_class_name, class_name)                   \
-  const wchar_t* js_class_name::m_pClassName = JS_WIDESTRING(class_name);     \
-  int js_class_name::DefineJSObjects(v8::Isolate* pIsolate,                   \
-                                     FXJSOBJTYPE eObjType) {                  \
-    int nObjDefnID = JS_DefineObj(pIsolate, js_class_name::m_pClassName,      \
-                                  eObjType, NULL, NULL);                      \
-    if (nObjDefnID >= 0) {                                                    \
-      for (int i = 0, sz = sizeof(JS_Class_Consts) / sizeof(JSConstSpec) - 1; \
-           i < sz; i++) {                                                     \
-        if (JS_Class_Consts[i].t == 0) {                                      \
-          if (JS_DefineObjConst(                                              \
-                  pIsolate, nObjDefnID, JS_Class_Consts[i].pName,             \
-                  JS_NewNumber(pIsolate, JS_Class_Consts[i].number)) < 0)     \
-            return -1;                                                        \
-        } else {                                                              \
-          if (JS_DefineObjConst(                                              \
-                  pIsolate, nObjDefnID, JS_Class_Consts[i].pName,             \
-                  JS_NewString(pIsolate, JS_Class_Consts[i].string)) < 0)     \
-            return -1;                                                        \
-        }                                                                     \
-      }                                                                       \
-      return nObjDefnID;                                                      \
-    }                                                                         \
-    return -1;                                                                \
+#define IMPLEMENT_JS_CLASS_CONST(js_class_name, class_name)               \
+  const wchar_t* js_class_name::m_pClassName = JS_WIDESTRING(class_name); \
+  void js_class_name::DefineJSObjects(v8::Isolate* pIsolate,              \
+                                      FXJSOBJTYPE eObjType) {             \
+    int nObjDefnID = JS_DefineObj(pIsolate, js_class_name::m_pClassName,  \
+                                  eObjType, NULL, NULL);                  \
+    for (int i = 0; i < FX_ArraySize(JS_Class_Consts) - 1; ++i) {         \
+      JS_DefineObjConst(                                                  \
+          pIsolate, nObjDefnID, JS_Class_Consts[i].pName,                 \
+          JS_Class_Consts[i].t == 0                                       \
+              ? JS_NewNumber(pIsolate, JS_Class_Consts[i].number)         \
+              : JS_NewString(pIsolate, JS_Class_Consts[i].string));       \
+    }                                                                     \
   }
 
 /* ===================================== SPECIAL JS CLASS
@@ -367,26 +350,26 @@ void JSSpecialPropDel(const char* class_name,
   }
 }
 
-#define DECLARE_SPECIAL_JS_CLASS(js_class_name)                            \
-  static void JSConstructor(IFXJS_Context* cc, v8::Local<v8::Object> obj,  \
-                            v8::Local<v8::Object> global);                 \
-  static void JSDestructor(v8::Local<v8::Object> obj);                     \
-  static JSConstSpec JS_Class_Consts[];                                    \
-  static JSPropertySpec JS_Class_Properties[];                             \
-  static JSMethodSpec JS_Class_Methods[];                                  \
-  static int DefineJSObjects(v8::Isolate* pIsolate, FXJSOBJTYPE eObjType); \
-  static const wchar_t* m_pClassName;                                      \
-  static void queryprop_##js_class_name##_static(                          \
-      v8::Local<v8::String> property,                                      \
-      const v8::PropertyCallbackInfo<v8::Integer>& info);                  \
-  static void getprop_##js_class_name##_static(                            \
-      v8::Local<v8::String> property,                                      \
-      const v8::PropertyCallbackInfo<v8::Value>& info);                    \
-  static void putprop_##js_class_name##_static(                            \
-      v8::Local<v8::String> property, v8::Local<v8::Value> value,          \
-      const v8::PropertyCallbackInfo<v8::Value>& info);                    \
-  static void delprop_##js_class_name##_static(                            \
-      v8::Local<v8::String> property,                                      \
+#define DECLARE_SPECIAL_JS_CLASS(js_class_name)                             \
+  static void JSConstructor(IFXJS_Context* cc, v8::Local<v8::Object> obj,   \
+                            v8::Local<v8::Object> global);                  \
+  static void JSDestructor(v8::Local<v8::Object> obj);                      \
+  static JSConstSpec JS_Class_Consts[];                                     \
+  static JSPropertySpec JS_Class_Properties[];                              \
+  static JSMethodSpec JS_Class_Methods[];                                   \
+  static void DefineJSObjects(v8::Isolate* pIsolate, FXJSOBJTYPE eObjType); \
+  static const wchar_t* m_pClassName;                                       \
+  static void queryprop_##js_class_name##_static(                           \
+      v8::Local<v8::String> property,                                       \
+      const v8::PropertyCallbackInfo<v8::Integer>& info);                   \
+  static void getprop_##js_class_name##_static(                             \
+      v8::Local<v8::String> property,                                       \
+      const v8::PropertyCallbackInfo<v8::Value>& info);                     \
+  static void putprop_##js_class_name##_static(                             \
+      v8::Local<v8::String> property, v8::Local<v8::Value> value,           \
+      const v8::PropertyCallbackInfo<v8::Value>& info);                     \
+  static void delprop_##js_class_name##_static(                             \
+      v8::Local<v8::String> property,                                       \
       const v8::PropertyCallbackInfo<v8::Boolean>& info)
 
 #define IMPLEMENT_SPECIAL_JS_CLASS(js_class_name, class_alternate, class_name) \
@@ -427,34 +410,26 @@ void JSSpecialPropDel(const char* class_name,
     delete pObj;                                                               \
   }                                                                            \
                                                                                \
-  int js_class_name::DefineJSObjects(v8::Isolate* pIsolate,                    \
-                                     FXJSOBJTYPE eObjType) {                   \
+  void js_class_name::DefineJSObjects(v8::Isolate* pIsolate,                   \
+                                      FXJSOBJTYPE eObjType) {                  \
     int nObjDefnID = JS_DefineObj(pIsolate, js_class_name::m_pClassName,       \
                                   eObjType, JSConstructor, JSDestructor);      \
-                                                                               \
-    if (nObjDefnID < 0)                                                        \
-      return -1;                                                               \
     for (int i = 0; i < FX_ArraySize(JS_Class_Properties) - 1; ++i) {          \
-      if (JS_DefineObjProperty(pIsolate, nObjDefnID,                           \
-                               JS_Class_Properties[i].pName,                   \
-                               JS_Class_Properties[i].pPropGet,                \
-                               JS_Class_Properties[i].pPropPut) < 0)           \
-        return -1;                                                             \
+      JS_DefineObjProperty(pIsolate, nObjDefnID, JS_Class_Properties[i].pName, \
+                           JS_Class_Properties[i].pPropGet,                    \
+                           JS_Class_Properties[i].pPropPut);                   \
     }                                                                          \
                                                                                \
     for (int i = 0; i < FX_ArraySize(JS_Class_Methods) - 1; ++i) {             \
-      if (JS_DefineObjMethod(pIsolate, nObjDefnID, JS_Class_Methods[i].pName,  \
-                             JS_Class_Methods[i].pMethodCall) < 0)             \
-        return -1;                                                             \
+      JS_DefineObjMethod(pIsolate, nObjDefnID, JS_Class_Methods[i].pName,      \
+                         JS_Class_Methods[i].pMethodCall);                     \
     }                                                                          \
-    if (JS_DefineObjAllProperties(                                             \
-            pIsolate, nObjDefnID,                                              \
-            js_class_name::queryprop_##js_class_name##_static,                 \
-            js_class_name::getprop_##js_class_name##_static,                   \
-            js_class_name::putprop_##js_class_name##_static,                   \
-            js_class_name::delprop_##js_class_name##_static) < 0)              \
-      return -1;                                                               \
-    return nObjDefnID;                                                         \
+    JS_DefineObjAllProperties(                                                 \
+        pIsolate, nObjDefnID,                                                  \
+        js_class_name::queryprop_##js_class_name##_static,                     \
+        js_class_name::getprop_##js_class_name##_static,                       \
+        js_class_name::putprop_##js_class_name##_static,                       \
+        js_class_name::delprop_##js_class_name##_static);                      \
   }
 
 /* ======================================== GLOBAL METHODS
@@ -493,7 +468,7 @@ void JSGlobalFunc(const char* func_name_string,
 
 #define JS_STATIC_DECLARE_GLOBAL_FUN()  \
   static JSMethodSpec global_methods[]; \
-  static int DefineJSObjects(v8::Isolate* pIsolate)
+  static void DefineJSObjects(v8::Isolate* pIsolate)
 
 #define BEGIN_JS_STATIC_GLOBAL_FUN(js_class_name) \
   JSMethodSpec js_class_name::global_methods[] = {
@@ -502,28 +477,14 @@ void JSGlobalFunc(const char* func_name_string,
 
 #define END_JS_STATIC_GLOBAL_FUN() END_JS_STATIC_METHOD()
 
-#define IMPLEMENT_JS_STATIC_GLOBAL_FUN(js_class_name)            \
-  int js_class_name::DefineJSObjects(v8::Isolate* pIsolate) {    \
-    for (int i = 0; i < FX_ArraySize(global_methods) - 1; ++i) { \
-      if (JS_DefineGlobalMethod(                                 \
-              pIsolate, js_class_name::global_methods[i].pName,  \
-              js_class_name::global_methods[i].pMethodCall) < 0) \
-        return -1;                                               \
-    }                                                            \
-    return 0;                                                    \
+#define IMPLEMENT_JS_STATIC_GLOBAL_FUN(js_class_name)                         \
+  void js_class_name::DefineJSObjects(v8::Isolate* pIsolate) {                \
+    for (int i = 0; i < FX_ArraySize(global_methods) - 1; ++i) {              \
+      JS_DefineGlobalMethod(pIsolate, js_class_name::global_methods[i].pName, \
+                            js_class_name::global_methods[i].pMethodCall);    \
+    }                                                                         \
   }
 
-/* ============================================================ */
-
-#define VALUE_NAME_STRING L"string"
-#define VALUE_NAME_NUMBER L"number"
-#define VALUE_NAME_BOOLEAN L"boolean"
-#define VALUE_NAME_DATE L"date"
-#define VALUE_NAME_OBJECT L"object"
-#define VALUE_NAME_FXOBJ L"fxobj"
-#define VALUE_NAME_NULL L"null"
-#define VALUE_NAME_UNDEFINED L"undefined"
-
 FXJSVALUETYPE GET_VALUE_TYPE(v8::Local<v8::Value> p);
 
 #endif  // FPDFSDK_INCLUDE_JAVASCRIPT_JS_DEFINE_H_
diff --git a/fpdfsdk/include/javascript/JS_Runtime.h b/fpdfsdk/include/javascript/JS_Runtime.h
index e93f8b3cbe..5ae6f1bc79 100644
--- a/fpdfsdk/include/javascript/JS_Runtime.h
+++ b/fpdfsdk/include/javascript/JS_Runtime.h
@@ -56,7 +56,7 @@ class CJS_Runtime : public IFXJS_Runtime {
   v8::Local<v8::Context> NewJSContext();
 
  private:
-  FX_BOOL DefineJSObjects();
+  void DefineJSObjects();
 
   CFX_ArrayTemplate<CJS_Context*> m_ContextArray;
   CPDFDoc_Environment* m_pApp;