Merge to XFA: The chromium_code whack-a-mole CLs.

BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//testing/test.gni")
 import("pdfium.gni")
 
 config("pdfium_config") {
   cflags = []
   include_dirs = [
@@ skipping 30 matching lines @@
     }
   }
 
   if (is_win) {
     cflags += [
       "/wd4005",
       "/wd4018",
       "/wd4146",
       "/wd4333",
       "/wd4345",
+      "/wd4267",
+      # TODO(thestig): Fix all instances, remove this, pdfium:29
+      "/wd4245",
+      "/wd4310",
+      "/wd4389",
+      "/wd4701",
+      "/wd4702",
+      "/wd4706",
+      "/wd4800",
     ]
   }
+
+  if (is_clang) {
+    # TODO(thestig): Fix all instances, remove this, pdfium:29
+    cflags += [ "-Wno-sign-compare" ]
+  }
 }
 
 static_library("pdfium") {
   sources = [
     "fpdfsdk/include/fsdk_actionhandler.h",
     "fpdfsdk/include/fsdk_annothandler.h",
     "fpdfsdk/include/fsdk_baseannot.h",
     "fpdfsdk/include/fsdk_baseform.h",
     "fpdfsdk/src/fpdf_dataavail.cpp",
     "fpdfsdk/src/fpdf_ext.cpp",
@@ skipping 27 matching lines @@
     "public/fpdf_progressive.h",
     "public/fpdf_save.h",
     "public/fpdf_searchex.h",
     "public/fpdf_sysfontinfo.h",
     "public/fpdf_text.h",
     "public/fpdf_transformpage.h",
     "public/fpdfview.h",
   ]
 
   libs = []
-  configs -= [ "//build/config/compiler:chromium_code" ]
-  configs += [
-    ":pdfium_config",
-    "//build/config/compiler:no_chromium_code",
-  ]
+  configs += [ ":pdfium_config" ]
 
   deps = [
     "third_party:bigint",
     "third_party:pdfium_base",
     ":fdrm",
     ":formfiller",
     ":fpdfapi",
     ":fpdfdoc",
     ":fpdftext",
     ":fpdfxfa",
@@ skipping 50 matching lines @@
   if (pdf_enable_v8) {
     deps += [
       "//v8",
       "//v8:v8_libplatform",
     ]
     include_dirs += [
       "//v8",
       "//v8/include",
     ]
   }
-  configs -= [ "//build/config/compiler:chromium_code" ]
-  configs += [
-    ":pdfium_config",
-    "//build/config/compiler:no_chromium_code",
-  ]
+  configs += [ ":pdfium_config" ]
 }
 
 # Targets below this are only visible within this file (and to the
 # top-level gn_visibility target used to help gn_all build everything).
 visibility = [
   ":*",
   "//:gn_visibility",
 ]
 
 static_library("fdrm") {
   sources = [
     "core/include/fdrm/fx_crypt.h",
     "core/src/fdrm/crypto/fx_crypt.cpp",
     "core/src/fdrm/crypto/fx_crypt_aes.cpp",
     "core/src/fdrm/crypto/fx_crypt_sha.cpp",
   ]
-  configs -= [ "//build/config/compiler:chromium_code" ]
-  configs += [
-    ":pdfium_config",
-    "//build/config/compiler:no_chromium_code",
-  ]
+  configs += [ ":pdfium_config" ]
 }
 
 static_library("fpdfdoc") {
   sources = [
     "core/include/fpdfdoc/fpdf_ap.h",
     "core/include/fpdfdoc/fpdf_doc.h",
     "core/include/fpdfdoc/fpdf_tagged.h",
     "core/include/fpdfdoc/fpdf_vt.h",
     "core/src/fpdfdoc/doc_action.cpp",
     "core/src/fpdfdoc/doc_annot.cpp",
     "core/src/fpdfdoc/doc_ap.cpp",
     "core/src/fpdfdoc/doc_basic.cpp",
     "core/src/fpdfdoc/doc_bookmark.cpp",
     "core/src/fpdfdoc/doc_form.cpp",
     "core/src/fpdfdoc/doc_formcontrol.cpp",
     "core/src/fpdfdoc/doc_formfield.cpp",
     "core/src/fpdfdoc/doc_link.cpp",
     "core/src/fpdfdoc/doc_metadata.cpp",
     "core/src/fpdfdoc/doc_ocg.cpp",
     "core/src/fpdfdoc/doc_tagged.cpp",
     "core/src/fpdfdoc/doc_utils.cpp",
     "core/src/fpdfdoc/doc_utils.h",
     "core/src/fpdfdoc/doc_viewerPreferences.cpp",
     "core/src/fpdfdoc/doc_vt.cpp",
     "core/src/fpdfdoc/doc_vtmodule.cpp",
     "core/src/fpdfdoc/pdf_vt.h",
     "core/src/fpdfdoc/tagged_int.h",
   ]
-  configs -= [ "//build/config/compiler:chromium_code" ]
-  configs += [
-    ":pdfium_config",
-    "//build/config/compiler:no_chromium_code",
-  ]
+  configs += [ ":pdfium_config" ]
 }
 
 static_library("fpdfapi") {
   sources = [
     "core/include/fpdfapi/fpdf_module.h",
     "core/include/fpdfapi/fpdf_objects.h",
     "core/include/fpdfapi/fpdf_page.h",
     "core/include/fpdfapi/fpdf_pageobj.h",
     "core/include/fpdfapi/fpdf_parser.h",
     "core/include/fpdfapi/fpdf_render.h",
@@ skipping 95 matching lines @@
     "core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp",
     "core/src/fpdfapi/fpdf_parser/fpdf_parser_utility.cpp",
     "core/src/fpdfapi/fpdf_render/fpdf_render.cpp",
     "core/src/fpdfapi/fpdf_render/fpdf_render_cache.cpp",
     "core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp",
     "core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp",
     "core/src/fpdfapi/fpdf_render/fpdf_render_pattern.cpp",
     "core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp",
     "core/src/fpdfapi/fpdf_render/render_int.h",
   ]
-  configs -= [ "//build/config/compiler:chromium_code" ]
-  configs += [
-    ":pdfium_config",
-    "//build/config/compiler:no_chromium_code",
-  ]
+  configs += [ ":pdfium_config" ]
 }
 
 static_library("fpdftext") {
   sources = [
     "core/include/fpdftext/fpdf_text.h",
     "core/src/fpdftext/fpdf_text.cpp",
     "core/src/fpdftext/fpdf_text_int.cpp",
     "core/src/fpdftext/fpdf_text_search.cpp",
     "core/src/fpdftext/text_int.h",
     "core/src/fpdftext/txtproc.h",
     "core/src/fpdftext/unicodenormalization.cpp",
     "core/src/fpdftext/unicodenormalizationdata.cpp",
     "core/src/fpdftext/unicodenormalizationdata.h",
   ]
-  configs -= [ "//build/config/compiler:chromium_code" ]
-  configs += [
-    ":pdfium_config",
-    "//build/config/compiler:no_chromium_code",
-  ]
+  configs += [ ":pdfium_config" ]
 }
 
 static_library("fxcodec") {
   deps = [
     "third_party:fx_lcms2",
     "third_party:fx_libjpeg",
     "third_party:fx_libopenjpeg",
     "third_party:fx_lpng",
     "third_party:fx_tiff",
     "third_party:fx_zlib",
@@ skipping 53 matching lines @@
     "core/src/fxcodec/jbig2/JBig2_Segment.h",
     "core/src/fxcodec/jbig2/JBig2_SymbolDict.cpp",
     "core/src/fxcodec/jbig2/JBig2_SymbolDict.h",
     "core/src/fxcodec/jbig2/JBig2_TrdProc.cpp",
     "core/src/fxcodec/jbig2/JBig2_TrdProc.h",
     "core/src/fxcodec/lbmp/fx_bmp.cpp",
     "core/src/fxcodec/lbmp/fx_bmp.h",
     "core/src/fxcodec/lgif/fx_gif.cpp",
     "core/src/fxcodec/lgif/fx_gif.h",
   ]
-  configs -= [ "//build/config/compiler:chromium_code" ]
 
   if (is_posix) {
     # core/src/fxcodec/fx_libopenjpeg/src/fx_mct.c does an pointer-to-int
     # conversion to check that an address is 16-bit aligned (benign).
     cflags_c = [ "-Wno-pointer-to-int-cast" ]
   }
-  configs += [
-    ":pdfium_config",
-    "//build/config/compiler:no_chromium_code",
-  ]
+  configs += [ ":pdfium_config" ]
 }
 
 config("fxge_warnings") {
   if (is_clang) {
     cflags = [
       # http://code.google.com/p/pdfium/issues/detail?id=188
       "-Wno-switch",
     ]
   }
 }
@@ skipping 35 matching lines @@
     "core/src/fxcrt/fx_xml_parser.cpp",
     "core/src/fxcrt/fxcrt_platforms.cpp",
     "core/src/fxcrt/fxcrt_platforms.h",
     "core/src/fxcrt/fxcrt_posix.cpp",
     "core/src/fxcrt/fxcrt_posix.h",
     "core/src/fxcrt/fxcrt_windows.cpp",
     "core/src/fxcrt/fxcrt_windows.h",
     "core/src/fxcrt/plex.h",
     "core/src/fxcrt/xml_int.h",
   ]
-  configs -= [ "//build/config/compiler:chromium_code" ]
-  configs += [
-    ":pdfium_config",
-    "//build/config/compiler:no_chromium_code",
-  ]
+  configs += [ ":pdfium_config" ]
 }
 
 static_library("fxge") {
   deps = [
     "third_party:fx_agg",
   ]
   sources = [
     "core/include/fxge/fpf.h",
     "core/include/fxge/fx_dib.h",
     "core/include/fxge/fx_font.h",
@@ skipping 45 matching lines @@
     "core/src/fxge/ge/fx_ge_device.cpp",
     "core/src/fxge/ge/fx_ge_font.cpp",
     "core/src/fxge/ge/fx_ge_fontmap.cpp",
     "core/src/fxge/ge/fx_ge_linux.cpp",
     "core/src/fxge/ge/fx_ge_path.cpp",
     "core/src/fxge/ge/fx_ge_ps.cpp",
     "core/src/fxge/ge/fx_ge_text.cpp",
     "core/src/fxge/ge/text_int.h",
   ]
 
-  configs -= [ "//build/config/compiler:chromium_code" ]
   configs += [
+    ":fxge_warnings",
     ":pdfium_config",
-    "//build/config/compiler:no_chromium_code",
-    # Must be after no_chromium_code for warning flags to be ordered correctly.
-    ":fxge_warnings",
   ]
 
   if (pdf_use_skia) {
     sources = [
       "core/src/fxge/skia/fx_skia_blitter_new.cpp",
       "core/src/fxge/skia/fx_skia_device.cpp",
     ]
     include_dirs = [
       "//third_party/skia/include/config",
       "//third_party/skia/include/core",
@@ skipping 29 matching lines @@
     "fpdfsdk/include/fxedit/fx_edit.h",
     "fpdfsdk/include/fxedit/fxet_edit.h",
     "fpdfsdk/include/fxedit/fxet_list.h",
     "fpdfsdk/include/fxedit/fxet_stub.h",
     "fpdfsdk/src/fxedit/fxet_ap.cpp",
     "fpdfsdk/src/fxedit/fxet_edit.cpp",
     "fpdfsdk/src/fxedit/fxet_list.cpp",
     "fpdfsdk/src/fxedit/fxet_module.cpp",
     "fpdfsdk/src/fxedit/fxet_pageobjs.cpp",
   ]
-  configs -= [ "//build/config/compiler:chromium_code" ]
-  configs += [
-    ":pdfium_config",
-    "//build/config/compiler:no_chromium_code",
-  ]
+  configs += [ ":pdfium_config" ]
 }
 
 static_library("pdfwindow") {
   sources = [
     "fpdfsdk/include/pdfwindow/IPDFWindow.h",
     "fpdfsdk/include/pdfwindow/PDFWindow.h",
     "fpdfsdk/include/pdfwindow/PWL_Button.h",
     "fpdfsdk/include/pdfwindow/PWL_Caret.h",
     "fpdfsdk/include/pdfwindow/PWL_ComboBox.h",
     "fpdfsdk/include/pdfwindow/PWL_Edit.h",
@@ skipping 21 matching lines @@
     "fpdfsdk/src/pdfwindow/PWL_Label.cpp",
     "fpdfsdk/src/pdfwindow/PWL_ListBox.cpp",
     "fpdfsdk/src/pdfwindow/PWL_ListCtrl.cpp",
     "fpdfsdk/src/pdfwindow/PWL_Note.cpp",
     "fpdfsdk/src/pdfwindow/PWL_ScrollBar.cpp",
     "fpdfsdk/src/pdfwindow/PWL_Signature.cpp",
     "fpdfsdk/src/pdfwindow/PWL_SpecialButton.cpp",
     "fpdfsdk/src/pdfwindow/PWL_Utils.cpp",
     "fpdfsdk/src/pdfwindow/PWL_Wnd.cpp",
   ]
-  configs -= [ "//build/config/compiler:chromium_code" ]
-  configs += [
-    ":pdfium_config",
-    "//build/config/compiler:no_chromium_code",
-  ]
+  configs += [ ":pdfium_config" ]
 }
 
 static_library("javascript") {
   sources = [
     "fpdfsdk/include/javascript/IJavaScript.h",
   ]
   if (pdf_enable_v8) {
     sources += [
       "fpdfsdk/src/javascript/Consts.cpp",
       "fpdfsdk/src/javascript/Consts.h",
@@ skipping 40 matching lines @@
     include_dirs = [
       "//v8",
       "//v8/include",
     ]
     public_deps = [
       "//v8",
     ]
   } else {
     sources += [ "fpdfsdk/src/javascript/JS_Runtime_Stub.cpp" ]
   }
-  configs -= [ "//build/config/compiler:chromium_code" ]
-  configs += [
-    ":pdfium_config",
-    "//build/config/compiler:no_chromium_code",
-  ]
+  configs += [ ":pdfium_config" ]
 }
 
 static_library("formfiller") {
   sources = [
     "fpdfsdk/include/formfiller/FFL_CBA_Fontmap.h",
     "fpdfsdk/include/formfiller/FFL_CheckBox.h",
     "fpdfsdk/include/formfiller/FFL_ComboBox.h",
     "fpdfsdk/include/formfiller/FFL_FormFiller.h",
     "fpdfsdk/include/formfiller/FFL_IFormFiller.h",
     "fpdfsdk/include/formfiller/FFL_ListBox.h",
     "fpdfsdk/include/formfiller/FFL_PushButton.h",
     "fpdfsdk/include/formfiller/FFL_RadioButton.h",
     "fpdfsdk/include/formfiller/FFL_TextField.h",
     "fpdfsdk/include/formfiller/FormFiller.h",
     "fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp",
     "fpdfsdk/src/formfiller/FFL_CheckBox.cpp",
     "fpdfsdk/src/formfiller/FFL_ComboBox.cpp",
     "fpdfsdk/src/formfiller/FFL_FormFiller.cpp",
     "fpdfsdk/src/formfiller/FFL_IFormFiller.cpp",
     "fpdfsdk/src/formfiller/FFL_ListBox.cpp",
     "fpdfsdk/src/formfiller/FFL_PushButton.cpp",
     "fpdfsdk/src/formfiller/FFL_RadioButton.cpp",
     "fpdfsdk/src/formfiller/FFL_TextField.cpp",
   ]
-  configs -= [ "//build/config/compiler:chromium_code" ]
-  configs += [
-    ":pdfium_config",
-    "//build/config/compiler:no_chromium_code",
-  ]
+  configs += [ ":pdfium_config" ]
 }
 
 static_library("fpdfxfa") {
   sources = [
     "fpdfsdk/src/fpdfxfa/fpdfxfa_app.cpp",
     "fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp",
     "fpdfsdk/src/fpdfxfa/fpdfxfa_page.cpp",
     "fpdfsdk/src/fpdfxfa/fpdfxfa_util.cpp",
     "fpdfsdk/include/fpdfxfa/fpdfxfa_app.h",
     "fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h",
@@ skipping 699 matching lines @@
     "xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder_unittest.cpp",
     "xfa/src/fxfa/src/parser/xfa_utils_imp_unittest.cpp",
   ]
   deps = [
     "//testing/gtest",
     "//testing/gtest:gtest_main",
     ":pdfium",
     ":test_support",
   ]
   include_dirs = [ "." ]
-  configs -= [ "//build/config/compiler:chromium_code" ]
-  configs += [
-    ":pdfium_config",
-    "//build/config/compiler:no_chromium_code",
-  ]
+  configs += [ ":pdfium_config" ]
 }
 
 test("pdfium_embeddertests") {
   sources = [
     "core/src/fpdfapi/fpdf_page/fpdf_page_func_embeddertest.cpp",
     "core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_embeddertest.cpp",
     "core/src/fpdfapi/fpdf_parser/fpdf_parser_parser_embeddertest.cpp",
     "core/src/fpdfapi/fpdf_render/fpdf_render_pattern_embeddertest.cpp",
     "fpdfsdk/src/fpdf_dataavail_embeddertest.cpp",
     "fpdfsdk/src/fpdfdoc_embeddertest.cpp",
@@ skipping 23 matching lines @@
     ]
     deps += [
       "//v8",
       "//v8:v8_libplatform",
     ]
     include_dirs += [
       "//v8",
       "//v8/include",
     ]
   }
-  configs -= [ "//build/config/compiler:chromium_code" ]
-  configs += [
-    ":pdfium_config",
-    "//build/config/compiler:no_chromium_code",
-  ]
+  configs += [ ":pdfium_config" ]
 }