Merge to XFA: Don't pass null isolates to FXJS_ when we have a real isolate.

fpdfsdk/include/jsapi/fxjs_v8.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
 
 // PDFium wrapper around V8 APIs. PDFium code should include this file rather
 // than including V8 headers directly.
 
 #ifndef FPDFSDK_INCLUDE_JSAPI_FXJS_V8_H_
@@ skipping 107 matching lines @@
                                            int nObjDefnID);
 v8::Local<v8::Object> FXJS_GetThisObj(v8::Isolate* pIsolate);
 int FXJS_GetObjDefnID(v8::Local<v8::Object> pObj);
 int FXJS_GetObjDefnID(v8::Isolate* pIsolate, const wchar_t* pObjName);
 v8::Isolate* FXJS_GetRuntime(v8::Local<v8::Object> pObj);
 const wchar_t* FXJS_GetTypeof(v8::Local<v8::Value> pObj);
 
 void FXJS_SetPrivate(v8::Isolate* pIsolate,
                      v8::Local<v8::Object> pObj,
                      void* p);
-void FXJS_SetPrivate(v8::Local<v8::Object> pObj, void* p);
 void* FXJS_GetPrivate(v8::Isolate* pIsolate, v8::Local<v8::Object> pObj);
-void* FXJS_GetPrivate(v8::Local<v8::Object> pObj);
 void FXJS_FreePrivate(void* p);
 void FXJS_FreePrivate(v8::Local<v8::Object> pObj);
 
 void FXJS_Error(v8::Isolate* isolate, const CFX_WideString& message);
 v8::Local<v8::String> FXJS_WSToJSString(v8::Isolate* pIsolate,
                                         const wchar_t* PropertyName,
                                         int Len = -1);
 
 v8::Local<v8::Value> FXJS_GetObjectElement(v8::Isolate* pIsolate,
                                            v8::Local<v8::Object> pObj,
@@ skipping 57 matching lines @@
 double FXJS_ToNumber(v8::Isolate* pIsolate, v8::Local<v8::Value> pValue);
 v8::Local<v8::Object> FXJS_ToObject(v8::Isolate* pIsolate,
                                     v8::Local<v8::Value> pValue);
 CFX_WideString FXJS_ToString(v8::Isolate* pIsolate,
                              v8::Local<v8::Value> pValue);
 v8::Local<v8::Array> FXJS_ToArray(v8::Isolate* pIsolate,
                                   v8::Local<v8::Value> pValue);
 void FXJS_ValueCopy(v8::Local<v8::Value>& pTo, v8::Local<v8::Value> pFrom);
 
 #endif  // FPDFSDK_INCLUDE_JSAPI_FXJS_V8_H_