diff options
author | Tom Sepez <tsepez@chromium.org> | 2015-09-16 10:42:08 -0700 |
---|---|---|
committer | Tom Sepez <tsepez@chromium.org> | 2015-09-16 10:42:08 -0700 |
commit | 506df426d5d64d68e9dc27ffebcf56f6c6a1bccf (patch) | |
tree | 3ba8d38a3bef95c0555549953bce0cce90845cdb /fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp | |
parent | 615d7aba0f7d53a78eb05fbd4ae0e1a7e1d3b103 (diff) | |
download | pdfium-506df426d5d64d68e9dc27ffebcf56f6c6a1bccf.tar.xz |
Ensure functions in FXJS_V8 are prefixed by FXJS_.
Currently, its hard to tell which functions come from the JS_
layer at fpdfsdk/include/javascript vs. which functions come
from the FXJS_V8 layer at fpdfsdk/include/jsapi. Until we
take up the task of using namespaces, at least make the
prefix consistent.
Move objects out of FXJS_V8 that are really part of JS_.
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1347833002 .
Diffstat (limited to 'fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp')
-rw-r--r-- | fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp b/fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp index bddf301989..2671a91fff 100644 --- a/fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp +++ b/fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp @@ -22,7 +22,7 @@ class FXJSV8Embeddertest : public EmbedderTest { void SetUp() override { EmbedderTest::SetUp(); - m_pAllocator.reset(new JS_ArrayBufferAllocator()); + m_pAllocator.reset(new FXJS_ArrayBufferAllocator()); v8::Isolate::CreateParams params; params.array_buffer_allocator = m_pAllocator.get(); @@ -30,14 +30,14 @@ class FXJSV8Embeddertest : public EmbedderTest { v8::Isolate::Scope isolate_scope(m_pIsolate); v8::HandleScope handle_scope(m_pIsolate); - JS_Initialize(0); - JS_PrepareIsolate(m_pIsolate); - JS_InitializeRuntime(m_pIsolate, nullptr, nullptr, m_pPersistentContext); + FXJS_Initialize(0); + FXJS_PrepareIsolate(m_pIsolate); + FXJS_InitializeRuntime(m_pIsolate, nullptr, nullptr, m_pPersistentContext); } void TearDown() override { - JS_ReleaseRuntime(m_pIsolate, m_pPersistentContext); - JS_Release(); + FXJS_ReleaseRuntime(m_pIsolate, m_pPersistentContext); + FXJS_Release(); EmbedderTest::TearDown(); } @@ -60,10 +60,10 @@ TEST_F(FXJSV8Embeddertest, Getters) { FXJSErr error; CFX_WideString wsInfo; CFX_WideString wsScript(kScript); - int sts = JS_Execute(isolate(), nullptr, kScript, wcslen(kScript), &error); + int sts = FXJS_Execute(isolate(), nullptr, kScript, wcslen(kScript), &error); EXPECT_EQ(0, sts); - v8::Local<v8::Object> This = JS_GetThisObj(isolate()); - v8::Local<v8::Value> fred = JS_GetObjectElement(isolate(), This, L"fred"); + v8::Local<v8::Object> This = FXJS_GetThisObj(isolate()); + v8::Local<v8::Value> fred = FXJS_GetObjectElement(isolate(), This, L"fred"); EXPECT_TRUE(fred->IsNumber()); } |