Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(418)

Side by Side Diff: fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp

Issue 1407063012: Merge to XFA: Keep "static" objects per-context rather than per isolate. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa
Patch Set: Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « fpdfsdk/src/jsapi/fxjs_v8.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 PDFium Authors. All rights reserved. 1 // Copyright 2015 PDFium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "../../../testing/embedder_test.h" 5 #include "../../../testing/embedder_test.h"
6 #include "../../include/jsapi/fxjs_v8.h" 6 #include "../../include/jsapi/fxjs_v8.h"
7 #include "core/include/fpdfapi/fpdf_parser.h" 7 #include "core/include/fpdfapi/fpdf_parser.h"
8 #include "testing/gtest/include/gtest/gtest.h" 8 #include "testing/gtest/include/gtest/gtest.h"
9 #include "third_party/base/nonstd_unique_ptr.h" 9 #include "third_party/base/nonstd_unique_ptr.h"
10 10
(...skipping 15 matching lines...) Expand all
26 ~FXJSV8Embeddertest() override { m_pIsolate->Dispose(); } 26 ~FXJSV8Embeddertest() override { m_pIsolate->Dispose(); }
27 27
28 void SetUp() override { 28 void SetUp() override {
29 EmbedderTest::SetExternalIsolate(m_pIsolate); 29 EmbedderTest::SetExternalIsolate(m_pIsolate);
30 EmbedderTest::SetUp(); 30 EmbedderTest::SetUp();
31 31
32 v8::Isolate::Scope isolate_scope(m_pIsolate); 32 v8::Isolate::Scope isolate_scope(m_pIsolate);
33 v8::Locker locker(m_pIsolate); 33 v8::Locker locker(m_pIsolate);
34 v8::HandleScope handle_scope(m_pIsolate); 34 v8::HandleScope handle_scope(m_pIsolate);
35 FXJS_PerIsolateData::SetUp(m_pIsolate); 35 FXJS_PerIsolateData::SetUp(m_pIsolate);
36 FXJS_InitializeRuntime(m_pIsolate, nullptr, m_pPersistentContext); 36 FXJS_InitializeRuntime(m_pIsolate, nullptr, &m_pPersistentContext,
37 &m_StaticObjects);
37 } 38 }
38 39
39 void TearDown() override { 40 void TearDown() override {
40 FXJS_ReleaseRuntime(m_pIsolate, m_pPersistentContext); 41 FXJS_ReleaseRuntime(m_pIsolate, &m_pPersistentContext, &m_StaticObjects);
41 m_pPersistentContext.Reset(); 42 m_pPersistentContext.Reset();
42 FXJS_Release(); 43 FXJS_Release();
43 EmbedderTest::TearDown(); 44 EmbedderTest::TearDown();
44 } 45 }
45 46
46 v8::Isolate* isolate() { return m_pIsolate; } 47 v8::Isolate* isolate() { return m_pIsolate; }
47 v8::Local<v8::Context> GetV8Context() { 48 v8::Local<v8::Context> GetV8Context() {
48 return m_pPersistentContext.Get(m_pIsolate); 49 return m_pPersistentContext.Get(m_pIsolate);
49 } 50 }
50 51
51 private: 52 private:
52 nonstd::unique_ptr<FXJS_ArrayBufferAllocator> m_pArrayBufferAllocator; 53 nonstd::unique_ptr<FXJS_ArrayBufferAllocator> m_pArrayBufferAllocator;
53 v8::Isolate* m_pIsolate; 54 v8::Isolate* m_pIsolate;
54 v8::Global<v8::Context> m_pPersistentContext; 55 v8::Global<v8::Context> m_pPersistentContext;
56 std::vector<v8::Global<v8::Object>*> m_StaticObjects;
55 }; 57 };
56 58
57 TEST_F(FXJSV8Embeddertest, Getters) { 59 TEST_F(FXJSV8Embeddertest, Getters) {
58 v8::Isolate::Scope isolate_scope(isolate()); 60 v8::Isolate::Scope isolate_scope(isolate());
59 v8::Locker locker(isolate()); 61 v8::Locker locker(isolate());
60 v8::HandleScope handle_scope(isolate()); 62 v8::HandleScope handle_scope(isolate());
61 v8::Context::Scope context_scope(GetV8Context()); 63 v8::Context::Scope context_scope(GetV8Context());
62 64
63 FXJSErr error; 65 FXJSErr error;
64 int sts = FXJS_Execute(isolate(), nullptr, kScript, &error); 66 int sts = FXJS_Execute(isolate(), nullptr, kScript, &error);
65 EXPECT_EQ(0, sts); 67 EXPECT_EQ(0, sts);
66 68
67 v8::Local<v8::Object> This = FXJS_GetThisObj(isolate()); 69 v8::Local<v8::Object> This = FXJS_GetThisObj(isolate());
68 v8::Local<v8::Value> fred = FXJS_GetObjectElement(isolate(), This, L"fred"); 70 v8::Local<v8::Value> fred = FXJS_GetObjectElement(isolate(), This, L"fred");
69 EXPECT_TRUE(fred->IsNumber()); 71 EXPECT_TRUE(fred->IsNumber());
70 } 72 }
OLDNEW
« no previous file with comments | « fpdfsdk/src/jsapi/fxjs_v8.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698