From 077f1a335560a8014e466c768c1e9d24c8a61ac9 Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Thu, 6 Aug 2015 15:08:57 -0700 Subject: XFA: clang-format all pdfium code, again. Also add a presubmit that checks for this so I don't have to keep doing it. 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 R=thestig@chromium.org Review URL: https://codereview.chromium.org/1277043002 . --- fpdfsdk/src/fpdf_flatten.cpp | 9 +++------ fpdfsdk/src/fpdf_transformpage.cpp | 6 ++---- fpdfsdk/src/fpdfeditimg.cpp | 3 +-- fpdfsdk/src/fpdfview.cpp | 1 - fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp | 3 ++- fpdfsdk/src/fsdk_annothandler.cpp | 2 +- fpdfsdk/src/fsdk_baseform.cpp | 10 ++-------- fpdfsdk/src/fxedit/fxet_ap.cpp | 5 ----- fpdfsdk/src/javascript/app.cpp | 4 ++-- fpdfsdk/src/jsapi/fxjs_v8.cpp | 4 ++-- fpdfsdk/src/pdfwindow/PWL_ListBox.cpp | 2 +- 11 files changed, 16 insertions(+), 33 deletions(-) (limited to 'fpdfsdk/src') diff --git a/fpdfsdk/src/fpdf_flatten.cpp b/fpdfsdk/src/fpdf_flatten.cpp index e48c6ab706..3049384db6 100644 --- a/fpdfsdk/src/fpdf_flatten.cpp +++ b/fpdfsdk/src/fpdf_flatten.cpp @@ -196,8 +196,7 @@ void SetPageContents(CFX_ByteString key, if (!pContentsObj) { // Create a new contents dictionary if (!key.IsEmpty()) { - CPDF_Stream* pNewContents = - new CPDF_Stream(NULL, 0, new CPDF_Dictionary); + CPDF_Stream* pNewContents = new CPDF_Stream(NULL, 0, new CPDF_Dictionary); if (!pNewContents) return; pPage->SetAtReference("Contents", pDocument, @@ -246,8 +245,7 @@ void SetPageContents(CFX_ByteString key, pPage->SetAtReference("Contents", pDocument, dwObjNum); if (!key.IsEmpty()) { - CPDF_Stream* pNewContents = - new CPDF_Stream(NULL, 0, new CPDF_Dictionary); + CPDF_Stream* pNewContents = new CPDF_Stream(NULL, 0, new CPDF_Dictionary); dwObjNum = pDocument->AddIndirectObject(pNewContents); pContentsArray->AddReference(pDocument, dwObjNum); @@ -391,8 +389,7 @@ DLLEXPORT int STDCALL FPDFPage_Flatten(FPDF_PAGE page, int nFlag) { pPageDict->SetAt("Resources", pRes); } - CPDF_Stream* pNewXObject = - new CPDF_Stream(NULL, 0, new CPDF_Dictionary); + CPDF_Stream* pNewXObject = new CPDF_Stream(NULL, 0, new CPDF_Dictionary); FX_DWORD dwObjNum = pDocument->AddIndirectObject(pNewXObject); CPDF_Dictionary* pPageXObject = pRes->GetDict("XObject"); if (!pPageXObject) { diff --git a/fpdfsdk/src/fpdf_transformpage.cpp b/fpdfsdk/src/fpdf_transformpage.cpp index aa08f6843f..6e7243160a 100644 --- a/fpdfsdk/src/fpdf_transformpage.cpp +++ b/fpdfsdk/src/fpdf_transformpage.cpp @@ -151,8 +151,7 @@ DLLEXPORT FPDF_BOOL STDCALL FPDFPage_TransFormWithClip(FPDF_PAGE page, if (pDirectObj != NULL) { if (pDirectObj->GetType() == PDFOBJ_ARRAY) { pContentArray = (CPDF_Array*)pDirectObj; - CPDF_Reference* pRef = - new CPDF_Reference(pDoc, pStream->GetObjNum()); + CPDF_Reference* pRef = new CPDF_Reference(pDoc, pStream->GetObjNum()); pContentArray->InsertAt(0, pRef); pContentArray->AddReference(pDoc, pEndStream); @@ -324,8 +323,7 @@ DLLEXPORT void STDCALL FPDFPage_InsertClipPath(FPDF_PAGE page, if (pDirectObj != NULL) { if (pDirectObj->GetType() == PDFOBJ_ARRAY) { pContentArray = (CPDF_Array*)pDirectObj; - CPDF_Reference* pRef = - new CPDF_Reference(pDoc, pStream->GetObjNum()); + CPDF_Reference* pRef = new CPDF_Reference(pDoc, pStream->GetObjNum()); pContentArray->InsertAt(0, pRef); } else if (pDirectObj->GetType() == PDFOBJ_STREAM) { diff --git a/fpdfsdk/src/fpdfeditimg.cpp b/fpdfsdk/src/fpdfeditimg.cpp index f839d2c791..170a2dda8d 100644 --- a/fpdfsdk/src/fpdfeditimg.cpp +++ b/fpdfsdk/src/fpdfeditimg.cpp @@ -14,8 +14,7 @@ FPDFPageObj_NewImgeObj(FPDF_DOCUMENT document) { if (!document) return NULL; CPDF_ImageObject* pImageObj = new CPDF_ImageObject; - CPDF_Image* pImg = - new CPDF_Image(((CPDFXFA_Document*)document)->GetPDFDoc()); + CPDF_Image* pImg = new CPDF_Image(((CPDFXFA_Document*)document)->GetPDFDoc()); pImageObj->m_pImage = pImg; return pImageObj; } diff --git a/fpdfsdk/src/fpdfview.cpp b/fpdfsdk/src/fpdfview.cpp index a308f1727d..87b23c31e3 100644 --- a/fpdfsdk/src/fpdfview.cpp +++ b/fpdfsdk/src/fpdfview.cpp @@ -237,7 +237,6 @@ DLLEXPORT void STDCALL FPDF_SetSandBoxPolicy(FPDF_DWORD policy, return FSDK_SetSandBoxPolicy(policy, enable); } - DLLEXPORT FPDF_DOCUMENT STDCALL FPDF_LoadDocument(FPDF_STRING file_path, FPDF_BYTESTRING password) { // NOTE: the creation of the file needs to be by the embedder on the diff --git a/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp b/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp index be3b235889..9378735c24 100644 --- a/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp +++ b/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp @@ -546,7 +546,8 @@ void CPDFXFA_Document::WidgetEvent(IXFA_Widget* hWidget, CPDFSDK_AnnotHandlerMgr* pAnnotHandlerMgr = pEnv->GetAnnotHandlerMgr(); if (dwEvent == XFA_WIDGETEVENT_PostAdded) { - // CPDFSDK_Annot* pAnnot = pAnnotHandlerMgr->NewAnnot(hWidget, + // CPDFSDK_Annot* pAnnot = + // pAnnotHandlerMgr->NewAnnot(hWidget, // pSdkPageView); // pAnnotHandlerMgr->Annot_OnLoad(pAnnot); diff --git a/fpdfsdk/src/fsdk_annothandler.cpp b/fpdfsdk/src/fsdk_annothandler.cpp index a729fb78eb..55d4629801 100644 --- a/fpdfsdk/src/fsdk_annothandler.cpp +++ b/fpdfsdk/src/fsdk_annothandler.cpp @@ -742,7 +742,7 @@ FX_BOOL CPDFSDK_BFAnnotHandler::HitTest(CPDFSDK_PageView* pPageView, // CPDFSDK_XFAAnnotHandler #define FWL_WGTHITTEST_Unknown 0 -#define FWL_WGTHITTEST_Client 1 // arrow +#define FWL_WGTHITTEST_Client 1 // arrow #define FWL_WGTHITTEST_Titlebar 11 // caption #define FWL_WGTHITTEST_HScrollBar 15 #define FWL_WGTHITTEST_VScrollBar 16 diff --git a/fpdfsdk/src/fsdk_baseform.cpp b/fpdfsdk/src/fsdk_baseform.cpp index d06fcc0947..b153ceb9d4 100644 --- a/fpdfsdk/src/fsdk_baseform.cpp +++ b/fpdfsdk/src/fsdk_baseform.cpp @@ -1126,10 +1126,7 @@ void CPDFSDK_Widget::ResetAppearance_PushButton() { ASSERT(pDoc != NULL); CPDFDoc_Environment* pEnv = pDoc->GetEnv(); - CBA_FontMap FontMap( - this, - pEnv->GetSysHandler()); //, - //ISystemHandle::GetSystemHandler(m_pBaseForm->GetEnv())); + CBA_FontMap FontMap(this, pEnv->GetSysHandler()); FontMap.Initial(); FontMap.SetAPType("N"); @@ -1689,10 +1686,7 @@ void CPDFSDK_Widget::ResetAppearance_TextField(const FX_WCHAR* sValue) { ASSERT(pDoc != NULL); CPDFDoc_Environment* pEnv = pDoc->GetEnv(); - CBA_FontMap FontMap( - this, - pEnv->GetSysHandler()); //, - //ISystemHandle::GetSystemHandler(m_pBaseForm->GetEnv())); + CBA_FontMap FontMap(this, pEnv->GetSysHandler()); FontMap.Initial(); pEdit->SetFontMap(&FontMap); diff --git a/fpdfsdk/src/fxedit/fxet_ap.cpp b/fpdfsdk/src/fxedit/fxet_ap.cpp index b9900d899b..4e92099417 100644 --- a/fpdfsdk/src/fxedit/fxet_ap.cpp +++ b/fpdfsdk/src/fxedit/fxet_ap.cpp @@ -196,11 +196,6 @@ CFX_ByteString IFX_Edit::GetSelectAppearanceStream( CPVT_Word word; CPVT_Line line; if (pIterator->GetWord(word) && pIterator->GetLine(line)) { - // CPDF_Rect rcWordSel = CPDF_Rect(word.ptWord.x,line.ptLine.y + - // line.fLineDescent, - // word.ptWord.x+word.fWidth,line.ptLine.y + - //line.fLineAscent); - sRet << word.ptWord.x + ptOffset.x << " " << line.ptLine.y + line.fLineDescent << " " << word.fWidth << " " << line.fLineAscent - line.fLineDescent << " re\nf\n"; diff --git a/fpdfsdk/src/javascript/app.cpp b/fpdfsdk/src/javascript/app.cpp index ed1a7ca481..136b544142 100644 --- a/fpdfsdk/src/javascript/app.cpp +++ b/fpdfsdk/src/javascript/app.cpp @@ -308,10 +308,10 @@ FX_BOOL app::alert(IFXJS_Context* cc, CJS_Value* pValue = new CJS_Value(isolate); // if (iLenth == 1) // pValue = new - //CJS_Value(isolate); + // CJS_Value(isolate); // else if (iLenth > 1) // pValue = new - //CJS_Value[iLenth]; + // CJS_Value[iLenth]; for (int i = 0; i < iLenth; i++) { carray.GetElement(i, *pValue); diff --git a/fpdfsdk/src/jsapi/fxjs_v8.cpp b/fpdfsdk/src/jsapi/fxjs_v8.cpp index 760702e588..d0e8e6e593 100644 --- a/fpdfsdk/src/jsapi/fxjs_v8.cpp +++ b/fpdfsdk/src/jsapi/fxjs_v8.cpp @@ -88,8 +88,8 @@ int JS_DefineObj(IJS_Runtime* pJSRuntime, pArray = new CFX_PtrArray(); isolate->SetData(g_embedderDataSlot, pArray); } - CJS_ObjDefintion* pObjDef = new CJS_ObjDefintion( - isolate, sObjName, eObjType, pConstructor, pDestructor); + CJS_ObjDefintion* pObjDef = new CJS_ObjDefintion(isolate, sObjName, eObjType, + pConstructor, pDestructor); pArray->Add(pObjDef); return pArray->GetSize() - 1; } diff --git a/fpdfsdk/src/pdfwindow/PWL_ListBox.cpp b/fpdfsdk/src/pdfwindow/PWL_ListBox.cpp index ba75e55fdf..b252bffb8e 100644 --- a/fpdfsdk/src/pdfwindow/PWL_ListBox.cpp +++ b/fpdfsdk/src/pdfwindow/PWL_ListBox.cpp @@ -183,7 +183,7 @@ void CPWL_ListBox::DrawThisAppearance(CFX_RenderDevice* pDevice, if (m_pList->IsItemSelected(i)) { // CPWL_Utils::DrawFillRect(pDevice, pUser2Device, rcItem, - //ArgbEncode(255,0,51,113)); + // ArgbEncode(255,0,51,113)); IFX_SystemHandler* pSysHandler = GetSystemHandler(); if (pSysHandler && pSysHandler->IsSelectionImplemented()) { IFX_Edit::DrawEdit( -- cgit v1.2.3