Inflict PDF_ENABLE_XFA ifdefs on XFA fpdfsdk/

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
 
 // FXJS_V8 is a layer that makes it easier to define native objects in V8, but
 // has no knowledge of PDF-specific native objects. It could in theory be used
 // to implement other sets of native objects.
 
 // PDFium code should include this file rather than including V8 headers
 // directly.
 
 #ifndef FPDFSDK_INCLUDE_JSAPI_FXJS_V8_H_
 #define FPDFSDK_INCLUDE_JSAPI_FXJS_V8_H_
 
 #include <v8.h>
 
 #include <vector>
 
 #include "core/include/fxcrt/fx_string.h"
 
 class CFXJS_ObjDefinition;
 
 // FXJS_V8 places no restrictions on these two classes; it merely passes them
 // on to caller-provided methods.
 class IJS_Context;  // A description of the event that caused JS execution.
 class IJS_Runtime;  // A native runtime, typically owns the v8::Context.
 
+#ifdef PDF_ENABLE_XFA
 // FXJS_V8 places no interpreation on this calass; it merely passes it
 // along to XFA.
 class CFXJSE_RuntimeData;
 
+#endif
 enum FXJSOBJTYPE {
   FXJSOBJTYPE_DYNAMIC = 0,  // Created by native method and returned to JS.
   FXJSOBJTYPE_STATIC,       // Created by init and hung off of global object.
   FXJSOBJTYPE_GLOBAL,       // The global object itself (may only appear once).
 };
 
 struct FXJSErr {
   const wchar_t* message;
   const wchar_t* srcline;
   unsigned linnum;
 };
 
 class FXJS_PerIsolateData {
  public:
   static void SetUp(v8::Isolate* pIsolate);
   static FXJS_PerIsolateData* Get(v8::Isolate* pIsolate);
 
   std::vector<CFXJS_ObjDefinition*> m_ObjectDefnArray;
+#ifdef PDF_ENABLE_XFA
   CFXJSE_RuntimeData* m_pFXJSERuntimeData;
+#endif
 
  protected:
+#ifndef PDF_ENABLE_XFA
+  FXJS_PerIsolateData() {}
+#else
   FXJS_PerIsolateData() : m_pFXJSERuntimeData(nullptr) {}
+#endif
 };
 
 extern const wchar_t kFXJSValueNameString[];
 extern const wchar_t kFXJSValueNameNumber[];
 extern const wchar_t kFXJSValueNameBoolean[];
 extern const wchar_t kFXJSValueNameDate[];
 extern const wchar_t kFXJSValueNameObject[];
 extern const wchar_t kFXJSValueNameFxobj[];
 extern const wchar_t kFXJSValueNameNull[];
 extern const wchar_t kFXJSValueNameUndefined[];
@@ skipping 62 matching lines @@
 
 // Called after FXJS_Define* calls made.
 void FXJS_InitializeRuntime(
     v8::Isolate* pIsolate,
     IJS_Runtime* pIRuntime,
     v8::Global<v8::Context>* pV8PersistentContext,
     std::vector<v8::Global<v8::Object>*>* pStaticObjects);
 void FXJS_ReleaseRuntime(v8::Isolate* pIsolate,
                          v8::Global<v8::Context>* pV8PersistentContext,
                          std::vector<v8::Global<v8::Object>*>* pStaticObjects);
+#ifdef PDF_ENABLE_XFA
 

[Lei Zhang, 2015/11/25 00:12:02]

another silly diff

[Tom Sepez, 2015/11/25 21:45:29]

Will handle in new CL and regenerate afterwards.

+#endif
 IJS_Runtime* FXJS_GetRuntimeFromIsolate(v8::Isolate* pIsolate);
 
+#ifdef PDF_ENABLE_XFA
 // Called as part of FXJS_InitializeRuntime, exposed so PDF can make its
 // own contexts compatible with XFA or vice versa.
 void FXJS_SetRuntimeForV8Context(v8::Local<v8::Context> v8Context,
                                  IJS_Runtime* pIRuntime);
 
+#endif
 // Called after FXJS_InitializeRuntime call made.
 int FXJS_Execute(v8::Isolate* pIsolate,
                  IJS_Context* pJSContext,
                  const wchar_t* script,
                  FXJSErr* perror);
 
 v8::Local<v8::Object> FXJS_NewFxDynamicObj(v8::Isolate* pIsolate,
                                            IJS_Runtime* pJSContext,
                                            int nObjDefnID);
 v8::Local<v8::Object> FXJS_GetThisObj(v8::Isolate* pIsolate);
@@ skipping 74 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_