Remove type info from CJS_Value, interrogate v8 instead

fpdfsdk/javascript/JS_Value.h

 // 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
 
 #ifndef FPDFSDK_JAVASCRIPT_JS_VALUE_H_
 #define FPDFSDK_JAVASCRIPT_JS_VALUE_H_
 
 #include <vector>
 
 #include "core/fxcrt/include/fx_basic.h"
 #include "fxjs/include/fxjs_v8.h"
 
 class CJS_Array;
 class CJS_Date;
 class CJS_Document;
 class CJS_Object;
 class CJS_Runtime;
 
 class CJS_Value {
  public:
   enum Type {
     VT_unknown,
     VT_string,
     VT_number,
     VT_boolean,
     VT_date,
     VT_object,
-    VT_fxobject,
     VT_null,
     VT_undefined
   };
 
   CJS_Value(CJS_Runtime* pRuntime);
-  CJS_Value(CJS_Runtime* pRuntime, v8::Local<v8::Value> pValue, Type t);
+  CJS_Value(CJS_Runtime* pRuntime, v8::Local<v8::Value> pValue);
   CJS_Value(CJS_Runtime* pRuntime, const int& iValue);
   CJS_Value(CJS_Runtime* pRuntime, const double& dValue);
   CJS_Value(CJS_Runtime* pRuntime, const float& fValue);
   CJS_Value(CJS_Runtime* pRuntime, const bool& bValue);
   CJS_Value(CJS_Runtime* pRuntime, v8::Local<v8::Object>);
   CJS_Value(CJS_Runtime* pRuntime, CJS_Object*);
   CJS_Value(CJS_Runtime* pRuntime, CJS_Document*);
   CJS_Value(CJS_Runtime* pRuntime, const FX_CHAR* pStr);
   CJS_Value(CJS_Runtime* pRuntime, const FX_WCHAR* pWstr);
   CJS_Value(CJS_Runtime* pRuntime, CJS_Array& array);
 
   ~CJS_Value();
   CJS_Value(const CJS_Value& other);
 
   void SetNull();
-  void Attach(v8::Local<v8::Value> pValue, Type t);
+  void Attach(v8::Local<v8::Value> pValue);
   void Attach(CJS_Value* pValue);
   void Detach();
 
-  Type GetType() const;
+  static Type GetValueType(v8::Local<v8::Value> value);
+  Type GetType() const { return GetValueType(m_pValue); }
   int ToInt() const;
   bool ToBool() const;
   double ToDouble() const;
   float ToFloat() const;
   CJS_Object* ToCJSObject() const;
   CFX_WideString ToCFXWideString() const;
   CFX_ByteString ToCFXByteString() const;
   v8::Local<v8::Object> ToV8Object() const;
   v8::Local<v8::Array> ToV8Array() const;
   v8::Local<v8::Value> ToV8Value() const;
 
   // Replace the current |m_pValue| with a v8::Number if possible
-  // to make one from the current |m_pValue|, updating |m_eType|
-  // as appropriate to indicate the result.
+  // to make one from the current |m_pValue|.
   void MaybeCoerceToNumber();
 
   void operator=(int iValue);
   void operator=(bool bValue);
   void operator=(double val);
   void operator=(float val);
   void operator=(CJS_Object* val);
   void operator=(CJS_Document* val);
   void operator=(v8::Local<v8::Object> val);
   void operator=(CJS_Array& val);
   void operator=(CJS_Date& val);
   void operator=(const FX_WCHAR* pWstr);
   void operator=(const FX_CHAR* pStr);
   void operator=(CJS_Value value);
 
   FX_BOOL IsArrayObject() const;
   FX_BOOL IsDateObject() const;
   FX_BOOL ConvertToArray(CJS_Array&) const;
   FX_BOOL ConvertToDate(CJS_Date&) const;
 
   CJS_Runtime* GetJSRuntime() const { return m_pJSRuntime; }
 
  protected:
-  Type m_eType;
   v8::Local<v8::Value> m_pValue;
   CJS_Runtime* m_pJSRuntime;
 };
 
 class CJS_PropValue : public CJS_Value {
  public:
   CJS_PropValue(const CJS_Value&);
   CJS_PropValue(CJS_Runtime* pRuntime);
   ~CJS_PropValue();
 
@@ skipping 118 matching lines @@
 // names as wchar_t string literals corresponding to each positional argument.
 // The result will always contain |nKeywords| value, with unspecified ones
 // being set to type VT_unknown.
 std::vector<CJS_Value> JS_ExpandKeywordParams(
     CJS_Runtime* pRuntime,
     const std::vector<CJS_Value>& originals,
     size_t nKeywords,
     ...);
 
 #endif  // FPDFSDK_JAVASCRIPT_JS_VALUE_H_