From 5312f9a6ed88e653f4cfb604d892ca18da75e721 Mon Sep 17 00:00:00 2001
From: Nico Weber <thakis@chromium.org>
Date: Thu, 13 Aug 2015 15:03:21 -0700
Subject: Suppress -Wunused-function for pdfium's third-party libraries.

Also add a missing header file.

BUG=505316
R=thestig@chromium.org

Review URL: https://codereview.chromium.org/1285123003 .
---
 third_party/BUILD.gn        | 27 ++++++++++++++++++++++++---
 third_party/third_party.gyp | 16 ++++++++++++++++
 2 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/third_party/BUILD.gn b/third_party/BUILD.gn
index b1c8e262fc..3d8bc77553 100644
--- a/third_party/BUILD.gn
+++ b/third_party/BUILD.gn
@@ -33,10 +33,19 @@ source_set("bigint") {
 # Tests may link against this even if the production library doesn't,
 # so it needs to be separate from it.
 static_library("fx_freetype") {
+  config("fx_freetype_warnings") {
+    if (is_clang) {
+      # open_face_PS_from_sfnt_stream() and open_face_from_buffer() in
+      # ftbase.h are unused.
+      cflags = [ "-Wno-unused-function" ]
+    }
+  }
+
   configs -= [ "//build/config/compiler:chromium_code" ]
   configs += [
     "//build/config/compiler:no_chromium_code",
     "//third_party/pdfium:pdfium_config",
+    ":fx_freetype_warnings",
   ]
   defines = [ "FT2_BUILD_LIBRARY" ]
   sources = [
@@ -50,6 +59,7 @@ static_library("fx_freetype") {
     "freetype/include/internal/tttypes.h",
     "freetype/include/tttables.h",
     "freetype/src/base/ftbase.c",
+    "freetype/src/base/ftbase.h",
     "freetype/src/base/ftbitmap.c",
     "freetype/src/base/ftglyph.c",
     "freetype/src/base/ftinit.c",
@@ -72,10 +82,17 @@ static_library("fx_freetype") {
 }
 
 source_set("fx_agg") {
+  config("fx_agg_warnings") {
+    if (is_clang) {
+      # calc_butt_cap() in agg_vcgen_stroke.cpp is unused.
+      cflags = [ "-Wno-unused-function" ]
+    }
+  }
   configs -= [ "//build/config/compiler:chromium_code" ]
   configs += [
     "//build/config/compiler:no_chromium_code",
     "//third_party/pdfium:pdfium_config",
+    ":fx_agg_warnings",
   ]
   sources = [
     "agg23/agg_basics.h",
@@ -99,9 +116,13 @@ source_set("fx_agg") {
 source_set("fx_lcms2") {
   config("fx_lcms2_warnings") {
     if (is_clang) {
-      # cmslut.cc is sloppy with aggregate initialization. Version 2.7 of this
-      # library doesn't appear to have this problem.
-      cflags = [ "-Wno-missing-braces" ]
+      cflags = [
+        # cmslut.cc is sloppy with aggregate initialization. Version 2.7 of this
+        # library doesn't appear to have this problem.
+        "-Wno-missing-braces",
+        # FindPrev() in cmsplugin.c is unused.
+        "-Wno-unused-function",
+      ]
     }
   }
   configs -= [ "//build/config/compiler:chromium_code" ]
diff --git a/third_party/third_party.gyp b/third_party/third_party.gyp
index 4403f3cdac..6ad8beb48c 100644
--- a/third_party/third_party.gyp
+++ b/third_party/third_party.gyp
@@ -52,6 +52,7 @@
         'freetype/src/cff/cfftypes.h',
         'freetype/src/cff/cff.c',
         'freetype/src/base/ftbase.c',
+        'freetype/src/base/ftbase.h',
         'freetype/src/base/ftbitmap.c',
         'freetype/src/base/ftglyph.c',
         'freetype/src/base/ftinit.c',
@@ -68,6 +69,13 @@
         'freetype/src/type1/type1.c',
         'freetype/src/cid/type1cid.c',
       ],
+      'variables': {
+        'clang_warning_flags': [
+          # open_face_PS_from_sfnt_stream() and open_face_from_buffer() in
+          # ftbase.h are unused.
+          '-Wno-unused-function',
+        ],
+      },
     },
     {
       'target_name': 'fx_agg',
@@ -95,6 +103,12 @@
           'cflags': [ '-Wno-extra', ],
         }],
       ],
+      'variables': {
+        'clang_warning_flags': [
+          # calc_butt_cap() in agg_vcgen_stroke.cpp is unused.
+          '-Wno-unused-function',
+        ],
+      },
     },
     {
       'target_name': 'fx_lcms2',
@@ -140,6 +154,8 @@
       'variables': {
         'clang_warning_flags': [
           '-Wno-missing-braces',
+          # FindPrev() in cmsplugin.c is unused.
+          '-Wno-unused-function',
         ],
       },
     },
-- 
cgit v1.2.3