www/chromium: update to 54.0.2840.100

Submitted by:	clutton <clutton@zoho.com>
Reviewed by:	cpm, rene
Obtained from:	https://github.com/paranormal/
MFH:		2016Q4
Security:        https://vuxml.freebsd.org/freebsd/769ba449-79e1-11e6-bf75-3065ec8fd3ec.html
Security:        https://vuxml.freebsd.org/freebsd/653a8059-7c49-11e6-9242-3065ec8fd3ec.html
Security:        https://vuxml.freebsd.org/freebsd/9c135c7e-9fa4-11e6-a265-3065ec8fd3ec.html
Security:        https://vuxml.freebsd.org/freebsd/9118961b-9fa5-11e6-a265-3065ec8fd3ec.html
Security:        https://vuxml.freebsd.org/freebsd/ae9cb9b8-a203-11e6-a265-3065ec8fd3ec.html
Security:        https://vuxml.freebsd.org/freebsd/a3473f5a-a739-11e6-afaa-e8e0b747a45a.html
Differential Revision:	https://reviews.freebsd.org/D8517

1 files changed, 23 insertions, 22 deletions

diff --git a/www/chromium/files/extra-patch-clang b/www/chromium/files/extra-patch-clang
index 034863ece00a..13eeca5e1b7d 100644
--- a/www/chromium/files/extra-patch-clang
+++ b/www/chromium/files/extra-patch-clang
@@ -1,13 +1,14 @@
---- base/strings/safe_sprintf_unittest.cc   2015-04-15 00:18:48.000000000 +0200
-+++ base/strings/safe_sprintf_unittest.cc   2015-04-18 22:08:45.000000000 +0200
-@@ -729,12 +729,14 @@
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wconversion-null"
- #endif
+--- base/strings/safe_sprintf_unittest.cc.orig	2016-10-06 04:02:08.000000000 +0300
++++ base/strings/safe_sprintf_unittest.cc	2016-10-25 21:42:28.951114000 +0300
+@@ -728,6 +728,7 @@
+ }
+
+ TEST(SafeSPrintfTest, EmitNULL) {
 +/* Avoid compiler error: http://pastebin.com/1edWUE84
-   EXPECT_EQ(1, SafeSPrintf(buf, "%d", NULL));
-   EXPECT_EQ("0", std::string(buf));
-   EXPECT_EQ(3, SafeSPrintf(buf, "%p", NULL));
+   char buf[40];
+ #if defined(__GNUC__)
+ #pragma GCC diagnostic push
+@@ -739,6 +740,7 @@
    EXPECT_EQ("0x0", std::string(buf));
    EXPECT_EQ(6, SafeSPrintf(buf, "%s", NULL));
    EXPECT_EQ("<NULL>", std::string(buf));
@@ -41,7 +42,7 @@
 +++ base/tracked_objects_unittest.cc    2015-09-03 09:20:53.370191000 -0400
 @@ -58,9 +58,9 @@
      Births* birth = ThreadData::TallyABirthIfActive(location);
- 
+
      if (ThreadData::status() == ThreadData::DEACTIVATED)
 -      EXPECT_EQ(reinterpret_cast<Births*>(NULL), birth);
 +      EXPECT_EQ(static_cast<Births*>(NULL), birth);
@@ -49,7 +50,7 @@
 -      EXPECT_NE(reinterpret_cast<Births*>(NULL), birth);
 +      EXPECT_NE(static_cast<Births*>(NULL), birth);
    }
- 
+
    // Helper function to verify the most common test expectations.
 --- components/sync_sessions/synced_session_tracker.cc.orig	2016-01-21 13:04:41.772845558 +0100
 +++ components/sync_sessions/synced_session_tracker.cc	2016-01-21 13:05:17.652842509 +0100
@@ -70,34 +71,34 @@
          .Times(2)
 -        .WillRepeatedly(Return(reinterpret_cast<AudioOutputStream*>(NULL)));
 +        .WillRepeatedly(Return(static_cast<AudioOutputStream*>(NULL)));
- 
+
      EXPECT_CALL(callback_, OnError(_))
          .Times(2);
 --- third_party/hunspell/src/hunspell/affentry.hxx.orig 2015-07-21 18:46:37.322427000 -0400
 +++ third_party/hunspell/src/hunspell/affentry.hxx  2015-07-21 18:48:02.034251000 -0400
 @@ -27,7 +27,7 @@
-   struct hentry *      checkword(const char * word, int len, char in_compound, 
+   struct hentry *      checkword(const char * word, int len, char in_compound,
                              const FLAG needflag = FLAG_NULL);
- 
+
 -  struct hentry *      check_twosfx(const char * word, int len, char in_compound, const FLAG needflag = NULL);
 +  struct hentry *      check_twosfx(const char * word, int len, char in_compound, const FLAG needflag = 0);
- 
+
    char *      check_morph(const char * word, int len, char in_compound,
                              const FLAG needflag = FLAG_NULL);
 @@ -90,7 +90,7 @@
  //                    const FLAG cclass = FLAG_NULL, const FLAG needflag = FLAG_NULL, char in_compound=IN_CPD_NOT);
                      const FLAG cclass = FLAG_NULL, const FLAG needflag = FLAG_NULL, const FLAG badflag = 0);
- 
+
 -  struct hentry *   check_twosfx(const char * word, int len, int optflags, PfxEntry* ppfx, const FLAG needflag = NULL);
 +  struct hentry *   check_twosfx(const char * word, int len, int optflags, PfxEntry* ppfx, const FLAG needflag = 0);
- 
+
    char *      check_twosfx_morph(const char * word, int len, int optflags,
                   PfxEntry* ppfx, const FLAG needflag = FLAG_NULL);
 --- third_party/sfntly/src/cpp/src/sfntly/table/core/cmap_table.cc	2015-04-15 00:31:48.000000000 +0200
 +++ third_party/sfntly/src/cpp/src/sfntly/table/core/cmap_table.cc	2015-04-18 22:05:41.000000000 +0200
 @@ -439,7 +439,7 @@
  }
- 
+
  CMapTable::CMapFormat0::Builder::Builder(const CMapId& cmap_id)
 -    : CMap::Builder(reinterpret_cast<ReadableFontData*>(NULL),
 +    : CMap::Builder(static_cast<ReadableFontData*>(NULL),
@@ -133,13 +134,13 @@
        glyph_id_array_(glyph_id_array->begin(), glyph_id_array->end()) {
 @@ -966,7 +966,7 @@
  }
- 
+
  CMapTable::CMapFormat4::Builder::Builder(const CMapId& cmap_id)
 -    : CMap::Builder(reinterpret_cast<ReadableFontData*>(NULL),
 +    : CMap::Builder(static_cast<ReadableFontData*>(NULL),
                      CMapFormat::kFormat4, cmap_id) {
  }
- 
+
 --- third_party/webrtc/base/taskrunner.cc	2015-04-15 00:32:17.000000000 +0200
 +++ third_party/webrtc/base/taskrunner.cc	2015-04-18 22:10:53.000000000 +0200
 @@ -102,7 +102,7 @@
@@ -148,6 +149,6 @@
                     tasks_.end(),
 -                   reinterpret_cast<Task *>(NULL));
 +                   static_cast<Task *>(NULL));
- 
+
    tasks_.erase(it, tasks_.end());
- 
+