diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-09-22 15:54:26 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-09-22 15:54:26 -0700 |
| commit | 3b4382a847b5a7439a3107512dbe54c317108579 (patch) | |
| tree | b0fb81449394f1c9f7832684988293dffdfc6396 /fpdfsdk/include | |
| parent | 70bc04b16646c92f221c5aa56831b01d6ec7c1ca (diff) | |
| download | pdfium-3b4382a847b5a7439a3107512dbe54c317108579.tar.xz | |
Revert "Merge to master: contention over isolate data slots"
Reason for revert: embeddertests failed.
This reverts commit 70bc04b16646c92f221c5aa56831b01d6ec7c1ca.
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1358263004 .
Diffstat (limited to 'fpdfsdk/include')
| -rw-r--r-- | fpdfsdk/include/jsapi/fxjs_v8.h | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/fpdfsdk/include/jsapi/fxjs_v8.h b/fpdfsdk/include/jsapi/fxjs_v8.h index eb810c0695..a1541593a1 100644 --- a/fpdfsdk/include/jsapi/fxjs_v8.h +++ b/fpdfsdk/include/jsapi/fxjs_v8.h @@ -11,12 +11,7 @@ #define FPDFSDK_INCLUDE_JSAPI_FXJS_V8_H_ #include <v8.h> -#include "../../../core/include/fxcrt/fx_basic.h" - -// FXJS_V8 places no interpretation on these two classes; it merely -// passes them on to the caller-provided FXJS_CONSTRUCTORs. -class IFXJS_Context; -class IFXJS_Runtime; +#include "../../../core/include/fxcrt/fx_string.h" // For CFX_WideString enum FXJSOBJTYPE { FXJS_DYNAMIC = 0, @@ -29,18 +24,6 @@ struct FXJSErr { unsigned linnum; }; -class FXJS_PerIsolateData { - public: - static void SetUp(v8::Isolate* pIsolate); - static FXJS_PerIsolateData* Get(v8::Isolate* pIsolate); - - CFX_PtrArray m_ObjectDefnArray; - IFXJS_Runtime* m_pFXJSRuntime; - - protected: - FXJS_PerIsolateData() : m_pFXJSRuntime(nullptr) {} -}; - extern const wchar_t kFXJSValueNameString[]; extern const wchar_t kFXJSValueNameNumber[]; extern const wchar_t kFXJSValueNameBoolean[]; @@ -50,6 +33,10 @@ extern const wchar_t kFXJSValueNameFxobj[]; extern const wchar_t kFXJSValueNameNull[]; extern const wchar_t kFXJSValueNameUndefined[]; +// FXJS_V8 places no interpretation on these two classes; it merely +// passes them on to the caller-provided FXJS_CONSTRUCTORs. +class IFXJS_Context; +class IFXJS_Runtime; class FXJS_ArrayBufferAllocator : public v8::ArrayBuffer::Allocator { void* Allocate(size_t length) override; |