From 9d8ec5a6e37e8d1d4d4edca9040de234e2d4728f Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Tue, 4 Aug 2015 13:00:21 -0700 Subject: XFA: clang-format all pdfium code. No behavior change. Generated by: find . -name '*.cpp' -o -name '*.h' | \ grep -E -v 'third_party|thirdparties|lpng_v163|tiff_v403' | \ xargs ../../buildtools/mac/clang-format -i Then manually merged https://codereview.chromium.org/1269223002/ See thread "tabs vs spaces" on pdfium@googlegroups.com for discussion. BUG=none --- testing/embedder_test.cpp | 85 +++++++++++++------------ testing/embedder_test.h | 22 ++++--- testing/embedder_test_mock_delegate.h | 6 +- testing/embedder_test_timer_handling_delegate.h | 8 +-- testing/fx_string_testhelpers.h | 1 - 5 files changed, 64 insertions(+), 58 deletions(-) (limited to 'testing') diff --git a/testing/embedder_test.cpp b/testing/embedder_test.cpp index d819d9c2a2..d62810d087 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(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(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(this); - memset(info, 0, sizeof(UNSUPPORT_INFO)); - info->version = 1; - info->FSDK_UnSupport_Handler = UnsupportedHandlerTrampoline; - FSDK_SetUnSpObjProcessHandler(info); - } + UNSUPPORT_INFO* info = static_cast(this); + memset(info, 0, sizeof(UNSUPPORT_INFO)); + info->version = 1; + info->FSDK_UnSupport_Handler = UnsupportedHandlerTrampoline; + FSDK_SetUnSpObjProcessHandler(info); +} void EmbedderTest::TearDown() { if (document_) { @@ -203,7 +204,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); @@ -214,13 +215,12 @@ bool EmbedderTest::OpenDocument(const std::string& filename) { return false; } int docType = DOCTYPE_PDF; - if (FPDF_HasXFAField(document_, &docType)) - { + if (FPDF_HasXFAField(document_, &docType)) { if (docType != DOCTYPE_PDF) - (void) FPDF_LoadXFA(document_); + (void)FPDF_LoadXFA(document_); } - (void) FPDF_GetDocPermissions(document_); - (void) FPDFAvail_IsFormAvail(avail_, &hints_); + (void)FPDF_GetDocPermissions(document_); + (void)FPDFAvail_IsFormAvail(avail_, &hints_); IPDF_JSPLATFORM* platform = static_cast(this); memset(platform, 0, sizeof(IPDF_JSPLATFORM)); @@ -248,14 +248,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; } @@ -305,7 +305,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(info); return test->delegate_->SetTimer(msecs, fn); } diff --git a/testing/embedder_test.h b/testing/embedder_test.h index 0ac68d54e1..4bd9d9713e 100644 --- a/testing/embedder_test.h +++ b/testing/embedder_test.h @@ -25,14 +25,16 @@ class EmbedderTest : public ::testing::Test, public: class Delegate { public: - virtual ~Delegate() { } + virtual ~Delegate() {} // Equivalent to UNSUPPORT_INFO::FSDK_UnSupport_Handler(). - virtual void UnsupportedHandler(int type) { } + virtual void UnsupportedHandler(int type) {} // Equivalent to IPDF_JSPLATFORM::app_alert(). - virtual int Alert(FPDF_WIDESTRING message, FPDF_WIDESTRING title, - int type, int icon) { + virtual int Alert(FPDF_WIDESTRING message, + FPDF_WIDESTRING title, + int type, + int icon) { return 0; } @@ -40,7 +42,7 @@ class EmbedderTest : public ::testing::Test, virtual int SetTimer(int msecs, TimerCallback fn) { return 0; } // Equivalent to FPDF_FORMFILLINFO::FFI_KillTimer(). - virtual void KillTimer(int id) { } + virtual void KillTimer(int id) {} }; EmbedderTest(); @@ -95,9 +97,13 @@ class EmbedderTest : public ::testing::Test, private: static void UnsupportedHandlerTrampoline(UNSUPPORT_INFO*, int type); - static int AlertTrampoline(IPDF_JSPLATFORM* plaform, FPDF_WIDESTRING message, - FPDF_WIDESTRING title, int type, int icon); - static int SetTimerTrampoline(FPDF_FORMFILLINFO* info, int msecs, + static int AlertTrampoline(IPDF_JSPLATFORM* plaform, + FPDF_WIDESTRING message, + FPDF_WIDESTRING title, + int type, + int icon); + static int SetTimerTrampoline(FPDF_FORMFILLINFO* info, + int msecs, TimerCallback fn); static void KillTimerTrampoline(FPDF_FORMFILLINFO* info, int id); }; diff --git a/testing/embedder_test_mock_delegate.h b/testing/embedder_test_mock_delegate.h index 1e4e99513d..47e795a992 100644 --- a/testing/embedder_test_mock_delegate.h +++ b/testing/embedder_test_mock_delegate.h @@ -11,11 +11,11 @@ class EmbedderTestMockDelegate : public EmbedderTest::Delegate { public: MOCK_METHOD1(UnsupportedHandler, void(int type)); - MOCK_METHOD4(Alert, int(FPDF_WIDESTRING message, FPDF_WIDESTRING title, - int type, int icon)); + MOCK_METHOD4( + Alert, + int(FPDF_WIDESTRING message, FPDF_WIDESTRING title, int type, int icon)); MOCK_METHOD2(SetTimer, int(int msecs, TimerCallback fn)); MOCK_METHOD1(KillTimer, void(int msecs)); }; #endif // TESTING_EMBEDDER_TEST_MOCK_DELEGATE_H_ - diff --git a/testing/embedder_test_timer_handling_delegate.h b/testing/embedder_test_timer_handling_delegate.h index d05a134b4e..aca4ac1b77 100644 --- a/testing/embedder_test_timer_handling_delegate.h +++ b/testing/embedder_test_timer_handling_delegate.h @@ -11,7 +11,7 @@ #include "embedder_test.h" class EmbedderTestTimerHandlingDelegate : public EmbedderTest::Delegate { -public: + public: int SetTimer(int msecs, TimerCallback fn) override { expiry_to_timer_map_.insert(std::pair( msecs + imaginary_elapsed_msecs_, Timer(++next_timer_id_, fn))); @@ -44,11 +44,11 @@ public: } } -protected: - using Timer = std::pair; // ID, callback pair. + protected: + using Timer = std::pair; // ID, callback pair. std::multimap expiry_to_timer_map_; // Keyed by timeout. int next_timer_id_ = 0; int imaginary_elapsed_msecs_ = 0; }; -#endif // TESTING_EMBEDDER_TEST_TIMER_HANDLING_DELEGATE_H_ +#endif // TESTING_EMBEDDER_TEST_TIMER_HANDLING_DELEGATE_H_ diff --git a/testing/fx_string_testhelpers.h b/testing/fx_string_testhelpers.h index 13b4afb2ec..2880f84ed1 100644 --- a/testing/fx_string_testhelpers.h +++ b/testing/fx_string_testhelpers.h @@ -16,4 +16,3 @@ std::ostream& operator<<(std::ostream& out, const CFX_WideStringC& str); std::ostream& operator<<(std::ostream& out, const CFX_WideString& str); #endif // TESTING_FX_STR_TESTHELPERS_H_ - -- cgit v1.2.3