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

Unified Diff: testing/embedder_test.cpp

Issue 1393833006: Merge to XFA: Allow compiling PDFium without V8. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa
Patch Set: Rebase, fix build, stray include. Created 5 years, 2 months 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « testing/embedder_test.h ('k') | xfa.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: testing/embedder_test.cpp
diff --git a/testing/embedder_test.cpp b/testing/embedder_test.cpp
index 1a3c4c6e5300b8054b389989d6b26cb2fc093898..0aacd48df9acad173c24b7a1777bff0b5c7b98ef 100644
--- a/testing/embedder_test.cpp
+++ b/testing/embedder_test.cpp
@@ -17,8 +17,11 @@
#include "../public/fpdf_text.h"
#include "../public/fpdfview.h"
#include "testing/gmock/include/gmock/gmock.h"
+
+#ifdef PDF_ENABLE_V8
#include "v8/include/libplatform/libplatform.h"
#include "v8/include/v8.h"
+#endif // PDF_ENABLE_V8
#ifdef _WIN32
#define snprintf _snprintf
@@ -59,6 +62,7 @@ static char* GetFileContents(const char* filename, size_t* retlen) {
return buffer;
}
+#ifdef PDF_ENABLE_V8
#ifdef V8_USE_EXTERNAL_STARTUP_DATA
// Returns the full path for an external V8 data file based on either
// the currect exectuable path or an explicit override.
@@ -91,7 +95,7 @@ static bool GetExternalData(const std::string& exe_path,
return true;
}
#endif // V8_USE_EXTERNAL_STARTUP_DATA
-
+#endif // PDF_ENABLE_V8
} // namespace
class TestLoader {
@@ -141,6 +145,7 @@ EmbedderTest::~EmbedderTest() {
}
void EmbedderTest::SetUp() {
+#ifdef PDF_ENABLE_V8
v8::V8::InitializeICU();
platform_ = v8::platform::CreateDefaultPlatform();
@@ -158,12 +163,13 @@ void EmbedderTest::SetUp() {
v8::V8::SetNativesDataBlob(&natives_);
v8::V8::SetSnapshotDataBlob(&snapshot_);
#endif // V8_USE_EXTERNAL_STARTUP_DATA
+#endif // FPDF_ENABLE_V8
FPDF_LIBRARY_CONFIG config;
config.version = 2;
config.m_pUserFontPaths = nullptr;
- config.m_pIsolate = external_isolate_;
config.m_v8EmbedderSlot = 0;
+ config.m_pIsolate = external_isolate_;
FPDF_InitLibraryWithConfig(&config);
UNSUPPORT_INFO* info = static_cast<UNSUPPORT_INFO*>(this);
@@ -185,8 +191,12 @@ void EmbedderTest::TearDown() {
}
FPDFAvail_Destroy(avail_);
FPDF_DestroyLibrary();
+
+#ifdef PDF_ENABLE_V8
v8::V8::ShutdownPlatform();
delete platform_;
+#endif // PDF_ENABLE_V8
+
delete loader_;
free(file_contents_);
}
« no previous file with comments | « testing/embedder_test.h ('k') | xfa.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698