From 608e8dd6b87b15772862dca9b7b2e6791a25dab6 Mon Sep 17 00:00:00 2001 From: Andreas Haas Date: Mon, 5 Feb 2018 18:32:18 +0000 Subject: [v8-platform] Store the platform in a unique_ptr 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. R=thestig@chromium.org Change-Id: I4a0a466dfc37b28387a91543623a7a481ca8035a Reviewed-on: https://pdfium-review.googlesource.com/18191 Commit-Queue: Lei Zhang Reviewed-by: Lei Zhang --- testing/test_support.cpp | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) (limited to 'testing/test_support.cpp') diff --git a/testing/test_support.cpp b/testing/test_support.cpp index b32ec7de96..f682451c27 100644 --- a/testing/test_support.cpp +++ b/testing/test_support.cpp @@ -60,17 +60,18 @@ bool GetExternalData(const std::string& exe_path, } #endif // V8_USE_EXTERNAL_STARTUP_DATA -void InitializeV8Common(const char* exe_path, v8::Platform** platform) { +std::unique_ptr InitializeV8Common(const char* exe_path) { v8::V8::InitializeICUDefaultLocation(exe_path); - *platform = v8::platform::CreateDefaultPlatform(); - v8::V8::InitializePlatform(*platform); + std::unique_ptr platform = v8::platform::NewDefaultPlatform(); + v8::V8::InitializePlatform(platform.get()); // By enabling predictable mode, V8 won't post any background tasks. // By enabling GC, it makes it easier to chase use-after-free. const char v8_flags[] = "--predictable --expose-gc"; v8::V8::SetFlagsFromString(v8_flags, static_cast(strlen(v8_flags))); v8::V8::Initialize(); + return platform; } #endif // PDF_ENABLE_V8 @@ -177,27 +178,29 @@ std::string GenerateMD5Base16(const uint8_t* data, uint32_t size) { #ifdef PDF_ENABLE_V8 #ifdef V8_USE_EXTERNAL_STARTUP_DATA -bool InitializeV8ForPDFium(const std::string& exe_path, - const std::string& bin_dir, - v8::StartupData* natives_blob, - v8::StartupData* snapshot_blob, - v8::Platform** platform) { - InitializeV8Common(exe_path.c_str(), platform); +std::unique_ptr InitializeV8ForPDFium( + const std::string& exe_path, + const std::string& bin_dir, + v8::StartupData* natives_blob, + v8::StartupData* snapshot_blob) { + std::unique_ptr platform = InitializeV8Common(exe_path.c_str()); if (natives_blob && snapshot_blob) { if (!GetExternalData(exe_path, bin_dir, "natives_blob.bin", natives_blob)) - return false; + return nullptr; if (!GetExternalData(exe_path, bin_dir, "snapshot_blob.bin", snapshot_blob)) - return false; + return nullptr; v8::V8::SetNativesDataBlob(natives_blob); v8::V8::SetSnapshotDataBlob(snapshot_blob); } - return true; + return platform; } #else // V8_USE_EXTERNAL_STARTUP_DATA -bool InitializeV8ForPDFium(const std::string& exe_path, - v8::Platform** platform) { - InitializeV8Common(exe_path.c_str(), platform); - return true; +std::unique_ptr InitializeV8ForPDFium( + const std::string& exe_path, + std::unique_ptr* platform) { + std::unique_ptr platform = + InitializeV8Common(exe_path.c_str(), platform); + return platform; } #endif // V8_USE_EXTERNAL_STARTUP_DATA #endif // PDF_ENABLE_V8 -- cgit v1.2.3