| Index: testing/embedder_test.cpp
|
| diff --git a/testing/embedder_test.cpp b/testing/embedder_test.cpp
|
| index 447b4d12e4a4554adee6c5919afd5f3ec26e8758..1476522e57244f01fc1c806b03af546bd29cb81e 100644
|
| --- a/testing/embedder_test.cpp
|
| +++ b/testing/embedder_test.cpp
|
| @@ -38,18 +38,18 @@ static char* GetFileContents(const char* filename, size_t* retlen) {
|
| fprintf(stderr, "Failed to open: %s\n", filename);
|
| return nullptr;
|
| }
|
| - (void) fseek(file, 0, SEEK_END);
|
| + (void)fseek(file, 0, SEEK_END);
|
| size_t file_length = ftell(file);
|
| if (!file_length) {
|
| return nullptr;
|
| }
|
| - (void) fseek(file, 0, SEEK_SET);
|
| - char* buffer = (char*) malloc(file_length);
|
| + (void)fseek(file, 0, SEEK_SET);
|
| + char* buffer = (char*)malloc(file_length);
|
| if (!buffer) {
|
| return nullptr;
|
| }
|
| size_t bytes_read = fread(buffer, 1, file_length, file);
|
| - (void) fclose(file);
|
| + (void)fclose(file);
|
| if (bytes_read != file_length) {
|
| fprintf(stderr, "Failed to read: %s\n", filename);
|
| free(buffer);
|
| @@ -67,7 +67,7 @@ static std::string GetFullPathForSnapshotFile(const std::string& exe_path,
|
| std::string result;
|
| if (!exe_path.empty()) {
|
| size_t last_separator = exe_path.rfind(PATH_SEPARATOR);
|
| - if (last_separator != std::string::npos) {
|
| + if (last_separator != std::string::npos) {
|
| result = exe_path.substr(0, last_separator + 1);
|
| }
|
| }
|
| @@ -103,13 +103,15 @@ class TestLoader {
|
| };
|
|
|
| TestLoader::TestLoader(const char* pBuf, size_t len)
|
| - : m_pBuf(pBuf), m_Len(len) {
|
| -}
|
| + : m_pBuf(pBuf), m_Len(len) {}
|
|
|
| -int Get_Block(void* param, unsigned long pos, unsigned char* pBuf,
|
| +int Get_Block(void* param,
|
| + unsigned long pos,
|
| + unsigned char* pBuf,
|
| unsigned long size) {
|
| - TestLoader* pLoader = (TestLoader*) param;
|
| - if (pos + size < pos || pos + size > pLoader->m_Len) return 0;
|
| + TestLoader* pLoader = (TestLoader*)param;
|
| + if (pos + size < pos || pos + size > pLoader->m_Len)
|
| + return 0;
|
| memcpy(pBuf, pLoader->m_pBuf + pos, size);
|
| return 1;
|
| }
|
| @@ -118,11 +120,10 @@ FPDF_BOOL Is_Data_Avail(FX_FILEAVAIL* pThis, size_t offset, size_t size) {
|
| return true;
|
| }
|
|
|
| -void Add_Segment(FX_DOWNLOADHINTS* pThis, size_t offset, size_t size) {
|
| -}
|
| +void Add_Segment(FX_DOWNLOADHINTS* pThis, size_t offset, size_t size) {}
|
|
|
| -EmbedderTest::EmbedderTest() :
|
| - document_(nullptr),
|
| +EmbedderTest::EmbedderTest()
|
| + : document_(nullptr),
|
| form_handle_(nullptr),
|
| avail_(nullptr),
|
| loader_(nullptr),
|
| @@ -140,32 +141,32 @@ EmbedderTest::~EmbedderTest() {
|
| }
|
|
|
| void EmbedderTest::SetUp() {
|
| - v8::V8::InitializeICU();
|
| + v8::V8::InitializeICU();
|
|
|
| - platform_ = v8::platform::CreateDefaultPlatform();
|
| - v8::V8::InitializePlatform(platform_);
|
| - v8::V8::Initialize();
|
| + platform_ = v8::platform::CreateDefaultPlatform();
|
| + v8::V8::InitializePlatform(platform_);
|
| + v8::V8::Initialize();
|
|
|
| - // By enabling predictable mode, V8 won't post any background tasks.
|
| - const char predictable_flag[] = "--predictable";
|
| - v8::V8::SetFlagsFromString(predictable_flag,
|
| - static_cast<int>(strlen(predictable_flag)));
|
| + // By enabling predictable mode, V8 won't post any background tasks.
|
| + const char predictable_flag[] = "--predictable";
|
| + v8::V8::SetFlagsFromString(predictable_flag,
|
| + static_cast<int>(strlen(predictable_flag)));
|
|
|
| #ifdef V8_USE_EXTERNAL_STARTUP_DATA
|
| - ASSERT_TRUE(GetExternalData(g_exe_path_, "natives_blob.bin", &natives_));
|
| - ASSERT_TRUE(GetExternalData(g_exe_path_, "snapshot_blob.bin", &snapshot_));
|
| - v8::V8::SetNativesDataBlob(&natives_);
|
| - v8::V8::SetSnapshotDataBlob(&snapshot_);
|
| + ASSERT_TRUE(GetExternalData(g_exe_path_, "natives_blob.bin", &natives_));
|
| + ASSERT_TRUE(GetExternalData(g_exe_path_, "snapshot_blob.bin", &snapshot_));
|
| + v8::V8::SetNativesDataBlob(&natives_);
|
| + v8::V8::SetSnapshotDataBlob(&snapshot_);
|
| #endif // V8_USE_EXTERNAL_STARTUP_DATA
|
|
|
| - FPDF_InitLibrary();
|
| + FPDF_InitLibrary();
|
|
|
| - UNSUPPORT_INFO* info = static_cast<UNSUPPORT_INFO*>(this);
|
| - memset(info, 0, sizeof(UNSUPPORT_INFO));
|
| - info->version = 1;
|
| - info->FSDK_UnSupport_Handler = UnsupportedHandlerTrampoline;
|
| - FSDK_SetUnSpObjProcessHandler(info);
|
| - }
|
| + UNSUPPORT_INFO* info = static_cast<UNSUPPORT_INFO*>(this);
|
| + memset(info, 0, sizeof(UNSUPPORT_INFO));
|
| + info->version = 1;
|
| + info->FSDK_UnSupport_Handler = UnsupportedHandlerTrampoline;
|
| + FSDK_SetUnSpObjProcessHandler(info);
|
| +}
|
|
|
| void EmbedderTest::TearDown() {
|
| if (document_) {
|
| @@ -199,7 +200,7 @@ bool EmbedderTest::OpenDocument(const std::string& filename) {
|
| hints_.AddSegment = Add_Segment;
|
|
|
| avail_ = FPDFAvail_Create(&file_avail_, &file_access_);
|
| - (void) FPDFAvail_IsDocAvail(avail_, &hints_);
|
| + (void)FPDFAvail_IsDocAvail(avail_, &hints_);
|
|
|
| if (!FPDFAvail_IsLinearized(avail_)) {
|
| document_ = FPDF_LoadCustomDocument(&file_access_, nullptr);
|
| @@ -207,8 +208,8 @@ bool EmbedderTest::OpenDocument(const std::string& filename) {
|
| document_ = FPDFAvail_GetDocument(avail_, nullptr);
|
| }
|
|
|
| - (void) FPDF_GetDocPermissions(document_);
|
| - (void) FPDFAvail_IsFormAvail(avail_, &hints_);
|
| + (void)FPDF_GetDocPermissions(document_);
|
| + (void)FPDFAvail_IsFormAvail(avail_, &hints_);
|
|
|
| IPDF_JSPLATFORM* platform = static_cast<IPDF_JSPLATFORM*>(this);
|
| memset(platform, 0, sizeof(IPDF_JSPLATFORM));
|
| @@ -236,14 +237,14 @@ void EmbedderTest::DoOpenActions() {
|
|
|
| int EmbedderTest::GetFirstPageNum() {
|
| int first_page = FPDFAvail_GetFirstPageNum(document_);
|
| - (void) FPDFAvail_IsPageAvail(avail_, first_page, &hints_);
|
| + (void)FPDFAvail_IsPageAvail(avail_, first_page, &hints_);
|
| return first_page;
|
| }
|
|
|
| int EmbedderTest::GetPageCount() {
|
| int page_count = FPDF_GetPageCount(document_);
|
| for (int i = 0; i < page_count; ++i) {
|
| - (void) FPDFAvail_IsPageAvail(avail_, i, &hints_);
|
| + (void)FPDFAvail_IsPageAvail(avail_, i, &hints_);
|
| }
|
| return page_count;
|
| }
|
| @@ -293,7 +294,8 @@ int EmbedderTest::AlertTrampoline(IPDF_JSPLATFORM* platform,
|
|
|
| // static
|
| int EmbedderTest::SetTimerTrampoline(FPDF_FORMFILLINFO* info,
|
| - int msecs, TimerCallback fn) {
|
| + int msecs,
|
| + TimerCallback fn) {
|
| EmbedderTest* test = static_cast<EmbedderTest*>(info);
|
| return test->delegate_->SetTimer(msecs, fn);
|
| }
|
|
|