diff options
| author | JUN FANG <jun_fang@foxitsoftware.com> | 2015-04-06 12:39:51 -0700 |
|---|---|---|
| committer | JUN FANG <jun_fang@foxitsoftware.com> | 2015-04-06 12:44:08 -0700 |
| commit | 33f6f0d9822b729f85a9ff7593ad82240ae22bf6 (patch) | |
| tree | ba0d637dc9a18766a07b52c66135e58192bfc198 /fpdfsdk/include/javascript/JS_Value.h | |
| parent | e799e01bc6c8ef491154c555687ccaa8f9c87b6c (diff) | |
| download | pdfium-33f6f0d9822b729f85a9ff7593ad82240ae22bf6.tar.xz | |
Merge to XFA: Fix a fatal error due to cloning a global document object
BUG=454595
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1053373002
Diffstat (limited to 'fpdfsdk/include/javascript/JS_Value.h')
| -rw-r--r-- | fpdfsdk/include/javascript/JS_Value.h | 38 |
1 files changed, 18 insertions, 20 deletions
diff --git a/fpdfsdk/include/javascript/JS_Value.h b/fpdfsdk/include/javascript/JS_Value.h index 4962ddcf3d..165898cf33 100644 --- a/fpdfsdk/include/javascript/JS_Value.h +++ b/fpdfsdk/include/javascript/JS_Value.h @@ -52,6 +52,7 @@ public: void operator = (double); void operator = (float); void operator = (CJS_Object*); + void operator = (CJS_Document*); void operator = (v8::Handle<v8::Object>); void operator = (CJS_Array &); void operator = (CJS_Date &); @@ -87,37 +88,34 @@ public: class CJS_PropValue: public CJS_Value { public: - CJS_PropValue(const CJS_Value &); + CJS_PropValue(const CJS_Value&); CJS_PropValue(v8::Isolate* isolate); ~CJS_PropValue(); public: FX_BOOL IsSetting(); FX_BOOL IsGetting(); - void operator<<(int ); - void operator>>(int &) const; + void operator<<(int); + void operator>>(int&) const; void operator<<(bool); - void operator>>(bool &) const; - void operator<<(double ); - void operator>>(double &) const; - void operator<<(CJS_Object *pObj); - void operator>>(CJS_Object *&ppObj) const; + void operator>>(bool&) const; + void operator<<(double); + void operator>>(double&) const; + void operator<<(CJS_Object* pObj); + void operator>>(CJS_Object*& ppObj) const; + void operator<<(CJS_Document* pJsDoc); + void operator>>(CJS_Document*& ppJsDoc) const; void operator<<(CFX_ByteString); - void operator>>(CFX_ByteString &) const; + void operator>>(CFX_ByteString&) const; void operator<<(CFX_WideString); - void operator>>(CFX_WideString &) const; + void operator>>(CFX_WideString&) const; void operator<<(FX_LPCWSTR c_string); - void operator<<(JSFXObject); - void operator>>(JSFXObject &) const; - - void operator>>(CJS_Array &array) const; - void operator<<(CJS_Array &array); - - void operator<<(CJS_Date &date); - void operator>>(CJS_Date &date) const; - + void operator>>(JSFXObject&) const; + void operator>>(CJS_Array& array) const; + void operator<<(CJS_Array& array); + void operator<<(CJS_Date& date); + void operator>>(CJS_Date& date) const; operator v8::Handle<v8::Value>() const; - void StartSetting(); void StartGetting(); private: |