diff options
| author | Lei Zhang <thestig@chromium.org> | 2018-02-08 14:01:32 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-02-08 14:01:32 +0000 |
| commit | b0fb8cc23c0ae555726f873101961676f96f6f07 (patch) | |
| tree | 6ff26ef212fd3d123483866eb4053f19189a6262 /samples | |
| parent | 6183a6e7693b7aeb9763eaa130b43269b13a02d7 (diff) | |
| download | pdfium-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 'samples')
| -rw-r--r-- | samples/pdfium_test.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/samples/pdfium_test.cc b/samples/pdfium_test.cc index b83663db69..ebc7412055 100644 --- a/samples/pdfium_test.cc +++ b/samples/pdfium_test.cc @@ -1567,14 +1567,14 @@ int main(int argc, const char* argv[]) { } #ifdef PDF_ENABLE_V8 - v8::Platform* platform; + std::unique_ptr<v8::Platform> platform; #ifdef V8_USE_EXTERNAL_STARTUP_DATA v8::StartupData natives; v8::StartupData snapshot; - InitializeV8ForPDFium(options.exe_path, options.bin_directory, &natives, - &snapshot, &platform); + platform = InitializeV8ForPDFiumWithStartupData( + options.exe_path, options.bin_directory, &natives, &snapshot); #else // V8_USE_EXTERNAL_STARTUP_DATA - InitializeV8ForPDFium(options.exe_path, &platform); + platform = InitializeV8ForPDFium(options.exe_path); #endif // V8_USE_EXTERNAL_STARTUP_DATA #endif // PDF_ENABLE_V8 @@ -1641,7 +1641,6 @@ int main(int argc, const char* argv[]) { FPDF_DestroyLibrary(); #ifdef PDF_ENABLE_V8 v8::V8::ShutdownPlatform(); - delete platform; #ifdef V8_USE_EXTERNAL_STARTUP_DATA free(const_cast<char*>(natives.data)); |