diff options
author | Lei Zhang <thestig@chromium.org> | 2015-12-21 11:04:44 -0800 |
---|---|---|
committer | Lei Zhang <thestig@chromium.org> | 2015-12-21 11:04:44 -0800 |
commit | 1ac47ebfc2d106e25c3e13062cae2132daa49348 (patch) | |
tree | 4bda2756a1b751f9ded450692a6349fe32803231 /testing | |
parent | e13aa30ebc64800b7e208e338ec5d520de2d2ebd (diff) | |
download | pdfium-1ac47ebfc2d106e25c3e13062cae2132daa49348.tar.xz |
Merge to XFA: Fix JS seconds since epoch to date conversions.
BUG=515137,564736
TBR=ochang@chromium.org, tsepez@chromium.org
Review URL: https://codereview.chromium.org/1533233002 .
Review URL: https://codereview.chromium.org/1544493003 .
(cherry picked from commit b426e3edde040089b70d1a223c83b90957aa571d)
(cherry picked from commit bd35d484a4027775f19ff93e9143e0b270133d42)
Review URL: https://codereview.chromium.org/1546443002 .
Diffstat (limited to 'testing')
-rw-r--r-- | testing/embedder_test.cpp | 2 | ||||
-rw-r--r-- | testing/embedder_test.h | 2 | ||||
-rw-r--r-- | testing/js_embedder_test.cpp | 45 | ||||
-rw-r--r-- | testing/js_embedder_test.h | 32 |
4 files changed, 79 insertions, 2 deletions
diff --git a/testing/embedder_test.cpp b/testing/embedder_test.cpp index d3ac09b675..23b15a47d1 100644 --- a/testing/embedder_test.cpp +++ b/testing/embedder_test.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2015 PDFium Authors. All rights reserved. +// Copyright 2015 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. diff --git a/testing/embedder_test.h b/testing/embedder_test.h index f68cb9df74..df2e40a2e8 100644 --- a/testing/embedder_test.h +++ b/testing/embedder_test.h @@ -1,4 +1,4 @@ -// Copyright (c) 2015 PDFium Authors. All rights reserved. +// Copyright 2015 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. diff --git a/testing/js_embedder_test.cpp b/testing/js_embedder_test.cpp new file mode 100644 index 0000000000..ffa647d073 --- /dev/null +++ b/testing/js_embedder_test.cpp @@ -0,0 +1,45 @@ +// Copyright 2015 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. + +#include "testing/js_embedder_test.h" + +JSEmbedderTest::JSEmbedderTest() + : m_pArrayBufferAllocator(new FXJS_ArrayBufferAllocator) { + v8::Isolate::CreateParams params; + params.array_buffer_allocator = m_pArrayBufferAllocator.get(); + m_pIsolate = v8::Isolate::New(params); +} + +JSEmbedderTest::~JSEmbedderTest() { + m_pIsolate->Dispose(); +} + +void JSEmbedderTest::SetUp() { + EmbedderTest::SetExternalIsolate(m_pIsolate); + EmbedderTest::SetUp(); + + v8::Isolate::Scope isolate_scope(m_pIsolate); +#ifdef PDF_ENABLE_XFA + v8::Locker locker(m_pIsolate); +#endif // PDF_ENABLE_XFA + v8::HandleScope handle_scope(m_pIsolate); + FXJS_PerIsolateData::SetUp(m_pIsolate); + FXJS_InitializeRuntime(m_pIsolate, nullptr, &m_pPersistentContext, + &m_StaticObjects); +} + +void JSEmbedderTest::TearDown() { + FXJS_ReleaseRuntime(m_pIsolate, &m_pPersistentContext, &m_StaticObjects); + m_pPersistentContext.Reset(); + FXJS_Release(); + EmbedderTest::TearDown(); +} + +v8::Isolate* JSEmbedderTest::isolate() { + return m_pIsolate; +} + +v8::Local<v8::Context> JSEmbedderTest::GetV8Context() { + return m_pPersistentContext.Get(m_pIsolate); +} diff --git a/testing/js_embedder_test.h b/testing/js_embedder_test.h new file mode 100644 index 0000000000..167aea7ed5 --- /dev/null +++ b/testing/js_embedder_test.h @@ -0,0 +1,32 @@ +// Copyright 2015 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. + +#ifndef TESTING_JS_EMBEDDER_TEST_H_ +#define TESTING_JS_EMBEDDER_TEST_H_ + +#include <vector> + +#include "fpdfsdk/include/jsapi/fxjs_v8.h" +#include "testing/embedder_test.h" +#include "third_party/base/nonstd_unique_ptr.h" + +class JSEmbedderTest : public EmbedderTest { + public: + JSEmbedderTest(); + ~JSEmbedderTest() override; + + void SetUp() override; + void TearDown() override; + + v8::Isolate* isolate(); + v8::Local<v8::Context> GetV8Context(); + + private: + nonstd::unique_ptr<FXJS_ArrayBufferAllocator> m_pArrayBufferAllocator; + v8::Isolate* m_pIsolate; + v8::Global<v8::Context> m_pPersistentContext; + std::vector<v8::Global<v8::Object>*> m_StaticObjects; +}; + +#endif // TESTING_JS_EMBEDDER_TEST_H_ |