summaryrefslogtreecommitdiff
path: root/testing/embedder_test_main.cpp
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2018-02-08 14:01:32 +0000
committerChromium commit bot <commit-bot@chromium.org>2018-02-08 14:01:32 +0000
commitb0fb8cc23c0ae555726f873101961676f96f6f07 (patch)
tree6ff26ef212fd3d123483866eb4053f19189a6262 /testing/embedder_test_main.cpp
parent6183a6e7693b7aeb9763eaa130b43269b13a02d7 (diff)
downloadpdfium-b0fb8cc23c0ae555726f873101961676f96f6f07.tar.xz
[v8-platform] Store the platform in a unique_ptr. (Try 2)
We want to change the signature of {CreateDefaultPlatform} in the V8 API to return a unique_ptr instead of a raw pointer to indicate that the caller owns the platform. With this change we prepare pdfium for this change. In this second attempt, keep the old InitializeV8ForPDFium() method around to complete the Chromium DEPS roll. Once that lands safely, remove it from PDFium. This relands commit 608e8dd6 and commit 3355f459, which commit b3a3eaab reverts. Change-Id: Icc60b17ca202637d34ae242c0785d939194d0fe6 Reviewed-on: https://pdfium-review.googlesource.com/25950 Commit-Queue: dsinclair <dsinclair@chromium.org> Reviewed-by: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'testing/embedder_test_main.cpp')
-rw-r--r--testing/embedder_test_main.cpp13
1 files changed, 6 insertions, 7 deletions
diff --git a/testing/embedder_test_main.cpp b/testing/embedder_test_main.cpp
index ade6118e64..0c3ceb60ce 100644
--- a/testing/embedder_test_main.cpp
+++ b/testing/embedder_test_main.cpp
@@ -34,16 +34,16 @@ class Environment : public testing::Environment {
#ifdef PDF_ENABLE_V8
#ifdef V8_USE_EXTERNAL_STARTUP_DATA
if (g_v8_natives && g_v8_snapshot) {
- InitializeV8ForPDFium(g_exe_path, std::string(), nullptr, nullptr,
- &platform_);
+ platform_ = InitializeV8ForPDFiumWithStartupData(
+ g_exe_path, std::string(), nullptr, nullptr);
} else {
g_v8_natives = new v8::StartupData;
g_v8_snapshot = new v8::StartupData;
- InitializeV8ForPDFium(g_exe_path, std::string(), g_v8_natives,
- g_v8_snapshot, &platform_);
+ platform_ = InitializeV8ForPDFiumWithStartupData(
+ g_exe_path, std::string(), g_v8_natives, g_v8_snapshot);
}
#else
- InitializeV8ForPDFium(g_exe_path, &platform_);
+ platform_ = InitializeV8ForPDFium(g_exe_path);
#endif // V8_USE_EXTERNAL_STARTUP_DATA
#endif // FPDF_ENABLE_V8
}
@@ -51,13 +51,12 @@ class Environment : public testing::Environment {
void TearDown() override {
#ifdef PDF_ENABLE_V8
v8::V8::ShutdownPlatform();
- delete platform_;
#endif // PDF_ENABLE_V8
}
private:
#ifdef PDF_ENABLE_V8
- v8::Platform* platform_;
+ std::unique_ptr<v8::Platform> platform_;
#endif // PDF_ENABLE_V8
};