Merge branch 'master' into f26

7 years ago · a2f0a8717b
parent 6844a767bb 6af85f90fe
commit a2f0a8717b
68 changed files with 430 additions and 5184 deletions
--- a/.gitignore
+++ b/.gitignore
@ -33,3 +33,4 @@
 /chromium-61.0.3163.100-clean.tar.xz
 /chromium-62.0.3202.75-clean.tar.xz
 /chromium-62.0.3202.89-clean.tar.xz
 /chromium-63.0.3239.84-clean.tar.xz
--- a/chromium-46.0.2490.71-gcc5.patch
+++ b/chromium-46.0.2490.71-gcc5.patch
@ -1,354 +0,0 @@
 diff -up chromium-46.0.2490.71/third_party/cld_2/src/internal/cld_generated_cjk_uni_prop_80.cc.gcc5 chromium-46.0.2490.71/third_party/cld_2/src/internal/cld_generated_cjk_uni_prop_80.cc
 --- chromium-46.0.2490.71/third_party/cld_2/src/internal/cld_generated_cjk_uni_prop_80.cc.gcc5	2015-10-06 22:42:52.000000000 -0400
 +++ chromium-46.0.2490.71/third_party/cld_2/src/internal/cld_generated_cjk_uni_prop_80.cc	2015-10-15 23:42:00.645518701 -0400
@@ -165,8 +165,8 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
 // state[16 + 2] 0x000000 Byte 2 of 3 (relative offsets)
 X__,X__,X__,X__,X__,X__,X__,X__, X__,X__,X__,X__,X__,X__,X__,X__,
 X__,X__,X__,X__,X__,X__,X__,X__, X__,X__,X__,X__,X__,X__,X__,X__,
 --14,-14,-14,-14,-14,-14,-14,-14, -14,-14,-14,-14,-14,-14,-14,-14,
 --14,-14,-14,-14,-14,-14,-14,-14, -14,-14,-14,-14,-14,-14,-14,-14,
 +(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14, (uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,
 +(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14, (uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,
 // state[17 + 2] 0x0031c0 Byte 3 of 3 (property)
   0,  0,  0,  0,  0,  0,  0,  0,   0,  0,  0,  0,  0,  0,  0,  0,
@@ -259,10 +259,10 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
 229,229,229,  3,208,  0,229,  5, 233,  0,229,229,229,208,229,229,
 // state[32 + 2] 0x002000 Byte 2 of 3 (relative offsets)
 --30,-30,-30,-30,-30,-30,-30,-30, -30,-30,-30,-30,-30,-30,-30,-30,
 --30,-30,-30,-30,-30,-30,-30,-30, -30,-30,-30,-30,-30,-30,-30,-30,
 --30,-30,-30,-30,-30,-30,-30,-30, -30,-30,-30,-30,-30,-30,-30,-30,
 --30,-30,-30,-30,-30,-30,-30,-30, -30,-30,-30,-30,-30,-30,-30,-30,
 +(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30, (uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,
 +(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30, (uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,
 +(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30, (uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,
 +(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30, (uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,
 // state[33 + 2] 0x003780 Byte 3 of 3 (property)
 229,208,229,229,208,229,229,229, 208,208,208,208,208,  4,  6,208,
@@ -355,10 +355,10 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
 228,229,229,229,229,233,233,  6, 208,229,  3,229,233,  6,  6,  0,
 // state[48 + 2] 0x001000 Byte 2 of 3 (relative offsets)
 --46,-46,-46,-46,-42,-41,-40,-39, -46,-46,-46,-46,-46,-46,-46,-46,
 --46,-46,-46,-46,-46,-46,-46,-46, -46,-46,-46,-46,-46,-46,-46,-46,
 --46,-46,-46,-46,-46,-46,-46,-46, -46,-46,-46,-46,-46,-46,-46,-46,
 --46,-46,-46,-46,-46,-46,-46,-46, -46,-46,-46,-46,-46,-46,-46,-46,
 +(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-42,(uint8)-41,(uint8)-40,(uint8)-39, (uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,
 +(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46, (uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,
 +(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46, (uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,
 +(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46, (uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,
 // state[49 + 2] 0x003b40 Byte 3 of 3 (property)
   6,227,208,233,208,  3,  3,208, 208,229,  0,229,233,219,  0,  6,
@@ -451,10 +451,10 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
 229,208,208,208,217,208,229,229, 229,229,208,217,208,229,229,229,
 // state[64 + 2] 0x003000 Byte 2 of 3 (relative offsets)
 --54,-53,-52,-51,-50,-58,-49,-47, -62,-62,-62,-62,-62,-62,-62,-62,
 --46,-45,-44,-43,-42,-41,-40,-39, -38,-37,-36,-35,-34,-33,-31,-30,
 --29,-28,-27,-26,-25,-24,-23,-22, -21,-20,-19,-18,-17,-15,-14,-13,
 --12,-11,-10, -9, -8, -7, -6, -5,  -4, -3, -2, -1,  1,  2,  3,  4,
 +(uint8)-54,(uint8)-53,(uint8)-52,(uint8)-51,(uint8)-50,(uint8)-58,(uint8)-49,(uint8)-47, (uint8)-62,(uint8)-62,(uint8)-62,(uint8)-62,(uint8)-62,(uint8)-62,(uint8)-62,(uint8)-62,
 +(uint8)-46,(uint8)-45,(uint8)-44,(uint8)-43,(uint8)-42,(uint8)-41,(uint8)-40,(uint8)-39, (uint8)-38,(uint8)-37,(uint8)-36,(uint8)-35,(uint8)-34,(uint8)-33,(uint8)-31,(uint8)-30,
 +(uint8)-29,(uint8)-28,(uint8)-27,(uint8)-26,(uint8)-25,(uint8)-24,(uint8)-23,(uint8)-22, (uint8)-21,(uint8)-20,(uint8)-19,(uint8)-18,(uint8)-17,(uint8)-15,(uint8)-14,(uint8)-13,
 +(uint8)-12,(uint8)-11,(uint8)-10, (uint8)-9, (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5,  (uint8)-4, (uint8)-3, (uint8)-2, (uint8)-1,  1,  2,  3,  4,
 // state[65 + 2] 0x003f00 Byte 3 of 3 (property)
 217,217,208,  3,208,217,208,208,   6,229,208,228,229,229,208,229,
@@ -547,10 +547,10 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
 229,208,229,229,208,229,233,  0, 208,208,229,208,227,229,229,229,
 // state[80 + 2] 0x004000 Byte 2 of 3 (relative offsets)
 --11,-10, -9, -8, -7, -6, -5, -4,  -3, -2, -1,  1,  2,  3,  4,  5,
 +(uint8)-11,(uint8)-10, (uint8)-9, (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4,  (uint8)-3, (uint8)-2, (uint8)-1,  1,  2,  3,  4,  5,
   6,  7,  8,  9, 10, 11, 12, 13,  14, 15, 16, 17, 18, 19, 20, 21,
  22, 23, 24, 25, 26, 27, 28, 29,  30, 31, 32, 33, 34, 35, 36, 37,
 - 38, 39, 40, 41, 42, 43, 44,-78,  45, 46, 47, 48, 49, 50, 51, 52,
 + 38, 39, 40, 41, 42, 43, 44,(uint8)-78,  45, 46, 47, 48, 49, 50, 51, 52,
 // state[81 + 2] 0x0042c0 Byte 3 of 3 (property)
 229,  0,229,229,229,  3,  4,  4, 229,229,229,229,208,229,  0,208,
@@ -931,7 +931,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
   0,142, 98, 28,117,206,212,212, 220, 15,  0,231,199,231,111, 28,
 // state[144 + 2] 0x005000 Byte 2 of 3 (relative offsets)
 --11,-10, -9, -8, -7, -6, -5, -4,  -3, -2, -1,  1,  2,  3,  4,  5,
 +(uint8)-11,(uint8)-10, (uint8)-9, (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4,  (uint8)-3, (uint8)-2, (uint8)-1,  1,  2,  3,  4,  5,
   6,  7,  8,  9, 10, 11, 12, 13,  14, 15, 16, 17, 18, 19, 20, 21,
  22, 23, 24, 25, 26, 27, 28, 29,  30, 31, 32, 33, 34, 35, 36, 37,
  38, 39, 40, 41, 42, 43, 44, 45,  46, 47, 48, 49, 50, 51, 52, 53,
@@ -1315,7 +1315,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
  16, 15,211,118,  0,231, 68,231,   0, 99,161,  0,115,221,144,140,
 // state[208 + 2] 0x006000 Byte 2 of 3 (relative offsets)
 --10, -9, -8, -7, -6, -5, -4, -3,  -2, -1,  1,  2,  3,  4,  5,  6,
 +(uint8)-10, (uint8)-9, (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4, (uint8)-3,  (uint8)-2, (uint8)-1,  1,  2,  3,  4,  5,  6,
   7,  8,  9, 10, 11, 12, 13, 14,  15, 16, 17, 18, 19, 20, 21, 22,
  23, 24, 25, 26, 27, 28, 29, 30,  31, 32, 33, 34, 35, 36, 37, 38,
  39, 40, 41, 42, 43, 44, 45, 46,  47, 48, 49, 50, 51, 52, 53, 54,
@@ -1699,7 +1699,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
 119, 16, 51,  0,  0, 68,136, 72, 144,118, 87,201,191,136, 78,233,
 // state[272 + 2] 0x007000 Byte 2 of 3 (relative offsets)
 - -9, -8, -7, -6, -5, -4, -3, -2,  -1,  1,  2,  3,  4,  5,  6,  7,
 + (uint8)-9, (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4, (uint8)-3, (uint8)-2,  (uint8)-1,  1,  2,  3,  4,  5,  6,  7,
   8,  9, 10, 11, 12, 13, 14, 15,  16, 17, 18, 19, 20, 21, 22, 23,
  24, 25, 26, 27, 28, 29, 30, 31,  32, 33, 34, 35, 36, 37, 38, 39,
  40, 41, 42, 43, 44, 45, 46, 47,  48, 49, 50, 51, 52, 53, 54, 55,
@@ -2083,7 +2083,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
 212,212,  0,126,140,220,220,  0,   0,  0,127,118,106,  0,199,  0,
 // state[336 + 2] 0x008000 Byte 2 of 3 (relative offsets)
 - -8, -7, -6, -5, -4, -3, -2, -1,   1,  2,  3,  4,  5,  6,  7,  8,
 + (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4, (uint8)-3, (uint8)-2, (uint8)-1,   1,  2,  3,  4,  5,  6,  7,  8,
   9, 10, 11, 12, 13, 14, 15, 16,  17, 18, 19, 20, 21, 22, 23, 24,
  25, 26, 27, 28, 29, 30, 31, 32,  33, 34, 35, 36, 37, 38, 39, 40,
  41, 42, 43, 44, 45, 46, 47, 48,  49, 50, 51, 52, 53, 54, 55, 56,
@@ -2467,7 +2467,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
   0,122,  0,231,100,232,  0,  0, 117,  0,206,231,  0,  0,231,  0,
 // state[400 + 2] 0x009000 Byte 2 of 3 (relative offsets)
 - -7, -6, -5, -4, -3, -2, -1,  1,   2,  3,  4,  5,  6,  7,  8,  9,
 + (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4, (uint8)-3, (uint8)-2, (uint8)-1,  1,   2,  3,  4,  5,  6,  7,  8,  9,
  10, 11, 12, 13, 14, 15, 16, 17,  18, 19, 20, 21, 22, 23, 24, 25,
  26, 27, 28, 29, 30, 31, 32, 33,  34, 35, 36, 37, 38, 39, 40, 41,
  42, 43, 44, 45, 46, 47, 48, 49,  50, 51, 52, 53, 54, 55, 56, 57,
@@ -2851,10 +2851,10 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
   0,  0,  0,  0,  0,  0,  0,  0,   0,  0,  0,  0,  0,  0,  0,  0,
 // state[464 + 2] 0x00a000 Byte 2 of 3 (relative offsets)
 - -6, -6, -6, -6, -6, -6, -6, -6,  -6, -6, -6, -6, -6, -6, -6, -6,
 - -6, -6, -6, -6, -6, -6, -6, -6,  -6, -6, -6, -6, -6, -6, -6, -6,
 - -6, -6, -6, -6, -6, -6, -6, -6,  -6, -6, -6, -6, -6, -6, -6, -6,
 - -5, -5, -5, -5, -5, -5, -5, -5,  -5, -5, -5, -5, -5, -5, -5, -5,
 + (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6,  (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6,
 + (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6,  (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6,
 + (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6,  (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6,
 + (uint8)-5, (uint8)-5, (uint8)-5, (uint8)-5, (uint8)-5, (uint8)-5, (uint8)-5, (uint8)-5,  (uint8)-5, (uint8)-5, (uint8)-5, (uint8)-5, (uint8)-5, (uint8)-5, (uint8)-5, (uint8)-5,
 // state[465 + 2] 0x000080 Byte 2 of 2 (property)
   0,  0,  0,  0,  0,  0,  0,  0,   0,  0,  0,  0,  0,  0,  0,  0,
@@ -2947,10 +2947,10 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
 208,208,208,208,  5,  6,208,  2,   0,  6,  6,  5,208,208,208,  6,
 // state[480 + 2] 0x00b000 Byte 2 of 3 (relative offsets)
 --20,-20,-20,-20,-20,-20,-20,-20, -20,-20,-20,-20,-20,-20,-20,-20,
 --20,-20,-20,-20,-20,-20,-20,-20, -20,-20,-20,-20,-20,-20,-20,-20,
 --20,-20,-20,-20,-20,-20,-20,-20, -20,-20,-20,-20,-20,-20,-20,-20,
 --20,-20,-20,-20,-20,-20,-20,-20, -20,-20,-20,-20,-20,-20,-20,-20,
 +(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20, (uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,
 +(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20, (uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,
 +(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20, (uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,
 +(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20, (uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,
 // state[481 + 2] 0x020100 Byte 4 of 4 (property)
   2,  6,  5,  6,  5,229,  5,208, 208,208,208,208,208,208,208,229,
@@ -3043,10 +3043,10 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
 208,208,  5,  5,  5,208,208,  2, 229,  5,  5,  5,  5,  5,  6,208,
 // state[496 + 2] 0x00d000 Byte 2 of 3 (relative offsets)
 --35,-35,-35,-35,-35,-35,-35,-35, -35,-35,-35,-35,-35,-35,-35,-35,
 --35,-35,-35,-35,-35,-35,-35,-35, -35,-35,-35,-35,-35,-35,-34,-33,
 --33,-33,-33,-33,-33,-33,-33,-33, -33,-33,-33,-33,-33,-33,-33,-33,
 --33,-33,-33,-33,-33,-33,-33,-33, -33,-33,-33,-33,-33,-33,-33,-33,
 +(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35, (uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,
 +(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35, (uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-34,(uint8)-33,
 +(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33, (uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,
 +(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33, (uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,
 // state[497 + 2] 0x0204c0 Byte 4 of 4 (property)
   2,  2,  5,  5,  5,  2,208,  2,   5,  5,  6,208,208,  5,  5,  5,
@@ -3139,10 +3139,10 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
 208,208,  5,  5,  5,  5,  6,  6, 208,208,  2,208,208,208,208,208,
 // state[512 + 2] 0x00f000 Byte 2 of 3 (relative offsets)
 --47,-47,-47,-47,-47,-47,-47,-47, -47,-47,-47,-47,-47,-47,-47,-47,
 --47,-47,-47,-47,-47,-47,-47,-47, -47,-47,-47,-47,-47,-47,-47,-47,
 --47,-47,-47,-47,-46,-45,-44,-43, -42,-41,-44,-40,-47,-47,-47,-47,
 --47,-47,-47,-47,-47,-47,-47,-47, -47,-47,-47,-47,-47,-39,-38,-37,
 +(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47, (uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,
 +(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47, (uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,
 +(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-46,(uint8)-45,(uint8)-44,(uint8)-43, (uint8)-42,(uint8)-41,(uint8)-44,(uint8)-40,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,
 +(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47, (uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-39,(uint8)-38,(uint8)-37,
 // state[513 + 2] 0x020880 Byte 4 of 4 (property)
   5,  5,  5,  6,208,208,208,208, 208,208,  5,  5,  6,  6,208,208,
@@ -3235,10 +3235,10 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
   5,  6,208,218,208,208,208,218, 208,  6,227,229,  6,  6,  6,208,
 // state[528 + 2] 0x020000 Byte 3 of 4 (relative offsets)
 --52,-51,-50,-49,-47,-46,-45,-44, -43,-42,-41,-40,-39,-38,-37,-36,
 --35,-34,-33,-31,-30,-29,-28,-27, -26,-25,-24,-23,-22,-21,-20,-19,
 --18,-17,-15,-14,-13,-12,-11,-10,  -9, -8, -7, -6, -5, -4, -3, -2,
 - -1,  1,  2,  3,  4,  5,  6,  7,   8,  9, 10, 11, 12, 13, 14, 15,
 +(uint8)-52,(uint8)-51,(uint8)-50,(uint8)-49,(uint8)-47,(uint8)-46,(uint8)-45,(uint8)-44, (uint8)-43,(uint8)-42,(uint8)-41,(uint8)-40,(uint8)-39,(uint8)-38,(uint8)-37,(uint8)-36,
 +(uint8)-35,(uint8)-34,(uint8)-33,(uint8)-31,(uint8)-30,(uint8)-29,(uint8)-28,(uint8)-27, (uint8)-26,(uint8)-25,(uint8)-24,(uint8)-23,(uint8)-22,(uint8)-21,(uint8)-20,(uint8)-19,
 +(uint8)-18,(uint8)-17,(uint8)-15,(uint8)-14,(uint8)-13,(uint8)-12,(uint8)-11,(uint8)-10,  (uint8)-9, (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4, (uint8)-3, (uint8)-2,
 + (uint8)-1,  1,  2,  3,  4,  5,  6,  7,   8,  9, 10, 11, 12, 13, 14, 15,
 // state[529 + 2] 0x020c40 Byte 4 of 4 (property)
 227,  5,  5,  5,  2,  2,  2,  2, 213,  2,  2,  2,  2,  2,208,  6,
@@ -3427,7 +3427,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
 208,208,208,208,208,208,208,208, 208,  6,  6,  6,  6,  2,  5,  5,
 // state[560 + 2] 0x021000 Byte 3 of 4 (relative offsets)
 --16,-15,-14,-13,-12,-11,-10, -9,  -8, -7, -6, -5, -4, -3, -2, -1,
 +(uint8)-16,(uint8)-15,(uint8)-14,(uint8)-13,(uint8)-12,(uint8)-11,(uint8)-10, (uint8)-9,  (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4, (uint8)-3, (uint8)-2, (uint8)-1,
   1,  2,  3,  4,  5,  6,  7,  8,   9, 10, 11, 12, 13, 14, 15, 16,
  17, 18, 19, 20, 21, 22, 23, 24,  25, 26, 27, 28, 29, 30, 31, 32,
  33, 34, 35, 36, 37, 38, 39, 40,  41, 42, 43, 44, 45, 46, 47, 48,
@@ -3811,7 +3811,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
   5,  5,  5,  6,  6,  6,  5,208, 208,229,208,208,  5,  5,  5,  5,
 // state[624 + 2] 0x022000 Byte 3 of 4 (relative offsets)
 --15,-14,-13,-12,-11,-10, -9, -8,  -7, -6, -5, -4, -3, -2, -1,  1,
 +(uint8)-15,(uint8)-14,(uint8)-13,(uint8)-12,(uint8)-11,(uint8)-10, (uint8)-9, (uint8)-8,  (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4, (uint8)-3, (uint8)-2, (uint8)-1,  1,
   2,  3,  4,  5,  6,  7,  8,  9,  10, 11, 12, 13, 14, 15, 16, 17,
  18, 19, 20, 21, 22, 23, 24, 25,  26, 27, 28, 29, 30, 31, 32, 33,
  34, 35, 36, 37, 38, 39, 40, 41,  42, 43, 44, 45, 46, 47, 48, 49,
@@ -4195,7 +4195,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
   6,  6,  4,  5,208,208,208,208, 208,208,229,  6,  5,  6,  6,  6,
 // state[688 + 2] 0x023000 Byte 3 of 4 (relative offsets)
 --14,-13,-12,-11,-10, -9, -8, -7,  -6, -5, -4, -3, -2, -1,  1,  2,
 +(uint8)-14,(uint8)-13,(uint8)-12,(uint8)-11,(uint8)-10, (uint8)-9, (uint8)-8, (uint8)-7,  (uint8)-6, (uint8)-5, (uint8)-4, (uint8)-3, (uint8)-2, (uint8)-1,  1,  2,
   3,  4,  5,  6,  7,  8,  9, 10,  11, 12, 13, 14, 15, 16, 17, 18,
  19, 20, 21, 22, 23, 24, 25, 26,  27, 28, 29, 30, 31, 32, 33, 34,
  35, 36, 37, 38, 39, 40, 41, 42,  43, 44, 45, 46, 47, 48, 49, 50,
@@ -4579,7 +4579,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
   5,  5,  5,  5,  5,  5,  5,  6, 208,208,208,208,208,208,  6,  6,
 // state[752 + 2] 0x024000 Byte 3 of 4 (relative offsets)
 --13,-12,-11,-10, -9, -8, -7, -6,  -5, -4, -3, -2, -1,  1,  2,  3,
 +(uint8)-13,(uint8)-12,(uint8)-11,(uint8)-10, (uint8)-9, (uint8)-8, (uint8)-7, (uint8)-6,  (uint8)-5, (uint8)-4, (uint8)-3, (uint8)-2, (uint8)-1,  1,  2,  3,
   4,  5,  6,  7,  8,  9, 10, 11,  12, 13, 14, 15, 16, 17, 18, 19,
  20, 21, 22, 23, 24, 25, 26, 27,  28, 29, 30, 31, 32, 33, 34, 35,
  36, 37, 38, 39, 40, 41, 42, 43,  44, 45, 46, 47, 48, 49, 50, 51,
@@ -4963,7 +4963,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
 229,  6,  2,  2,  2,  2,  2,  2,   2,  2,  2,  5,  2,  2,  6,229,
 // state[816 + 2] 0x025000 Byte 3 of 4 (relative offsets)
 --12,-11,-10, -9, -8, -7, -6, -5,  -4, -3, -2, -1,  1,  2,  3,  4,
 +(uint8)-12,(uint8)-11,(uint8)-10, (uint8)-9, (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5,  (uint8)-4, (uint8)-3, (uint8)-2, (uint8)-1,  1,  2,  3,  4,
   5,  6,  7,  8,  9, 10, 11, 12,  13, 14, 15, 16, 17, 18, 19, 20,
  21, 22, 23, 24, 25, 26, 27, 28,  29, 30, 31, 32, 33, 34, 35, 36,
  37, 38, 39, 40, 41, 42, 43, 44,  45, 46, 47, 48, 49, 50, 51, 52,
@@ -5347,7 +5347,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
   6,  6,  6,  5,  5,  5,  5,  6,   6,  6,  3,  6,229,208,208,229,
 // state[880 + 2] 0x026000 Byte 3 of 4 (relative offsets)
 --11,-10, -9, -8, -7, -6, -5, -4,  -3, -2, -1,  1,  2,  3,  4,  5,
 +(uint8)-11,(uint8)-10, (uint8)-9, (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4,  (uint8)-3, (uint8)-2, (uint8)-1,  1,  2,  3,  4,  5,
   6,  7,  8,  9, 10, 11, 12, 13,  14, 15, 16, 17, 18, 19, 20, 21,
  22, 23, 24, 25, 26, 27, 28, 29,  30, 31, 32, 33, 34, 35, 36, 37,
  38, 39, 40, 41, 42, 43, 44, 45,  46, 47, 48, 49, 50, 51, 52, 53,
@@ -5731,7 +5731,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
 208,  6,  6,208,208,208,208,208,   6,  6,  6,216,  5,  5,  5,  5,
 // state[944 + 2] 0x027000 Byte 3 of 4 (relative offsets)
 --10, -9, -8, -7, -6, -5, -4, -3,  -2, -1,  1,  2,  3,  4,  5,  6,
 +(uint8)-10, (uint8)-9, (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4, (uint8)-3,  (uint8)-2, (uint8)-1,  1,  2,  3,  4,  5,  6,
   7,  8,  9, 10, 11, 12, 13, 14,  15, 16, 17, 18, 19, 20, 21, 22,
  23, 24, 25, 26, 27, 28, 29, 30,  31, 32, 33, 34, 35, 36, 37, 38,
  39, 40, 41, 42, 43, 44, 45, 46,  47, 48, 49, 50, 51, 52, 53, 54,
@@ -6115,7 +6115,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
   5,  5,  5,  6,208,208,  6,  6, 208,229,208,208,208,  5,  5,  5,
 // state[1008 + 2] 0x028000 Byte 3 of 4 (relative offsets)
 - -9, -8, -7, -6, -5, -4, -3, -2,  -1,  1,  2,  3,  4,  5,  6,  7,
 + (uint8)-9, (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4, (uint8)-3, (uint8)-2,  (uint8)-1,  1,  2,  3,  4,  5,  6,  7,
   8,  9, 10, 11, 12, 13, 14, 15,  16, 17, 18, 19, 20, 21, 22, 23,
  24, 25, 26, 27, 28, 29, 30, 31,  32, 33, 34, 35, 36, 37, 38, 39,
  40, 41, 42, 43, 44, 45, 46, 47,  48, 49, 50, 51, 52, 53, 54, 55,
@@ -6499,7 +6499,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
 208,208,  5,  5,  6,208,208,  5, 208,208,208,  6,208,  6,208,208,
 // state[1072 + 2] 0x029000 Byte 3 of 4 (relative offsets)
 - -8, -7, -6, -5, -4, -3, -2, -1,   1,  2,  3,  4,  5,  6,  7,  8,
 + (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4, (uint8)-3, (uint8)-2, (uint8)-1,   1,  2,  3,  4,  5,  6,  7,  8,
   9, 10, 11, 12, 13, 14, 15, 16,  17, 18, 19, 20, 21, 22, 23, 24,
  25, 26, 27, 28, 29, 30, 31, 32,  33, 34, 35, 36, 37, 38, 39, 40,
  41, 42, 43, 44, 45, 46, 47, 48,  49, 50, 51, 52, 53, 54, 55, 56,
@@ -6883,7 +6883,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
 229,229,229,229,208,208,208,229, 208,208,208,229,  0,229,208,208,
 // state[1136 + 2] 0x02a000 Byte 3 of 4 (relative offsets)
 - -7, -6, -5, -4, -3, -2, -1,  1,   2,  3,  4,  5,  6,  7,  8,  9,
 + (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4, (uint8)-3, (uint8)-2, (uint8)-1,  1,   2,  3,  4,  5,  6,  7,  8,  9,
  10, 11, 12, 13, 14, 15, 16, 17,  18, 19, 20, 21, 22, 22, 22, 22,
  22, 22, 22, 22, 22, 22, 22, 22,  22, 22, 22, 22, 22, 22, 22, 22,
  22, 22, 22, 22, 22, 22, 22, 22,  22, 22, 22, 22, 22, 22, 22, 22,
@@ -7075,10 +7075,10 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
   5,  5,  5,  5,  5,  5,  5,  5,   5,  5,  5,  5,  5,  5,  5,  5,
 // state[1168 + 2] 0x02f000 Byte 3 of 4 (relative offsets)
 - -9, -9, -9, -9, -9, -9, -9, -9,  -9, -9, -9, -9, -9, -9, -9, -9,
 - -9, -9, -9, -9, -9, -9, -9, -9,  -9, -9, -9, -9, -9, -9, -9, -9,
 - -8, -7, -6, -5, -4, -3, -2, -1,   1, -9, -9, -9, -9, -9, -9, -9,
 - -9, -9, -9, -9, -9, -9, -9, -9,  -9, -9, -9, -9, -9, -9, -9, -9,
 + (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9,  (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9,
 + (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9,  (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9,
 + (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4, (uint8)-3, (uint8)-2, (uint8)-1,   1, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9,
 + (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9,  (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9,
 // state[1169 + 2] 0x02fa00 Byte 4 of 4 (property)
 217,  5,  5,  5,  5,  5,  5,  5,   5,  5,  5,  5,  5,217,  5,  5,
 diff -up chromium-46.0.2490.71/third_party/webgl/src/specs/latest/2.0/webgl2.idl.gcc5 chromium-46.0.2490.71/third_party/webgl/src/specs/latest/2.0/webgl2.idl
 --- chromium-46.0.2490.71/third_party/webgl/src/specs/latest/2.0/webgl2.idl.gcc5	2015-10-13 15:04:44.000000000 -0400
 +++ chromium-46.0.2490.71/third_party/webgl/src/specs/latest/2.0/webgl2.idl	2015-10-16 00:54:16.603896492 -0400
@@ -261,7 +261,7 @@ interface WebGL2RenderingContextBase
   const GLenum UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES          = 0x8A43;
   const GLenum UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER     = 0x8A44;
   const GLenum UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER   = 0x8A46;
 -  const GLenum INVALID_INDEX                                 = 0xFFFFFFFF;
 +  const GLenum INVALID_INDEX                                 = 256;
   const GLenum MAX_VERTEX_OUTPUT_COMPONENTS                  = 0x9122;
   const GLenum MAX_FRAGMENT_INPUT_COMPONENTS                 = 0x9125;
   const GLenum MAX_SERVER_WAIT_TIMEOUT                       = 0x9111;
 diff -up chromium-46.0.2490.71/third_party/WebKit/Source/core/dom/NodeFilter.h.gcc5 chromium-46.0.2490.71/third_party/WebKit/Source/core/dom/NodeFilter.h
 --- chromium-46.0.2490.71/third_party/WebKit/Source/core/dom/NodeFilter.h.gcc5	2015-10-06 22:42:25.000000000 -0400
 +++ chromium-46.0.2490.71/third_party/WebKit/Source/core/dom/NodeFilter.h	2015-10-15 23:42:00.651518569 -0400
@@ -52,7 +52,7 @@ public:
      * to the value of NodeType for the equivalent node type.
      */
     enum {
 -        SHOW_ALL                       = 0xFFFFFFFF,
 +        SHOW_ALL                       = 256 /* 0xFFFFFFFF */,
         SHOW_ELEMENT                   = 0x00000001,
         SHOW_ATTRIBUTE                 = 0x00000002,
         SHOW_TEXT                      = 0x00000004,
 diff -up chromium-46.0.2490.71/third_party/WebKit/Source/core/dom/NodeFilter.idl.gcc5 chromium-46.0.2490.71/third_party/WebKit/Source/core/dom/NodeFilter.idl
 --- chromium-46.0.2490.71/third_party/WebKit/Source/core/dom/NodeFilter.idl.gcc5	2015-10-06 22:42:25.000000000 -0400
 +++ chromium-46.0.2490.71/third_party/WebKit/Source/core/dom/NodeFilter.idl	2015-10-15 23:42:00.653518525 -0400
@@ -31,7 +31,7 @@
     const unsigned short FILTER_SKIP = 3;
     // Constants for whatToShow
 -    const unsigned long SHOW_ALL = 0xFFFFFFFF;
 +    const unsigned long SHOW_ALL = 256; // 0xFFFFFFFF
     const unsigned long SHOW_ELEMENT = 0x1;
     const unsigned long SHOW_ATTRIBUTE = 0x2; // historical
     const unsigned long SHOW_TEXT = 0x4;
 diff -up chromium-46.0.2490.71/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.idl.gcc5 chromium-46.0.2490.71/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.idl
 --- chromium-46.0.2490.71/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.idl.gcc5	2015-10-13 15:04:34.000000000 -0400
 +++ chromium-46.0.2490.71/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.idl	2015-10-16 00:54:52.061105191 -0400
@@ -254,7 +254,7 @@ typedef long long      GLint64;
     const GLenum UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES          = 0x8A43;
     const GLenum UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER     = 0x8A44;
     const GLenum UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER   = 0x8A46;
 -    const GLenum INVALID_INDEX                                 = 0xFFFFFFFF;
 +    const GLenum INVALID_INDEX                                 = 256;
     const GLenum MAX_VERTEX_OUTPUT_COMPONENTS                  = 0x9122;
     const GLenum MAX_FRAGMENT_INPUT_COMPONENTS                 = 0x9125;
     const GLenum MAX_SERVER_WAIT_TIMEOUT                       = 0x9111;
@@ -297,7 +297,7 @@ typedef long long      GLint64;
     const GLenum MAX_ELEMENT_INDEX                             = 0x8D6B;
     const GLenum NUM_SAMPLE_COUNTS                             = 0x9380;
     const GLenum TEXTURE_IMMUTABLE_LEVELS                      = 0x82DF;
 -    const GLint TIMEOUT_IGNORED                                = -1;
 +    const GLint TIMEOUT_IGNORED                                = 256;
     /* WebGL-specific enums */
     const GLenum MAX_CLIENT_WAIT_TIMEOUT_WEBGL                 = 0x9247;
--- a/chromium-46.0.2490.86-use_system_opus.patch
+++ b/chromium-46.0.2490.86-use_system_opus.patch
@ -1,12 +0,0 @@
 diff -up chromium-46.0.2490.86/media/cast/receiver/audio_decoder_unittest.cc.use_system_opus chromium-46.0.2490.86/media/cast/receiver/audio_decoder_unittest.cc
 --- chromium-46.0.2490.86/media/cast/receiver/audio_decoder_unittest.cc.use_system_opus	2015-10-07 04:42:12.000000000 +0200
 +++ chromium-46.0.2490.86/media/cast/receiver/audio_decoder_unittest.cc	2015-11-11 16:11:13.535250609 +0100
@@ -13,7 +13,7 @@
 #include "media/cast/test/utility/audio_utility.h"
 #include "media/cast/test/utility/standalone_cast_environment.h"
 #include "testing/gtest/include/gtest/gtest.h"
 -#include "third_party/opus/src/include/opus.h"
 +#include <opus/opus.h>
 namespace media {
 namespace cast {
--- a/chromium-48.0.2564.103-gcc6.patch
+++ b/chromium-48.0.2564.103-gcc6.patch
@ -1,204 +0,0 @@
 diff -up chromium-48.0.2564.103/third_party/skia/src/opts/SkXfermode_opts.h.gcc6 chromium-48.0.2564.103/third_party/skia/src/opts/SkXfermode_opts.h
 --- chromium-48.0.2564.103/third_party/skia/src/opts/SkXfermode_opts.h.gcc6	2016-02-16 15:01:13.200131996 -0500
 +++ chromium-48.0.2564.103/third_party/skia/src/opts/SkXfermode_opts.h	2016-02-17 13:31:50.216198258 -0500
@@ -109,76 +109,71 @@ XFERMODE(Lighten) {
 }
 #undef XFERMODE
 -// Some xfermodes use math like divide or sqrt that's best done in floats.
 -// We write it generically, then call it 1 or 2 pixels at a time (T == Sk4f or Sk8f).
 -#define XFERMODE(Name) struct Name { template <typename T> T operator()(const T&, const T&); }; \
 -    template <typename T> T Name::operator()(const T& d, const T& s)
 +// Some xfermodes use math like divide or sqrt that's best done in floats 1 pixel at a time.
 +#define XFERMODE(Name) static Sk4f SK_VECTORCALL Name(Sk4f d, Sk4f s)
 -static_assert(SK_A32_SHIFT == 24, "");
 static inline Sk4f a_rgb(const Sk4f& a, const Sk4f& rgb) {
 +    static_assert(SK_A32_SHIFT == 24, "");
     return a * Sk4f(0,0,0,1) + rgb * Sk4f(1,1,1,0);
 }
 -static inline Sk8f a_rgb(const Sk8f& a, const Sk8f& rgb) {
 -    // TODO: SkNx_blend<0,0,0,1,0,0,0,1>(a, rgb) to let us use _mm256_blend_ps?
 -    return a * Sk8f(0,0,0,1,0,0,0,1) + rgb * Sk8f(1,1,1,0,1,1,1,0);
 +static inline Sk4f alphas(const Sk4f& f) {
 +    return SkNx_dup<SK_A32_SHIFT/8>(f);
 }
 -static inline Sk4f alphas(const Sk4f& f) { return SkNx_shuffle<3,3,3,3>        (f); }
 -static inline Sk8f alphas(const Sk8f& f) { return SkNx_shuffle<3,3,3,3,7,7,7,7>(f); }
 XFERMODE(ColorDodge) {
     auto sa = alphas(s),
          da = alphas(d),
 -         isa = T(1)-sa,
 -         ida = T(1)-da;
 +         isa = Sk4f(1)-sa,
 +         ida = Sk4f(1)-da;
     auto srcover = s + d*isa,
          dstover = d + s*ida,
 -         otherwise = sa * T::Min(da, (d*sa)*(sa-s).approxInvert()) + s*ida + d*isa;
 +         otherwise = sa * Sk4f::Min(da, (d*sa)*(sa-s).approxInvert()) + s*ida + d*isa;
     // Order matters here, preferring d==0 over s==sa.
 -    auto colors = (d ==  0).thenElse(dstover,
 -                  (s == sa).thenElse(srcover,
 -                                     otherwise));
 +    auto colors = (d == Sk4f(0)).thenElse(dstover,
 +                  (s ==      sa).thenElse(srcover,
 +                                          otherwise));
     return a_rgb(srcover, colors);
 }
 XFERMODE(ColorBurn) {
     auto sa = alphas(s),
          da = alphas(d),
 -         isa = T(1)-sa,
 -         ida = T(1)-da;
 +         isa = Sk4f(1)-sa,
 +         ida = Sk4f(1)-da;
     auto srcover = s + d*isa,
          dstover = d + s*ida,
 -         otherwise = sa*(da-T::Min(da, (da-d)*sa*s.approxInvert())) + s*ida + d*isa;
 +         otherwise = sa*(da-Sk4f::Min(da, (da-d)*sa*s.approxInvert())) + s*ida + d*isa;
     // Order matters here, preferring d==da over s==0.
 -    auto colors = (d == da).thenElse(dstover,
 -                  (s ==  0).thenElse(srcover,
 -                                     otherwise));
 +    auto colors = (d ==      da).thenElse(dstover,
 +                  (s == Sk4f(0)).thenElse(srcover,
 +                                          otherwise));
     return a_rgb(srcover, colors);
 }
 XFERMODE(SoftLight) {
     auto sa = alphas(s),
          da = alphas(d),
 -         isa = T(1)-sa,
 -         ida = T(1)-da;
 +         isa = Sk4f(1)-sa,
 +         ida = Sk4f(1)-da;
     // Some common terms.
 -    auto m  = (da > 0).thenElse(d / da, 0),
 -         s2 = s*2,
 -         m4 = m*4;
 +    auto m  = (da > Sk4f(0)).thenElse(d / da, Sk4f(0)),
 +         s2 = Sk4f(2)*s,
 +         m4 = Sk4f(4)*m;
     // The logic forks three ways:
     //    1. dark src?
     //    2. light src, dark dst?
     //    3. light src, light dst?
 -    auto darkSrc = d*(sa + (s2 - sa)*(T(1) - m)),  // Used in case 1.
 -         darkDst = (m4*m4 + m4)*(m - 1) + m*7,     // Used in case 2.
 -         liteDst = m.sqrt() - m,                   // Used in case 3.
 -         liteSrc = d*sa + da*(s2-sa)*(d*4 <= da).thenElse(darkDst, liteDst); // Case 2 or 3?
 +    auto darkSrc = d*(sa + (s2 - sa)*(Sk4f(1) - m)),        // Used in case 1.
 +         darkDst = (m4*m4 + m4)*(m - Sk4f(1)) + Sk4f(7)*m,  // Used in case 2.
 +         liteDst = m.sqrt() - m,                            // Used in case 3.
 +         liteSrc = d*sa + da*(s2-sa)*(Sk4f(4)*d <= da).thenElse(darkDst, liteDst); // Case 2 or 3?
     auto alpha  = s + d*isa;
 -    auto colors = s*ida + d*isa + (s2 <= sa).thenElse(darkSrc, liteSrc);     // Case 1 or 2/3?
 +    auto colors = s*ida + d*isa + (s2 <= sa).thenElse(darkSrc, liteSrc);           // Case 1 or 2/3?
     return a_rgb(alpha, colors);
 }
@@ -245,52 +240,53 @@ private:
     typedef SkProcCoeffXfermode INHERITED;
 };
 -template <typename BlendFn>
 -class FloatXfermode : public SkProcCoeffXfermode {
 +class Sk4fXfermode : public SkProcCoeffXfermode {
 public:
 -    FloatXfermode(const ProcCoeff& rec, SkXfermode::Mode mode)
 -        : INHERITED(rec, mode) {}
 +    typedef Sk4f (SK_VECTORCALL *ProcF)(Sk4f, Sk4f);
 +    Sk4fXfermode(const ProcCoeff& rec, SkXfermode::Mode mode, ProcF procf)
 +        : INHERITED(rec, mode)
 +        , fProcF(procf) {}
     void xfer32(SkPMColor dst[], const SkPMColor src[], int n, const SkAlpha aa[]) const override {
 -        BlendFn blend;
 -        while (n >= 2) {
 -            auto d = Sk8f::FromBytes((const uint8_t*)dst) * (1.0f/255),
 -                 s = Sk8f::FromBytes((const uint8_t*)src) * (1.0f/255),
 -                 b = blend(d, s);
 -            if (aa) {
 -                auto a255 = Sk8f(aa[0],aa[0],aa[0],aa[0], aa[1],aa[1],aa[1],aa[1]);
 -                (b*a255 + d*(Sk8f(255)-a255) + 0.5).toBytes((uint8_t*)dst);
 -                aa += 2;
 -            } else {
 -                (b * 255 + 0.5).toBytes((uint8_t*)dst);
 -            }
 -            dst += 2;
 -            src += 2;
 -            n   -= 2;
 -        }
 -        if (n) {
 -            auto d = Sk4f::FromBytes((const uint8_t*)dst) * (1.0f/255),
 -                 s = Sk4f::FromBytes((const uint8_t*)src) * (1.0f/255),
 -                 b = blend(d, s);
 -            if (aa) {
 -                auto a255 = Sk4f(aa[0],aa[0],aa[0],aa[0]);
 -                (b*a255 + d*(Sk4f(255)-a255) + 0.5).toBytes((uint8_t*)dst);
 -                aa++;
 -            } else {
 -                (b * 255 + 0.5).toBytes((uint8_t*)dst);
 -            }
 +        for (int i = 0; i < n; i++) {
 +            dst[i] = aa ? this->xfer32(dst[i], src[i], aa[i])
 +                        : this->xfer32(dst[i], src[i]);
         }
     }
     void xfer16(uint16_t dst[], const SkPMColor src[], int n, const SkAlpha aa[]) const override {
         for (int i = 0; i < n; i++) {
 -            SkPMColor dst32 = SkPixel16ToPixel32(dst[i]);           // Convert dst up to 8888.
 -            this->xfer32(&dst32, src+i, 1, aa ? aa+i : nullptr);    // Blend 1 pixel.
 -            dst[i] = SkPixel32ToPixel16(dst32);                     // Repack dst to 565 and store.
 +            SkPMColor dst32 = SkPixel16ToPixel32(dst[i]);
 +            dst32 = aa ? this->xfer32(dst32, src[i], aa[i])
 +                       : this->xfer32(dst32, src[i]);
 +            dst[i] = SkPixel32ToPixel16(dst32);
         }
     }
 private:
 +    static Sk4f Load(SkPMColor c) {
 +        return Sk4f::FromBytes((uint8_t*)&c) * Sk4f(1.0f/255);
 +    }
 +    static SkPMColor Round(const Sk4f& f) {
 +        SkPMColor c;
 +        (f * Sk4f(255) + Sk4f(0.5f)).toBytes((uint8_t*)&c);
 +        return c;
 +    }
 +    inline SkPMColor xfer32(SkPMColor dst, SkPMColor src) const {
 +        return Round(fProcF(Load(dst), Load(src)));
 +    }
 +
 +    inline SkPMColor xfer32(SkPMColor dst, SkPMColor src, SkAlpha aa) const {
 +        Sk4f s(Load(src)),
 +             d(Load(dst)),
 +             b(fProcF(d,s));
 +        // We do aa in full float precision before going back down to bytes, because we can!
 +        Sk4f a = Sk4f(aa) * Sk4f(1.0f/255);
 +        b = b*a + d*(Sk4f(1)-a);
 +        return Round(b);
 +    }
 +
 +    ProcF fProcF;
     typedef SkProcCoeffXfermode INHERITED;
 };
@@ -327,7 +323,7 @@ static SkXfermode* create_xfermode(const
     #undef CASE
 #define CASE(Mode) \
 -    case SkXfermode::k##Mode##_Mode: return new FloatXfermode<Mode>(rec, mode)
 +    case SkXfermode::k##Mode##_Mode: return new Sk4fXfermode(rec, mode, &Mode)
         CASE(ColorDodge);
         CASE(ColorBurn);
         CASE(SoftLight);
--- a/chromium-50.0.2661.86-addrfix.patch
+++ b/chromium-50.0.2661.86-addrfix.patch
@ -1,11 +0,0 @@
 diff -up chromium-50.0.2661.86/third_party/boringssl/boringssl.gyp.addrfix chromium-50.0.2661.86/third_party/boringssl/boringssl.gyp
 --- chromium-50.0.2661.86/third_party/boringssl/boringssl.gyp.addrfix	2016-04-27 13:26:38.483282586 -0400
 +++ chromium-50.0.2661.86/third_party/boringssl/boringssl.gyp	2016-04-27 13:28:19.843065230 -0400
@@ -18,6 +18,7 @@
         'BORINGSSL_IMPLEMENTATION',
         'BORINGSSL_NO_STATIC_INITIALIZER',
         'OPENSSL_SMALL',
 +	'_POSIX_C_SOURCE=200112L',
       ],
       'dependencies': [ 'boringssl_asm' ],
       # TODO(davidben): Fix size_t truncations in BoringSSL.
--- a/chromium-50.0.2661.94-unbundle-re2-fix.patch
+++ b/chromium-50.0.2661.94-unbundle-re2-fix.patch
@ -1,12 +0,0 @@
 diff -up chromium-50.0.2661.94/build/linux/unbundle/re2.gyp.unbundle-fix chromium-50.0.2661.94/build/linux/unbundle/re2.gyp
 --- chromium-50.0.2661.94/build/linux/unbundle/re2.gyp.unbundle-fix	2016-03-25 09:04:44.000000000 -0400
 +++ chromium-50.0.2661.94/build/linux/unbundle/re2.gyp	2016-05-03 12:24:38.850296350 -0400
@@ -8,7 +8,7 @@
       'target_name': 're2',
       'type': 'none',
       'variables': {
 -        'headers_root_path': '.',
 +        'headers_root_path': 'src/',
         'header_filenames': [
           're2/filtered_re2.h',
           're2/re2.h',
--- a/chromium-52.0.2723.2-PNGImageDecoder-fix-cast.patch
+++ b/chromium-52.0.2723.2-PNGImageDecoder-fix-cast.patch
@ -1,12 +0,0 @@
 diff -up chromium-52.0.2723.2/third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cpp.fixcast chromium-52.0.2723.2/third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cpp
 --- chromium-52.0.2723.2/third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cpp.fixcast	2016-05-10 09:43:31.637003844 -0400
 +++ chromium-52.0.2723.2/third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cpp	2016-05-10 09:43:43.523741296 -0400
@@ -234,7 +234,7 @@ void PNGImageDecoder::headerAvailable()
 #endif
             png_uint_32 profileLength = 0;
             if (png_get_iCCP(png, info, &profileName, &compressionType, &profile, &profileLength)) {
 -                setColorProfileAndTransform(profile, profileLength, imageHasAlpha, false /* useSRGB */);
 +                setColorProfileAndTransform((const char*)profile, profileLength, imageHasAlpha, false /* useSRGB */);
             }
         }
 #endif // PNG_iCCP_SUPPORTED
--- a/chromium-52.0.2723.2-sync_link_zlib.patch
+++ b/chromium-52.0.2723.2-sync_link_zlib.patch
@ -1,11 +0,0 @@
 diff -up chromium-52.0.2723.2/sync/sync_tests.gypi.sync_link_zlib chromium-52.0.2723.2/sync/sync_tests.gypi
 --- chromium-52.0.2723.2/sync/sync_tests.gypi.sync_link_zlib	2016-05-09 14:22:30.884719562 -0400
 +++ chromium-52.0.2723.2/sync/sync_tests.gypi	2016-05-09 14:24:06.337517725 -0400
@@ -264,6 +264,7 @@
         '../testing/gtest.gyp:gtest',
         '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
         '../third_party/protobuf/protobuf.gyp:protobuf_lite',
 +        '../third_party/zlib/zlib.gyp:zlib',
         'sync',
         'test_support_sync_api',
         'test_support_sync_core',
--- a/chromium-52.0.2723.2-system-icu-54-does-not-have-detectHostTimeZone.patch
+++ b/chromium-52.0.2723.2-system-icu-54-does-not-have-detectHostTimeZone.patch
@ -1,12 +0,0 @@
 diff -up chromium-52.0.2723.2/content/browser/time_zone_monitor.cc.system-icu chromium-52.0.2723.2/content/browser/time_zone_monitor.cc
 --- chromium-52.0.2723.2/content/browser/time_zone_monitor.cc.system-icu	2016-05-09 14:01:42.751588803 -0400
 +++ chromium-52.0.2723.2/content/browser/time_zone_monitor.cc	2016-05-09 14:09:22.663951240 -0400
@@ -23,7 +23,7 @@ TimeZoneMonitor::~TimeZoneMonitor() {
 void TimeZoneMonitor::NotifyRenderers() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 -#if defined(OS_CHROMEOS)
 +#if defined(OS_CHROMEOS) || U_ICU_VERSION_MAJOR_NUM < 55
   // On CrOS, ICU's default tz is already set to a new zone. No
   // need to redetect it with detectHostTimeZone().
   std::unique_ptr<icu::TimeZone> new_zone(icu::TimeZone::createDefault());
--- a/chromium-52.0.2723.2-use_system_harfbuzz.patch
+++ b/chromium-52.0.2723.2-use_system_harfbuzz.patch
@ -1,12 +0,0 @@
 diff -up chromium-52.0.2723.2/ui/gfx/render_text_harfbuzz.h.use_system_harfbuzz chromium-52.0.2723.2/ui/gfx/render_text_harfbuzz.h
 --- chromium-52.0.2723.2/ui/gfx/render_text_harfbuzz.h.use_system_harfbuzz	2016-05-09 14:17:34.867555791 -0400
 +++ chromium-52.0.2723.2/ui/gfx/render_text_harfbuzz.h	2016-05-09 14:18:56.131677853 -0400
@@ -13,7 +13,7 @@
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/memory/scoped_vector.h"
 -#include "third_party/harfbuzz-ng/src/hb.h"
 +#include <harfbuzz/hb.h>
 #include "third_party/icu/source/common/unicode/ubidi.h"
 #include "third_party/icu/source/common/unicode/uscript.h"
 #include "ui/gfx/render_text.h"
--- a/chromium-52.0.2743.82-arm-icu-fix.patch
+++ b/chromium-52.0.2743.82-arm-icu-fix.patch
@ -1,12 +0,0 @@
 diff -up chromium-52.0.2743.82/third_party/icu/icu.gyp.armfix chromium-52.0.2743.82/third_party/icu/icu.gyp
 --- chromium-52.0.2743.82/third_party/icu/icu.gyp.armfix	2016-08-03 09:39:02.159874067 +0200
 +++ chromium-52.0.2743.82/third_party/icu/icu.gyp	2016-08-03 09:39:17.953765034 +0200
@@ -44,7 +44,7 @@
       }],
       ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \
          or OS=="netbsd" or OS=="mac" or OS=="android" or OS=="qnx") and \
 -        (target_arch=="arm" or target_arch=="ia32" or \
 +        (target_arch=="ia32" or \
          target_arch=="mipsel")', {
         'target_conditions': [
           ['_toolset=="host"', {
--- a/chromium-52.0.2743.82-cups22.patch
+++ b/chromium-52.0.2743.82-cups22.patch
@ -1,47 +0,0 @@
 diff -up chromium-52.0.2743.82/printing/backend/print_backend_cups.cc.cups22 chromium-52.0.2743.82/printing/backend/print_backend_cups.cc
 --- chromium-52.0.2743.82/printing/backend/print_backend_cups.cc.cups22	2016-07-22 09:20:15.794340886 -0400
 +++ chromium-52.0.2743.82/printing/backend/print_backend_cups.cc	2016-07-22 09:20:26.338261197 -0400
@@ -16,6 +16,7 @@
 #include "base/synchronization/lock.h"
 #include "base/values.h"
 #include "printing/backend/cups_helper.h"
 +#include <cups/ppd.h>
 #include "printing/backend/print_backend_consts.h"
 #include "url/gurl.h"
 diff -up chromium-52.0.2743.82/printing/BUILD.gn.cups22 chromium-52.0.2743.82/printing/BUILD.gn
 --- chromium-52.0.2743.82/printing/BUILD.gn.cups22	2016-07-21 11:27:05.597507544 -0400
 +++ chromium-52.0.2743.82/printing/BUILD.gn	2016-07-21 14:36:45.574137758 -0400
@@ -147,12 +147,13 @@ component("printing") {
                                  ],
                                  "trim string")
 -      if (cups_version == "1.6" || cups_version == "1.7") {
 +      if (cups_version == "1.6" || cups_version == "1.7" || cups_version == "2.2") {
         cflags += [
           # CUPS 1.6 deprecated the PPD APIs, but we will stay with this
           # API for now as supported Linux and Mac OS'es are still using
           # older versions of CUPS. More info: crbug.com/226176
           "-Wno-deprecated-declarations",
 +          "-D_PPD_DEPRECATED=",
           # CUPS 1.7 deprecates httpConnectEncrypt(), see the mac section
           # below.
         ]
 diff -up chromium-52.0.2743.82/printing/printing.gyp.cups22 chromium-52.0.2743.82/printing/printing.gyp
 --- chromium-52.0.2743.82/printing/printing.gyp.cups22	2016-07-21 11:26:26.622746918 -0400
 +++ chromium-52.0.2743.82/printing/printing.gyp	2016-07-21 14:36:07.390373060 -0400
@@ -142,12 +142,13 @@
             'cups_version': '<!(python cups_config_helper.py --api-version <(sysroot))',
           },
           'conditions': [
 -            ['cups_version in ["1.6", "1.7"]', {
 +            ['cups_version in ["1.6", "1.7", "2.2"]', {
               'cflags': [
                 # CUPS 1.6 deprecated the PPD APIs, but we will stay with this
                 # API for now as supported Linux and Mac OS'es are still using
                 # older versions of CUPS. More info: crbug.com/226176
                 '-Wno-deprecated-declarations',
 +                '-D_PPD_DEPRECATED=""',
                 # CUPS 1.7 deprecates httpConnectEncrypt(), see the mac section
                 # below.
               ],
--- a/chromium-52.0.2743.82-more-codec-aliases.patch
+++ b/chromium-52.0.2743.82-more-codec-aliases.patch
@ -1,15 +0,0 @@
 diff -up chromium-52.0.2743.82/third_party/WebKit/Source/wtf/text/TextCodecICU.cpp.morealiases chromium-52.0.2743.82/third_party/WebKit/Source/wtf/text/TextCodecICU.cpp
 --- chromium-52.0.2743.82/third_party/WebKit/Source/wtf/text/TextCodecICU.cpp.morealiases	2016-08-03 08:55:48.293159940 +0200
 +++ chromium-52.0.2743.82/third_party/WebKit/Source/wtf/text/TextCodecICU.cpp	2016-08-03 08:57:05.192505191 +0200
@@ -208,7 +208,11 @@ void TextCodecICU::registerEncodingNames
     registrar("iso_8859-6", "ISO-8859-6");
     registrar("iso_8859-7", "ISO-8859-7");
     registrar("iso_8859-8", "ISO-8859-8");
 +    registrar("ISO_8859-8-I", "ISO-8859-8-I");
     registrar("iso_8859-9", "windows-1254");
 +    registrar("ISO_8859-10", "ISO-8859-10");
 +    registrar("ISO_8859-13", "ISO-8859-13");
 +    registrar("ISO_8859-14", "ISO-8859-14");
     registrar("iso_8859-15", "ISO-8859-15");
     registrar("koi8_r", "KOI8-R");
     registrar("x-cp1253", "windows-1253");
--- a/chromium-52.0.2743.82-sandbox-pie.patch
+++ b/chromium-52.0.2743.82-sandbox-pie.patch
@ -1,15 +0,0 @@
 diff -up chromium-52.0.2743.82/sandbox/linux/sandbox_linux.gypi.pie chromium-52.0.2743.82/sandbox/linux/sandbox_linux.gypi
 --- chromium-52.0.2743.82/sandbox/linux/sandbox_linux.gypi.pie	2016-08-03 09:06:41.617923620 +0200
 +++ chromium-52.0.2743.82/sandbox/linux/sandbox_linux.gypi	2016-08-03 09:11:49.747463317 +0200
@@ -205,7 +205,10 @@
       ],
       'cflags': [
         # For ULLONG_MAX
 -        '-std=gnu99',
 +        '-std=gnu99 -fPIE',
 +      ],
 +      'ldflags': [
 +        '-pie',
       ],
       'include_dirs': [
         '../..',
--- a/chromium-53.0.2785.101-crrev-415028.patch
+++ b/chromium-53.0.2785.101-crrev-415028.patch
@ -1,142 +0,0 @@
 diff -up chromium-53.0.2785.101/sandbox/linux/BUILD.gn.415208 chromium-53.0.2785.101/sandbox/linux/BUILD.gn
 --- chromium-53.0.2785.101/sandbox/linux/BUILD.gn.415208	2016-09-08 10:22:07.702555383 -0400
 +++ chromium-53.0.2785.101/sandbox/linux/BUILD.gn	2016-09-08 10:23:26.190044992 -0400
@@ -41,10 +41,7 @@ group("sandbox") {
     public_deps += [ ":suid_sandbox_client" ]
   }
   if (use_seccomp_bpf || is_nacl_nonsfi) {
 -    public_deps += [
 -      ":seccomp_bpf",
 -      ":seccomp_bpf_helpers",
 -    ]
 +    public_deps += [ ":seccomp_bpf" ]
   }
 }
@@ -221,6 +218,14 @@ component("seccomp_bpf") {
     "bpf_dsl/syscall_set.cc",
     "bpf_dsl/syscall_set.h",
     "bpf_dsl/trap_registry.h",
 +    "seccomp-bpf-helpers/baseline_policy.cc",
 +    "seccomp-bpf-helpers/baseline_policy.h",
 +    "seccomp-bpf-helpers/sigsys_handlers.cc",
 +    "seccomp-bpf-helpers/sigsys_handlers.h",
 +    "seccomp-bpf-helpers/syscall_parameters_restrictions.cc",
 +    "seccomp-bpf-helpers/syscall_parameters_restrictions.h",
 +    "seccomp-bpf-helpers/syscall_sets.cc",
 +    "seccomp-bpf-helpers/syscall_sets.h",
     "seccomp-bpf/die.cc",
     "seccomp-bpf/die.h",
     "seccomp-bpf/sandbox_bpf.cc",
@@ -250,31 +255,6 @@ component("seccomp_bpf") {
       "bpf_dsl/linux_syscall_ranges.h",
       "bpf_dsl/seccomp_macros.h",
       "bpf_dsl/trap_registry.h",
 -    ]
 -  }
 -}
 -
 -component("seccomp_bpf_helpers") {
 -  sources = [
 -    "seccomp-bpf-helpers/baseline_policy.cc",
 -    "seccomp-bpf-helpers/baseline_policy.h",
 -    "seccomp-bpf-helpers/sigsys_handlers.cc",
 -    "seccomp-bpf-helpers/sigsys_handlers.h",
 -    "seccomp-bpf-helpers/syscall_parameters_restrictions.cc",
 -    "seccomp-bpf-helpers/syscall_parameters_restrictions.h",
 -    "seccomp-bpf-helpers/syscall_sets.cc",
 -    "seccomp-bpf-helpers/syscall_sets.h",
 -  ]
 -  defines = [ "SANDBOX_IMPLEMENTATION" ]
 -
 -  deps = [
 -    ":sandbox_services",
 -    ":seccomp_bpf",
 -    "//base",
 -  ]
 -
 -  if (is_nacl_nonsfi) {
 -    sources -= [
       "seccomp-bpf-helpers/baseline_policy.cc",
       "seccomp-bpf-helpers/baseline_policy.h",
       "seccomp-bpf-helpers/syscall_sets.cc",
 diff -up chromium-53.0.2785.101/sandbox/linux/sandbox_linux.gypi.415208 chromium-53.0.2785.101/sandbox/linux/sandbox_linux.gypi
 --- chromium-53.0.2785.101/sandbox/linux/sandbox_linux.gypi.415208	2016-09-08 10:20:50.263045995 -0400
 +++ chromium-53.0.2785.101/sandbox/linux/sandbox_linux.gypi	2016-09-08 10:21:51.341870321 -0400
@@ -54,7 +54,6 @@
         [ 'use_seccomp_bpf==1', {
           'dependencies': [
             'seccomp_bpf',
 -            'seccomp_bpf_helpers',
           ],
         }],
       ],
@@ -141,6 +140,14 @@
         'bpf_dsl/syscall_set.cc',
         'bpf_dsl/syscall_set.h',
         'bpf_dsl/trap_registry.h',
 +        'seccomp-bpf-helpers/baseline_policy.cc',
 +        'seccomp-bpf-helpers/baseline_policy.h',
 +        'seccomp-bpf-helpers/sigsys_handlers.cc',
 +        'seccomp-bpf-helpers/sigsys_handlers.h',
 +        'seccomp-bpf-helpers/syscall_parameters_restrictions.cc',
 +        'seccomp-bpf-helpers/syscall_parameters_restrictions.h',
 +        'seccomp-bpf-helpers/syscall_sets.cc',
 +        'seccomp-bpf-helpers/syscall_sets.h',
         'seccomp-bpf/die.cc',
         'seccomp-bpf/die.h',
         'seccomp-bpf/sandbox_bpf.cc',
@@ -165,31 +172,6 @@
       ],
       'include_dirs': [
         '../..',
 -      ],
 -    },
 -    {
 -      'target_name': 'seccomp_bpf_helpers',
 -      'type': '<(component)',
 -      'sources': [
 -        'seccomp-bpf-helpers/baseline_policy.cc',
 -        'seccomp-bpf-helpers/baseline_policy.h',
 -        'seccomp-bpf-helpers/sigsys_handlers.cc',
 -        'seccomp-bpf-helpers/sigsys_handlers.h',
 -        'seccomp-bpf-helpers/syscall_parameters_restrictions.cc',
 -        'seccomp-bpf-helpers/syscall_parameters_restrictions.h',
 -        'seccomp-bpf-helpers/syscall_sets.cc',
 -        'seccomp-bpf-helpers/syscall_sets.h',
 -      ],
 -      'dependencies': [
 -        '../base/base.gyp:base',
 -        'sandbox_services',
 -        'seccomp_bpf',
 -      ],
 -      'defines': [
 -        'SANDBOX_IMPLEMENTATION',
 -      ],
 -      'include_dirs': [
 -        '../..',
       ],
     },
     {
 diff -up chromium-53.0.2785.101/services/shell/runner/host/BUILD.gn.415208 chromium-53.0.2785.101/services/shell/runner/host/BUILD.gn
 --- chromium-53.0.2785.101/services/shell/runner/host/BUILD.gn.415208	2016-09-08 10:20:17.591674773 -0400
 +++ chromium-53.0.2785.101/services/shell/runner/host/BUILD.gn	2016-09-08 10:20:27.742478927 -0400
@@ -61,7 +61,6 @@ source_set("child_process_base") {
       "//sandbox/linux:sandbox",
       "//sandbox/linux:sandbox_services",
       "//sandbox/linux:seccomp_bpf",
 -      "//sandbox/linux:seccomp_bpf_helpers",
     ]
   }
 diff -up chromium-53.0.2785.101/services/shell/shell.gyp.415208 chromium-53.0.2785.101/services/shell/shell.gyp
 --- chromium-53.0.2785.101/services/shell/shell.gyp.415208	2016-09-08 10:19:52.543156283 -0400
 +++ chromium-53.0.2785.101/services/shell/shell.gyp	2016-09-08 10:20:03.894938333 -0400
@@ -145,7 +145,6 @@
           '<(DEPTH)/sandbox/sandbox.gyp:sandbox',
           '<(DEPTH)/sandbox/sandbox.gyp:sandbox_services',
           '<(DEPTH)/sandbox/sandbox.gyp:seccomp_bpf',
 -          '<(DEPTH)/sandbox/sandbox.gyp:seccomp_bpf_helpers',
         ],
       }],
       ['OS=="mac"', {
--- a/chromium-53.0.2785.92-gn-system.patch
+++ b/chromium-53.0.2785.92-gn-system.patch
@ -1,252 +0,0 @@
 diff -up chromium-53.0.2785.92/build/linux/unbundle/libjpeg.gn.gnsystem chromium-53.0.2785.92/build/linux/unbundle/libjpeg.gn
 --- chromium-53.0.2785.92/build/linux/unbundle/libjpeg.gn.gnsystem	2016-09-06 13:27:56.018365168 -0400
 +++ chromium-53.0.2785.92/build/linux/unbundle/libjpeg.gn	2016-09-06 13:27:56.018365168 -0400
@@ -0,0 +1,9 @@
 +# Copyright 2016 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.
 +
 +source_set("libjpeg") {
 +  libs = [
 +    "jpeg",
 +  ]
 +}
 diff -up chromium-53.0.2785.92/build/linux/unbundle/libpng.gn.gnsystem chromium-53.0.2785.92/build/linux/unbundle/libpng.gn
 --- chromium-53.0.2785.92/build/linux/unbundle/libpng.gn.gnsystem	2016-09-06 13:27:56.018365168 -0400
 +++ chromium-53.0.2785.92/build/linux/unbundle/libpng.gn	2016-09-06 13:27:56.018365168 -0400
@@ -0,0 +1,25 @@
 +# Copyright 2016 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("//build/config/linux/pkg_config.gni")
 +import("//build/shim_headers.gni")
 +
 +pkg_config("system_libpng") {
 +  packages = [ "libpng" ]
 +}
 +
 +shim_headers("libpng_shim") {
 +  root_path = "include"
 +  headers = [
 +    "png.h",
 +    "pngconf.h",
 +  ]
 +}
 +
 +source_set("libpng") {
 +  deps = [
 +    ":libpng_shim",
 +  ]
 +  public_configs = [ ":system_libpng" ]
 +}
 diff -up chromium-53.0.2785.92/build/linux/unbundle/libusb.gn.gnsystem chromium-53.0.2785.92/build/linux/unbundle/libusb.gn
 --- chromium-53.0.2785.92/build/linux/unbundle/libusb.gn.gnsystem	2016-09-06 13:27:56.019365149 -0400
 +++ chromium-53.0.2785.92/build/linux/unbundle/libusb.gn	2016-09-06 13:27:56.018365168 -0400
@@ -0,0 +1,24 @@
 +# Copyright 2016 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("//build/config/linux/pkg_config.gni")
 +import("//build/shim_headers.gni")
 +
 +pkg_config("system_libusb") {
 +  packages = [ "libusb-1.0" ]
 +}
 +
 +shim_headers("libusb_shim") {
 +  root_path = "src/libusb"
 +  headers = [
 +    "libusb.h",
 +  ]
 +}
 +
 +source_set("libusb") {
 +  deps = [
 +    ":libusb_shim",
 +  ]
 +  public_configs = [ ":system_libusb" ]
 +}
 diff -up chromium-53.0.2785.92/build/linux/unbundle/opus.gn.gnsystem chromium-53.0.2785.92/build/linux/unbundle/opus.gn
 --- chromium-53.0.2785.92/build/linux/unbundle/opus.gn.gnsystem	2016-09-06 13:27:56.019365149 -0400
 +++ chromium-53.0.2785.92/build/linux/unbundle/opus.gn	2016-09-06 13:31:11.546589545 -0400
@@ -0,0 +1,161 @@
 +# Copyright 2016 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("//build/config/linux/pkg_config.gni")
 +import("//build/shim_headers.gni")
 +import("//testing/test.gni")
 +
 +pkg_config("system_opus") {
 +  packages = [ "opus" ]
 +}
 +
 +shim_headers("opus_shim") {
 +  root_path = "src/include"
 +  headers = [
 +    "opus_custom.h",
 +    "opus_defines.h",
 +    "opus_multistream.h",
 +    "opus_types.h",
 +    "opus.h",
 +  ]
 +}
 +
 +source_set("opus") {
 +  deps = [
 +    ":opus_shim",
 +  ]
 +  public_configs = [ ":system_opus" ]
 +}
 +
 +config("opus_test_config") {
 +  include_dirs = [
 +    "src/celt",
 +    "src/silk",
 +  ]
 +
 +  if (is_win) {
 +    defines = [ "inline=__inline" ]
 +  }
 +  if (is_android) {
 +    libs = [ "log" ]
 +  }
 +  if (is_clang) {
 +    cflags = [ "-Wno-absolute-value" ]
 +  }
 +}
 +
 +executable("opus_compare") {
 +  sources = [
 +    "src/src/opus_compare.c",
 +  ]
 +
 +  configs -= [ "//build/config/compiler:chromium_code" ]
 +  configs += [
 +    "//build/config/compiler:no_chromium_code",
 +    ":opus_test_config",
 +  ]
 +
 +  deps = [
 +    ":opus",
 +    "//build/config/sanitizers:deps",
 +    "//build/win:default_exe_manifest",
 +  ]
 +}
 +
 +executable("opus_demo") {
 +  sources = [
 +    "src/src/opus_demo.c",
 +  ]
 +
 +  configs -= [ "//build/config/compiler:chromium_code" ]
 +  configs += [
 +    "//build/config/compiler:no_chromium_code",
 +    ":opus_test_config",
 +  ]
 +
 +  deps = [
 +    ":opus",
 +    "//build/config/sanitizers:deps",
 +    "//build/win:default_exe_manifest",
 +  ]
 +}
 +
 +test("test_opus_api") {
 +  sources = [
 +    "src/tests/test_opus_api.c",
 +  ]
 +
 +  configs -= [ "//build/config/compiler:chromium_code" ]
 +  configs += [
 +    "//build/config/compiler:no_chromium_code",
 +    ":opus_test_config",
 +  ]
 +
 +  deps = [
 +    ":opus",
 +  ]
 +}
 +
 +test("test_opus_encode") {
 +  sources = [
 +    "src/tests/test_opus_encode.c",
 +  ]
 +
 +  configs -= [ "//build/config/compiler:chromium_code" ]
 +  configs += [
 +    "//build/config/compiler:no_chromium_code",
 +    ":opus_test_config",
 +  ]
 +
 +  deps = [
 +    ":opus",
 +  ]
 +}
 +
 +# GN orders flags on a target before flags from configs. The default config
 +# adds -Wall, and this flag have to be after -Wall -- so they need to
 +# come from a config and can't be on the target directly.
 +config("test_opus_decode_config") {
 +  # test_opus_decode passes a null pointer to opus_decode() for an argument
 +  # marked as requiring a non-null value by the nonnull function attribute,
 +  # and expects opus_decode() to fail. Disable the -Wnonnull option to avoid
 +  # a compilation error if -Werror is specified.
 +  if (is_posix) {
 +    cflags = [ "-Wno-nonnull" ]
 +  }
 +}
 +
 +test("test_opus_decode") {
 +  sources = [
 +    "src/tests/test_opus_decode.c",
 +  ]
 +
 +  configs -= [ "//build/config/compiler:chromium_code" ]
 +  configs += [
 +    "//build/config/compiler:no_chromium_code",
 +    ":opus_test_config",
 +    ":test_opus_decode_config",
 +  ]
 +
 +  deps = [
 +    ":opus",
 +  ]
 +}
 +
 +test("test_opus_padding") {
 +  sources = [
 +    "src/tests/test_opus_padding.c",
 +  ]
 +
 +  configs -= [ "//build/config/compiler:chromium_code" ]
 +  configs += [
 +    "//build/config/compiler:no_chromium_code",
 +    ":opus_test_config",
 +  ]
 +
 +  deps = [
 +    ":opus",
 +  ]
 +}
 +
 diff -up chromium-53.0.2785.92/build/linux/unbundle/replace_gn_files.py.gnsystem chromium-53.0.2785.92/build/linux/unbundle/replace_gn_files.py
 --- chromium-53.0.2785.92/build/linux/unbundle/replace_gn_files.py.gnsystem	2016-09-02 15:02:02.000000000 -0400
 +++ chromium-53.0.2785.92/build/linux/unbundle/replace_gn_files.py	2016-09-06 13:27:56.020365130 -0400
@@ -21,9 +21,13 @@ REPLACEMENTS = {
   'flac': 'third_party/flac/BUILD.gn',
   'harfbuzz-ng': 'third_party/harfbuzz-ng/BUILD.gn',
   'libevent': 'base/third_party/libevent/BUILD.gn',
 +  'libjpeg': 'third_party/libjpeg/BUILD.gn',
 +  'libpng': 'third_party/libpng/BUILD.gn',
 +  'libusb': 'third_party/libusb/BUILD.gn',
   'libwebp': 'third_party/libwebp/BUILD.gn',
   'libxml': 'third_party/libxml/BUILD.gn',
   'libxslt': 'third_party/libxslt/BUILD.gn',
 +  'opus': 'third_party/opus/BUILD.gn',
   'snappy': 'third_party/snappy/BUILD.gn',
   'yasm': 'third_party/yasm/yasm_assemble.gni',
   'zlib': 'third_party/zlib/BUILD.gn',
--- a/chromium-53.0.2785.92-last-commit-position.patch
+++ b/chromium-53.0.2785.92-last-commit-position.patch
@ -1,28 +0,0 @@
 diff -up chromium-53.0.2785.92/tools/gn/BUILD.gn.lastcommitfix chromium-53.0.2785.92/tools/gn/BUILD.gn
 --- chromium-53.0.2785.92/tools/gn/BUILD.gn.lastcommitfix	2016-09-06 13:50:17.540459136 -0400
 +++ chromium-53.0.2785.92/tools/gn/BUILD.gn	2016-09-06 13:50:27.380269110 -0400
@@ -259,7 +259,6 @@ executable("gn") {
   deps = [
     ":gn_lib",
 -    ":last_commit_position",
     "//base",
     "//build/config/sanitizers:deps",
     "//build/win:default_exe_manifest",
 diff -up chromium-53.0.2785.92/tools/gn/gn_main.cc.lastcommitfix chromium-53.0.2785.92/tools/gn/gn_main.cc
 --- chromium-53.0.2785.92/tools/gn/gn_main.cc.lastcommitfix	2016-09-06 13:49:34.620288177 -0400
 +++ chromium-53.0.2785.92/tools/gn/gn_main.cc	2016-09-06 13:49:47.316042652 -0400
@@ -12,13 +12,7 @@
 #include "tools/gn/standard_out.h"
 #include "tools/gn/switches.h"
 -// Only the GN-generated build makes this header for now.
 -// TODO(brettw) consider adding this if we need it in GYP.
 -#if defined(GN_BUILD)
 -#include "tools/gn/last_commit_position.h"
 -#else
 #define LAST_COMMIT_POSITION "UNKNOWN"
 -#endif
 namespace {
--- a/chromium-54.0.2840.59-arm-icu-fix.patch
+++ b/chromium-54.0.2840.59-arm-icu-fix.patch
@ -1,12 +0,0 @@
 diff -up chromium-54.0.2840.59/third_party/icu/icu.gyp.armfix chromium-54.0.2840.59/third_party/icu/icu.gyp
 --- chromium-54.0.2840.59/third_party/icu/icu.gyp.armfix	2016-10-13 14:57:47.148707100 -0400
 +++ chromium-54.0.2840.59/third_party/icu/icu.gyp	2016-10-13 14:59:24.294837176 -0400
@@ -44,7 +44,7 @@
       }],
       ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \
          or OS=="netbsd" or OS=="mac" or OS=="android" or OS=="qnx") and \
 -        (target_arch=="arm" or target_arch=="ia32" or \
 +        (target_arch=="ia32" or \
          target_arch=="mipsel" or target_arch=="mips")', {
         'target_conditions': [
           ['_toolset=="host"', {
--- a/chromium-54.0.2840.59-gcc5.patch
+++ b/chromium-54.0.2840.59-gcc5.patch
@ -1,354 +0,0 @@
 diff -up chromium-54.0.2840.59/third_party/cld_2/src/internal/cld_generated_cjk_uni_prop_80.cc.gcc5 chromium-54.0.2840.59/third_party/cld_2/src/internal/cld_generated_cjk_uni_prop_80.cc
 --- chromium-54.0.2840.59/third_party/cld_2/src/internal/cld_generated_cjk_uni_prop_80.cc.gcc5	2016-10-12 15:05:10.000000000 -0400
 +++ chromium-54.0.2840.59/third_party/cld_2/src/internal/cld_generated_cjk_uni_prop_80.cc	2016-10-13 14:45:19.769110162 -0400
@@ -165,8 +165,8 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
 // state[16 + 2] 0x000000 Byte 2 of 3 (relative offsets)
 X__,X__,X__,X__,X__,X__,X__,X__, X__,X__,X__,X__,X__,X__,X__,X__,
 X__,X__,X__,X__,X__,X__,X__,X__, X__,X__,X__,X__,X__,X__,X__,X__,
 --14,-14,-14,-14,-14,-14,-14,-14, -14,-14,-14,-14,-14,-14,-14,-14,
 --14,-14,-14,-14,-14,-14,-14,-14, -14,-14,-14,-14,-14,-14,-14,-14,
 +(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14, (uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,
 +(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14, (uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,
 // state[17 + 2] 0x0031c0 Byte 3 of 3 (property)
   0,  0,  0,  0,  0,  0,  0,  0,   0,  0,  0,  0,  0,  0,  0,  0,
@@ -259,10 +259,10 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
 229,229,229,  3,208,  0,229,  5, 233,  0,229,229,229,208,229,229,
 // state[32 + 2] 0x002000 Byte 2 of 3 (relative offsets)
 --30,-30,-30,-30,-30,-30,-30,-30, -30,-30,-30,-30,-30,-30,-30,-30,
 --30,-30,-30,-30,-30,-30,-30,-30, -30,-30,-30,-30,-30,-30,-30,-30,
 --30,-30,-30,-30,-30,-30,-30,-30, -30,-30,-30,-30,-30,-30,-30,-30,
 --30,-30,-30,-30,-30,-30,-30,-30, -30,-30,-30,-30,-30,-30,-30,-30,
 +(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30, (uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,
 +(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30, (uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,
 +(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30, (uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,
 +(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30, (uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,
 // state[33 + 2] 0x003780 Byte 3 of 3 (property)
 229,208,229,229,208,229,229,229, 208,208,208,208,208,  4,  6,208,
@@ -355,10 +355,10 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
 228,229,229,229,229,233,233,  6, 208,229,  3,229,233,  6,  6,  0,
 // state[48 + 2] 0x001000 Byte 2 of 3 (relative offsets)
 --46,-46,-46,-46,-42,-41,-40,-39, -46,-46,-46,-46,-46,-46,-46,-46,
 --46,-46,-46,-46,-46,-46,-46,-46, -46,-46,-46,-46,-46,-46,-46,-46,
 --46,-46,-46,-46,-46,-46,-46,-46, -46,-46,-46,-46,-46,-46,-46,-46,
 --46,-46,-46,-46,-46,-46,-46,-46, -46,-46,-46,-46,-46,-46,-46,-46,
 +(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-42,(uint8)-41,(uint8)-40,(uint8)-39, (uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,
 +(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46, (uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,
 +(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46, (uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,
 +(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46, (uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,
 // state[49 + 2] 0x003b40 Byte 3 of 3 (property)
   6,227,208,233,208,  3,  3,208, 208,229,  0,229,233,219,  0,  6,
@@ -451,10 +451,10 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
 229,208,208,208,217,208,229,229, 229,229,208,217,208,229,229,229,
 // state[64 + 2] 0x003000 Byte 2 of 3 (relative offsets)
 --54,-53,-52,-51,-50,-58,-49,-47, -62,-62,-62,-62,-62,-62,-62,-62,
 --46,-45,-44,-43,-42,-41,-40,-39, -38,-37,-36,-35,-34,-33,-31,-30,
 --29,-28,-27,-26,-25,-24,-23,-22, -21,-20,-19,-18,-17,-15,-14,-13,
 --12,-11,-10, -9, -8, -7, -6, -5,  -4, -3, -2, -1,  1,  2,  3,  4,
 +(uint8)-54,(uint8)-53,(uint8)-52,(uint8)-51,(uint8)-50,(uint8)-58,(uint8)-49,(uint8)-47, (uint8)-62,(uint8)-62,(uint8)-62,(uint8)-62,(uint8)-62,(uint8)-62,(uint8)-62,(uint8)-62,
 +(uint8)-46,(uint8)-45,(uint8)-44,(uint8)-43,(uint8)-42,(uint8)-41,(uint8)-40,(uint8)-39, (uint8)-38,(uint8)-37,(uint8)-36,(uint8)-35,(uint8)-34,(uint8)-33,(uint8)-31,(uint8)-30,
 +(uint8)-29,(uint8)-28,(uint8)-27,(uint8)-26,(uint8)-25,(uint8)-24,(uint8)-23,(uint8)-22, (uint8)-21,(uint8)-20,(uint8)-19,(uint8)-18,(uint8)-17,(uint8)-15,(uint8)-14,(uint8)-13,
 +(uint8)-12,(uint8)-11,(uint8)-10, (uint8)-9, (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5,  (uint8)-4, (uint8)-3, (uint8)-2, (uint8)-1,  1,  2,  3,  4,
 // state[65 + 2] 0x003f00 Byte 3 of 3 (property)
 217,217,208,  3,208,217,208,208,   6,229,208,228,229,229,208,229,
@@ -547,10 +547,10 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
 229,208,229,229,208,229,233,  0, 208,208,229,208,227,229,229,229,
 // state[80 + 2] 0x004000 Byte 2 of 3 (relative offsets)
 --11,-10, -9, -8, -7, -6, -5, -4,  -3, -2, -1,  1,  2,  3,  4,  5,
 +(uint8)-11,(uint8)-10, (uint8)-9, (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4,  (uint8)-3, (uint8)-2, (uint8)-1,  1,  2,  3,  4,  5,
   6,  7,  8,  9, 10, 11, 12, 13,  14, 15, 16, 17, 18, 19, 20, 21,
  22, 23, 24, 25, 26, 27, 28, 29,  30, 31, 32, 33, 34, 35, 36, 37,
 - 38, 39, 40, 41, 42, 43, 44,-78,  45, 46, 47, 48, 49, 50, 51, 52,
 + 38, 39, 40, 41, 42, 43, 44,(uint8)-78,  45, 46, 47, 48, 49, 50, 51, 52,
 // state[81 + 2] 0x0042c0 Byte 3 of 3 (property)
 229,  0,229,229,229,  3,  4,  4, 229,229,229,229,208,229,  0,208,
@@ -931,7 +931,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
   0,142, 98, 28,117,206,212,212, 220, 15,  0,231,199,231,111, 28,
 // state[144 + 2] 0x005000 Byte 2 of 3 (relative offsets)
 --11,-10, -9, -8, -7, -6, -5, -4,  -3, -2, -1,  1,  2,  3,  4,  5,
 +(uint8)-11,(uint8)-10, (uint8)-9, (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4,  (uint8)-3, (uint8)-2, (uint8)-1,  1,  2,  3,  4,  5,
   6,  7,  8,  9, 10, 11, 12, 13,  14, 15, 16, 17, 18, 19, 20, 21,
  22, 23, 24, 25, 26, 27, 28, 29,  30, 31, 32, 33, 34, 35, 36, 37,
  38, 39, 40, 41, 42, 43, 44, 45,  46, 47, 48, 49, 50, 51, 52, 53,
@@ -1315,7 +1315,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
  16, 15,211,118,  0,231, 68,231,   0, 99,161,  0,115,221,144,140,
 // state[208 + 2] 0x006000 Byte 2 of 3 (relative offsets)
 --10, -9, -8, -7, -6, -5, -4, -3,  -2, -1,  1,  2,  3,  4,  5,  6,
 +(uint8)-10, (uint8)-9, (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4, (uint8)-3,  (uint8)-2, (uint8)-1,  1,  2,  3,  4,  5,  6,
   7,  8,  9, 10, 11, 12, 13, 14,  15, 16, 17, 18, 19, 20, 21, 22,
  23, 24, 25, 26, 27, 28, 29, 30,  31, 32, 33, 34, 35, 36, 37, 38,
  39, 40, 41, 42, 43, 44, 45, 46,  47, 48, 49, 50, 51, 52, 53, 54,
@@ -1699,7 +1699,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
 119, 16, 51,  0,  0, 68,136, 72, 144,118, 87,201,191,136, 78,233,
 // state[272 + 2] 0x007000 Byte 2 of 3 (relative offsets)
 - -9, -8, -7, -6, -5, -4, -3, -2,  -1,  1,  2,  3,  4,  5,  6,  7,
 + (uint8)-9, (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4, (uint8)-3, (uint8)-2,  (uint8)-1,  1,  2,  3,  4,  5,  6,  7,
   8,  9, 10, 11, 12, 13, 14, 15,  16, 17, 18, 19, 20, 21, 22, 23,
  24, 25, 26, 27, 28, 29, 30, 31,  32, 33, 34, 35, 36, 37, 38, 39,
  40, 41, 42, 43, 44, 45, 46, 47,  48, 49, 50, 51, 52, 53, 54, 55,
@@ -2083,7 +2083,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
 212,212,  0,126,140,220,220,  0,   0,  0,127,118,106,  0,199,  0,
 // state[336 + 2] 0x008000 Byte 2 of 3 (relative offsets)
 - -8, -7, -6, -5, -4, -3, -2, -1,   1,  2,  3,  4,  5,  6,  7,  8,
 + (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4, (uint8)-3, (uint8)-2, (uint8)-1,   1,  2,  3,  4,  5,  6,  7,  8,
   9, 10, 11, 12, 13, 14, 15, 16,  17, 18, 19, 20, 21, 22, 23, 24,
  25, 26, 27, 28, 29, 30, 31, 32,  33, 34, 35, 36, 37, 38, 39, 40,
  41, 42, 43, 44, 45, 46, 47, 48,  49, 50, 51, 52, 53, 54, 55, 56,
@@ -2467,7 +2467,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
   0,122,  0,231,100,232,  0,  0, 117,  0,206,231,  0,  0,231,  0,
 // state[400 + 2] 0x009000 Byte 2 of 3 (relative offsets)
 - -7, -6, -5, -4, -3, -2, -1,  1,   2,  3,  4,  5,  6,  7,  8,  9,
 + (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4, (uint8)-3, (uint8)-2, (uint8)-1,  1,   2,  3,  4,  5,  6,  7,  8,  9,
  10, 11, 12, 13, 14, 15, 16, 17,  18, 19, 20, 21, 22, 23, 24, 25,
  26, 27, 28, 29, 30, 31, 32, 33,  34, 35, 36, 37, 38, 39, 40, 41,
  42, 43, 44, 45, 46, 47, 48, 49,  50, 51, 52, 53, 54, 55, 56, 57,
@@ -2851,10 +2851,10 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
   0,  0,  0,  0,  0,  0,  0,  0,   0,  0,  0,  0,  0,  0,  0,  0,
 // state[464 + 2] 0x00a000 Byte 2 of 3 (relative offsets)
 - -6, -6, -6, -6, -6, -6, -6, -6,  -6, -6, -6, -6, -6, -6, -6, -6,
 - -6, -6, -6, -6, -6, -6, -6, -6,  -6, -6, -6, -6, -6, -6, -6, -6,
 - -6, -6, -6, -6, -6, -6, -6, -6,  -6, -6, -6, -6, -6, -6, -6, -6,
 - -5, -5, -5, -5, -5, -5, -5, -5,  -5, -5, -5, -5, -5, -5, -5, -5,
 + (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6,  (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6,
 + (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6,  (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6,
 + (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6,  (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6,
 + (uint8)-5, (uint8)-5, (uint8)-5, (uint8)-5, (uint8)-5, (uint8)-5, (uint8)-5, (uint8)-5,  (uint8)-5, (uint8)-5, (uint8)-5, (uint8)-5, (uint8)-5, (uint8)-5, (uint8)-5, (uint8)-5,
 // state[465 + 2] 0x000080 Byte 2 of 2 (property)
   0,  0,  0,  0,  0,  0,  0,  0,   0,  0,  0,  0,  0,  0,  0,  0,
@@ -2947,10 +2947,10 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
 208,208,208,208,  5,  6,208,  2,   0,  6,  6,  5,208,208,208,  6,
 // state[480 + 2] 0x00b000 Byte 2 of 3 (relative offsets)
 --20,-20,-20,-20,-20,-20,-20,-20, -20,-20,-20,-20,-20,-20,-20,-20,
 --20,-20,-20,-20,-20,-20,-20,-20, -20,-20,-20,-20,-20,-20,-20,-20,
 --20,-20,-20,-20,-20,-20,-20,-20, -20,-20,-20,-20,-20,-20,-20,-20,
 --20,-20,-20,-20,-20,-20,-20,-20, -20,-20,-20,-20,-20,-20,-20,-20,
 +(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20, (uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,
 +(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20, (uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,
 +(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20, (uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,
 +(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20, (uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,
 // state[481 + 2] 0x020100 Byte 4 of 4 (property)
   2,  6,  5,  6,  5,229,  5,208, 208,208,208,208,208,208,208,229,
@@ -3043,10 +3043,10 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
 208,208,  5,  5,  5,208,208,  2, 229,  5,  5,  5,  5,  5,  6,208,
 // state[496 + 2] 0x00d000 Byte 2 of 3 (relative offsets)
 --35,-35,-35,-35,-35,-35,-35,-35, -35,-35,-35,-35,-35,-35,-35,-35,
 --35,-35,-35,-35,-35,-35,-35,-35, -35,-35,-35,-35,-35,-35,-34,-33,
 --33,-33,-33,-33,-33,-33,-33,-33, -33,-33,-33,-33,-33,-33,-33,-33,
 --33,-33,-33,-33,-33,-33,-33,-33, -33,-33,-33,-33,-33,-33,-33,-33,
 +(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35, (uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,
 +(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35, (uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-34,(uint8)-33,
 +(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33, (uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,
 +(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33, (uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,
 // state[497 + 2] 0x0204c0 Byte 4 of 4 (property)
   2,  2,  5,  5,  5,  2,208,  2,   5,  5,  6,208,208,  5,  5,  5,
@@ -3139,10 +3139,10 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
 208,208,  5,  5,  5,  5,  6,  6, 208,208,  2,208,208,208,208,208,
 // state[512 + 2] 0x00f000 Byte 2 of 3 (relative offsets)
 --47,-47,-47,-47,-47,-47,-47,-47, -47,-47,-47,-47,-47,-47,-47,-47,
 --47,-47,-47,-47,-47,-47,-47,-47, -47,-47,-47,-47,-47,-47,-47,-47,
 --47,-47,-47,-47,-46,-45,-44,-43, -42,-41,-44,-40,-47,-47,-47,-47,
 --47,-47,-47,-47,-47,-47,-47,-47, -47,-47,-47,-47,-47,-39,-38,-37,
 +(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47, (uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,
 +(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47, (uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,
 +(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-46,(uint8)-45,(uint8)-44,(uint8)-43, (uint8)-42,(uint8)-41,(uint8)-44,(uint8)-40,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,
 +(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47, (uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-39,(uint8)-38,(uint8)-37,
 // state[513 + 2] 0x020880 Byte 4 of 4 (property)
   5,  5,  5,  6,208,208,208,208, 208,208,  5,  5,  6,  6,208,208,
@@ -3235,10 +3235,10 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
   5,  6,208,218,208,208,208,218, 208,  6,227,229,  6,  6,  6,208,
 // state[528 + 2] 0x020000 Byte 3 of 4 (relative offsets)
 --52,-51,-50,-49,-47,-46,-45,-44, -43,-42,-41,-40,-39,-38,-37,-36,
 --35,-34,-33,-31,-30,-29,-28,-27, -26,-25,-24,-23,-22,-21,-20,-19,
 --18,-17,-15,-14,-13,-12,-11,-10,  -9, -8, -7, -6, -5, -4, -3, -2,
 - -1,  1,  2,  3,  4,  5,  6,  7,   8,  9, 10, 11, 12, 13, 14, 15,
 +(uint8)-52,(uint8)-51,(uint8)-50,(uint8)-49,(uint8)-47,(uint8)-46,(uint8)-45,(uint8)-44, (uint8)-43,(uint8)-42,(uint8)-41,(uint8)-40,(uint8)-39,(uint8)-38,(uint8)-37,(uint8)-36,
 +(uint8)-35,(uint8)-34,(uint8)-33,(uint8)-31,(uint8)-30,(uint8)-29,(uint8)-28,(uint8)-27, (uint8)-26,(uint8)-25,(uint8)-24,(uint8)-23,(uint8)-22,(uint8)-21,(uint8)-20,(uint8)-19,
 +(uint8)-18,(uint8)-17,(uint8)-15,(uint8)-14,(uint8)-13,(uint8)-12,(uint8)-11,(uint8)-10,  (uint8)-9, (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4, (uint8)-3, (uint8)-2,
 + (uint8)-1,  1,  2,  3,  4,  5,  6,  7,   8,  9, 10, 11, 12, 13, 14, 15,
 // state[529 + 2] 0x020c40 Byte 4 of 4 (property)
 227,  5,  5,  5,  2,  2,  2,  2, 213,  2,  2,  2,  2,  2,208,  6,
@@ -3427,7 +3427,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
 208,208,208,208,208,208,208,208, 208,  6,  6,  6,  6,  2,  5,  5,
 // state[560 + 2] 0x021000 Byte 3 of 4 (relative offsets)
 --16,-15,-14,-13,-12,-11,-10, -9,  -8, -7, -6, -5, -4, -3, -2, -1,
 +(uint8)-16,(uint8)-15,(uint8)-14,(uint8)-13,(uint8)-12,(uint8)-11,(uint8)-10, (uint8)-9,  (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4, (uint8)-3, (uint8)-2, (uint8)-1,
   1,  2,  3,  4,  5,  6,  7,  8,   9, 10, 11, 12, 13, 14, 15, 16,
  17, 18, 19, 20, 21, 22, 23, 24,  25, 26, 27, 28, 29, 30, 31, 32,
  33, 34, 35, 36, 37, 38, 39, 40,  41, 42, 43, 44, 45, 46, 47, 48,
@@ -3811,7 +3811,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
   5,  5,  5,  6,  6,  6,  5,208, 208,229,208,208,  5,  5,  5,  5,
 // state[624 + 2] 0x022000 Byte 3 of 4 (relative offsets)
 --15,-14,-13,-12,-11,-10, -9, -8,  -7, -6, -5, -4, -3, -2, -1,  1,
 +(uint8)-15,(uint8)-14,(uint8)-13,(uint8)-12,(uint8)-11,(uint8)-10, (uint8)-9, (uint8)-8,  (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4, (uint8)-3, (uint8)-2, (uint8)-1,  1,
   2,  3,  4,  5,  6,  7,  8,  9,  10, 11, 12, 13, 14, 15, 16, 17,
  18, 19, 20, 21, 22, 23, 24, 25,  26, 27, 28, 29, 30, 31, 32, 33,
  34, 35, 36, 37, 38, 39, 40, 41,  42, 43, 44, 45, 46, 47, 48, 49,
@@ -4195,7 +4195,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
   6,  6,  4,  5,208,208,208,208, 208,208,229,  6,  5,  6,  6,  6,
 // state[688 + 2] 0x023000 Byte 3 of 4 (relative offsets)
 --14,-13,-12,-11,-10, -9, -8, -7,  -6, -5, -4, -3, -2, -1,  1,  2,
 +(uint8)-14,(uint8)-13,(uint8)-12,(uint8)-11,(uint8)-10, (uint8)-9, (uint8)-8, (uint8)-7,  (uint8)-6, (uint8)-5, (uint8)-4, (uint8)-3, (uint8)-2, (uint8)-1,  1,  2,
   3,  4,  5,  6,  7,  8,  9, 10,  11, 12, 13, 14, 15, 16, 17, 18,
  19, 20, 21, 22, 23, 24, 25, 26,  27, 28, 29, 30, 31, 32, 33, 34,
  35, 36, 37, 38, 39, 40, 41, 42,  43, 44, 45, 46, 47, 48, 49, 50,
@@ -4579,7 +4579,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
   5,  5,  5,  5,  5,  5,  5,  6, 208,208,208,208,208,208,  6,  6,
 // state[752 + 2] 0x024000 Byte 3 of 4 (relative offsets)
 --13,-12,-11,-10, -9, -8, -7, -6,  -5, -4, -3, -2, -1,  1,  2,  3,
 +(uint8)-13,(uint8)-12,(uint8)-11,(uint8)-10, (uint8)-9, (uint8)-8, (uint8)-7, (uint8)-6,  (uint8)-5, (uint8)-4, (uint8)-3, (uint8)-2, (uint8)-1,  1,  2,  3,
   4,  5,  6,  7,  8,  9, 10, 11,  12, 13, 14, 15, 16, 17, 18, 19,
  20, 21, 22, 23, 24, 25, 26, 27,  28, 29, 30, 31, 32, 33, 34, 35,
  36, 37, 38, 39, 40, 41, 42, 43,  44, 45, 46, 47, 48, 49, 50, 51,
@@ -4963,7 +4963,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
 229,  6,  2,  2,  2,  2,  2,  2,   2,  2,  2,  5,  2,  2,  6,229,
 // state[816 + 2] 0x025000 Byte 3 of 4 (relative offsets)
 --12,-11,-10, -9, -8, -7, -6, -5,  -4, -3, -2, -1,  1,  2,  3,  4,
 +(uint8)-12,(uint8)-11,(uint8)-10, (uint8)-9, (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5,  (uint8)-4, (uint8)-3, (uint8)-2, (uint8)-1,  1,  2,  3,  4,
   5,  6,  7,  8,  9, 10, 11, 12,  13, 14, 15, 16, 17, 18, 19, 20,
  21, 22, 23, 24, 25, 26, 27, 28,  29, 30, 31, 32, 33, 34, 35, 36,
  37, 38, 39, 40, 41, 42, 43, 44,  45, 46, 47, 48, 49, 50, 51, 52,
@@ -5347,7 +5347,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
   6,  6,  6,  5,  5,  5,  5,  6,   6,  6,  3,  6,229,208,208,229,
 // state[880 + 2] 0x026000 Byte 3 of 4 (relative offsets)
 --11,-10, -9, -8, -7, -6, -5, -4,  -3, -2, -1,  1,  2,  3,  4,  5,
 +(uint8)-11,(uint8)-10, (uint8)-9, (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4,  (uint8)-3, (uint8)-2, (uint8)-1,  1,  2,  3,  4,  5,
   6,  7,  8,  9, 10, 11, 12, 13,  14, 15, 16, 17, 18, 19, 20, 21,
  22, 23, 24, 25, 26, 27, 28, 29,  30, 31, 32, 33, 34, 35, 36, 37,
  38, 39, 40, 41, 42, 43, 44, 45,  46, 47, 48, 49, 50, 51, 52, 53,
@@ -5731,7 +5731,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
 208,  6,  6,208,208,208,208,208,   6,  6,  6,216,  5,  5,  5,  5,
 // state[944 + 2] 0x027000 Byte 3 of 4 (relative offsets)
 --10, -9, -8, -7, -6, -5, -4, -3,  -2, -1,  1,  2,  3,  4,  5,  6,
 +(uint8)-10, (uint8)-9, (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4, (uint8)-3,  (uint8)-2, (uint8)-1,  1,  2,  3,  4,  5,  6,
   7,  8,  9, 10, 11, 12, 13, 14,  15, 16, 17, 18, 19, 20, 21, 22,
  23, 24, 25, 26, 27, 28, 29, 30,  31, 32, 33, 34, 35, 36, 37, 38,
  39, 40, 41, 42, 43, 44, 45, 46,  47, 48, 49, 50, 51, 52, 53, 54,
@@ -6115,7 +6115,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
   5,  5,  5,  6,208,208,  6,  6, 208,229,208,208,208,  5,  5,  5,
 // state[1008 + 2] 0x028000 Byte 3 of 4 (relative offsets)
 - -9, -8, -7, -6, -5, -4, -3, -2,  -1,  1,  2,  3,  4,  5,  6,  7,
 + (uint8)-9, (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4, (uint8)-3, (uint8)-2,  (uint8)-1,  1,  2,  3,  4,  5,  6,  7,
   8,  9, 10, 11, 12, 13, 14, 15,  16, 17, 18, 19, 20, 21, 22, 23,
  24, 25, 26, 27, 28, 29, 30, 31,  32, 33, 34, 35, 36, 37, 38, 39,
  40, 41, 42, 43, 44, 45, 46, 47,  48, 49, 50, 51, 52, 53, 54, 55,
@@ -6499,7 +6499,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
 208,208,  5,  5,  6,208,208,  5, 208,208,208,  6,208,  6,208,208,
 // state[1072 + 2] 0x029000 Byte 3 of 4 (relative offsets)
 - -8, -7, -6, -5, -4, -3, -2, -1,   1,  2,  3,  4,  5,  6,  7,  8,
 + (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4, (uint8)-3, (uint8)-2, (uint8)-1,   1,  2,  3,  4,  5,  6,  7,  8,
   9, 10, 11, 12, 13, 14, 15, 16,  17, 18, 19, 20, 21, 22, 23, 24,
  25, 26, 27, 28, 29, 30, 31, 32,  33, 34, 35, 36, 37, 38, 39, 40,
  41, 42, 43, 44, 45, 46, 47, 48,  49, 50, 51, 52, 53, 54, 55, 56,
@@ -6883,7 +6883,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
 229,229,229,229,208,208,208,229, 208,208,208,229,  0,229,208,208,
 // state[1136 + 2] 0x02a000 Byte 3 of 4 (relative offsets)
 - -7, -6, -5, -4, -3, -2, -1,  1,   2,  3,  4,  5,  6,  7,  8,  9,
 + (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4, (uint8)-3, (uint8)-2, (uint8)-1,  1,   2,  3,  4,  5,  6,  7,  8,  9,
  10, 11, 12, 13, 14, 15, 16, 17,  18, 19, 20, 21, 22, 22, 22, 22,
  22, 22, 22, 22, 22, 22, 22, 22,  22, 22, 22, 22, 22, 22, 22, 22,
  22, 22, 22, 22, 22, 22, 22, 22,  22, 22, 22, 22, 22, 22, 22, 22,
@@ -7075,10 +7075,10 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
   5,  5,  5,  5,  5,  5,  5,  5,   5,  5,  5,  5,  5,  5,  5,  5,
 // state[1168 + 2] 0x02f000 Byte 3 of 4 (relative offsets)
 - -9, -9, -9, -9, -9, -9, -9, -9,  -9, -9, -9, -9, -9, -9, -9, -9,
 - -9, -9, -9, -9, -9, -9, -9, -9,  -9, -9, -9, -9, -9, -9, -9, -9,
 - -8, -7, -6, -5, -4, -3, -2, -1,   1, -9, -9, -9, -9, -9, -9, -9,
 - -9, -9, -9, -9, -9, -9, -9, -9,  -9, -9, -9, -9, -9, -9, -9, -9,
 + (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9,  (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9,
 + (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9,  (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9,
 + (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4, (uint8)-3, (uint8)-2, (uint8)-1,   1, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9,
 + (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9,  (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9,
 // state[1169 + 2] 0x02fa00 Byte 4 of 4 (property)
 217,  5,  5,  5,  5,  5,  5,  5,   5,  5,  5,  5,  5,217,  5,  5,
 diff -up chromium-54.0.2840.59/third_party/webgl/src/specs/latest/2.0/webgl2.idl.gcc5 chromium-54.0.2840.59/third_party/webgl/src/specs/latest/2.0/webgl2.idl
 --- chromium-54.0.2840.59/third_party/webgl/src/specs/latest/2.0/webgl2.idl.gcc5	2016-10-12 15:05:45.000000000 -0400
 +++ chromium-54.0.2840.59/third_party/webgl/src/specs/latest/2.0/webgl2.idl	2016-10-13 14:45:19.770110142 -0400
@@ -264,7 +264,7 @@ interface WebGL2RenderingContextBase
   const GLenum UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES          = 0x8A43;
   const GLenum UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER     = 0x8A44;
   const GLenum UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER   = 0x8A46;
 -  const GLenum INVALID_INDEX                                 = 0xFFFFFFFF;
 +  const GLenum INVALID_INDEX                                 = 256;
   const GLenum MAX_VERTEX_OUTPUT_COMPONENTS                  = 0x9122;
   const GLenum MAX_FRAGMENT_INPUT_COMPONENTS                 = 0x9125;
   const GLenum MAX_SERVER_WAIT_TIMEOUT                       = 0x9111;
 diff -up chromium-54.0.2840.59/third_party/WebKit/Source/core/dom/NodeFilter.h.gcc5 chromium-54.0.2840.59/third_party/WebKit/Source/core/dom/NodeFilter.h
 --- chromium-54.0.2840.59/third_party/WebKit/Source/core/dom/NodeFilter.h.gcc5	2016-10-13 14:45:19.771110122 -0400
 +++ chromium-54.0.2840.59/third_party/WebKit/Source/core/dom/NodeFilter.h	2016-10-13 14:54:50.328113956 -0400
@@ -51,7 +51,7 @@ public:
      * to the value of NodeType for the equivalent node type.
      */
     enum {
 -        kShowAll                       = 0xFFFFFFFF,
 +        kShowAll                       = 256 /* 0xFFFFFFFF */,
         kShowElement                   = 0x00000001,
         kShowAttribute                 = 0x00000002,
         kShowText                      = 0x00000004,
 diff -up chromium-54.0.2840.59/third_party/WebKit/Source/core/dom/NodeFilter.idl.gcc5 chromium-54.0.2840.59/third_party/WebKit/Source/core/dom/NodeFilter.idl
 --- chromium-54.0.2840.59/third_party/WebKit/Source/core/dom/NodeFilter.idl.gcc5	2016-10-12 15:03:13.000000000 -0400
 +++ chromium-54.0.2840.59/third_party/WebKit/Source/core/dom/NodeFilter.idl	2016-10-13 14:45:19.771110122 -0400
@@ -30,7 +30,7 @@
     const unsigned short FILTER_SKIP = 3;
     // Constants for whatToShow
 -    const unsigned long SHOW_ALL = 0xFFFFFFFF;
 +    const unsigned long SHOW_ALL = 256; // 0xFFFFFFFF
     const unsigned long SHOW_ELEMENT = 0x1;
     const unsigned long SHOW_ATTRIBUTE = 0x2; // historical
     const unsigned long SHOW_TEXT = 0x4;
 diff -up chromium-54.0.2840.59/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.idl.gcc5 chromium-54.0.2840.59/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.idl
 --- chromium-54.0.2840.59/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.idl.gcc5	2016-10-12 15:03:13.000000000 -0400
 +++ chromium-54.0.2840.59/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.idl	2016-10-13 14:45:19.772110102 -0400
@@ -239,7 +239,7 @@ typedef long long      GLint64;
     const GLenum UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES          = 0x8A43;
     const GLenum UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER     = 0x8A44;
     const GLenum UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER   = 0x8A46;
 -    const GLenum INVALID_INDEX                                 = 0xFFFFFFFF;
 +    const GLenum INVALID_INDEX                                 = 256;
     const GLenum MAX_VERTEX_OUTPUT_COMPONENTS                  = 0x9122;
     const GLenum MAX_FRAGMENT_INPUT_COMPONENTS                 = 0x9125;
     const GLenum MAX_SERVER_WAIT_TIMEOUT                       = 0x9111;
@@ -282,7 +282,7 @@ typedef long long      GLint64;
     const GLenum MAX_ELEMENT_INDEX                             = 0x8D6B;
     const GLenum NUM_SAMPLE_COUNTS                             = 0x9380;
     const GLenum TEXTURE_IMMUTABLE_LEVELS                      = 0x82DF;
 -    const GLint TIMEOUT_IGNORED                                = -1;
 +    const GLint TIMEOUT_IGNORED                                = 256;
     /* WebGL-specific enums */
     const GLenum MAX_CLIENT_WAIT_TIMEOUT_WEBGL                 = 0x9247;
--- a/chromium-54.0.2840.59-gn-system.patch
+++ b/chromium-54.0.2840.59-gn-system.patch
@ -1,223 +0,0 @@
 diff -up chromium-54.0.2840.59/build/linux/unbundle/libjpeg.gn.gnsystem chromium-54.0.2840.59/build/linux/unbundle/libjpeg.gn
 --- chromium-54.0.2840.59/build/linux/unbundle/libjpeg.gn.gnsystem	2016-10-13 16:06:00.464796742 -0400
 +++ chromium-54.0.2840.59/build/linux/unbundle/libjpeg.gn	2016-10-13 16:06:08.976631824 -0400
@@ -16,6 +16,10 @@ source_set("libjpeg") {
   libs = [ "jpeg" ]
 }
 +config("system_libjpeg") {
 +  defines = [ "USE_SYSTEM_LIBJPEG=1" ]
 +}
 +
 source_set("simd") {
 }
 diff -up chromium-54.0.2840.59/build/linux/unbundle/libusb.gn.gnsystem chromium-54.0.2840.59/build/linux/unbundle/libusb.gn
 --- chromium-54.0.2840.59/build/linux/unbundle/libusb.gn.gnsystem	2016-10-13 15:47:48.147891525 -0400
 +++ chromium-54.0.2840.59/build/linux/unbundle/libusb.gn	2016-10-13 15:47:48.147891525 -0400
@@ -0,0 +1,24 @@
 +# Copyright 2016 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("//build/config/linux/pkg_config.gni")
 +import("//build/shim_headers.gni")
 +
 +pkg_config("system_libusb") {
 +  packages = [ "libusb-1.0" ]
 +}
 +
 +shim_headers("libusb_shim") {
 +  root_path = "src/libusb"
 +  headers = [
 +    "libusb.h",
 +  ]
 +}
 +
 +source_set("libusb") {
 +  deps = [
 +    ":libusb_shim",
 +  ]
 +  public_configs = [ ":system_libusb" ]
 +}
 diff -up chromium-54.0.2840.59/build/linux/unbundle/opus.gn.gnsystem chromium-54.0.2840.59/build/linux/unbundle/opus.gn
 --- chromium-54.0.2840.59/build/linux/unbundle/opus.gn.gnsystem	2016-10-13 15:47:48.147891525 -0400
 +++ chromium-54.0.2840.59/build/linux/unbundle/opus.gn	2016-10-13 15:47:48.147891525 -0400
@@ -0,0 +1,161 @@
 +# Copyright 2016 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("//build/config/linux/pkg_config.gni")
 +import("//build/shim_headers.gni")
 +import("//testing/test.gni")
 +
 +pkg_config("system_opus") {
 +  packages = [ "opus" ]
 +}
 +
 +shim_headers("opus_shim") {
 +  root_path = "src/include"
 +  headers = [
 +    "opus_custom.h",
 +    "opus_defines.h",
 +    "opus_multistream.h",
 +    "opus_types.h",
 +    "opus.h",
 +  ]
 +}
 +
 +source_set("opus") {
 +  deps = [
 +    ":opus_shim",
 +  ]
 +  public_configs = [ ":system_opus" ]
 +}
 +
 +config("opus_test_config") {
 +  include_dirs = [
 +    "src/celt",
 +    "src/silk",
 +  ]
 +
 +  if (is_win) {
 +    defines = [ "inline=__inline" ]
 +  }
 +  if (is_android) {
 +    libs = [ "log" ]
 +  }
 +  if (is_clang) {
 +    cflags = [ "-Wno-absolute-value" ]
 +  }
 +}
 +
 +executable("opus_compare") {
 +  sources = [
 +    "src/src/opus_compare.c",
 +  ]
 +
 +  configs -= [ "//build/config/compiler:chromium_code" ]
 +  configs += [
 +    "//build/config/compiler:no_chromium_code",
 +    ":opus_test_config",
 +  ]
 +
 +  deps = [
 +    ":opus",
 +    "//build/config/sanitizers:deps",
 +    "//build/win:default_exe_manifest",
 +  ]
 +}
 +
 +executable("opus_demo") {
 +  sources = [
 +    "src/src/opus_demo.c",
 +  ]
 +
 +  configs -= [ "//build/config/compiler:chromium_code" ]
 +  configs += [
 +    "//build/config/compiler:no_chromium_code",
 +    ":opus_test_config",
 +  ]
 +
 +  deps = [
 +    ":opus",
 +    "//build/config/sanitizers:deps",
 +    "//build/win:default_exe_manifest",
 +  ]
 +}
 +
 +test("test_opus_api") {
 +  sources = [
 +    "src/tests/test_opus_api.c",
 +  ]
 +
 +  configs -= [ "//build/config/compiler:chromium_code" ]
 +  configs += [
 +    "//build/config/compiler:no_chromium_code",
 +    ":opus_test_config",
 +  ]
 +
 +  deps = [
 +    ":opus",
 +  ]
 +}
 +
 +test("test_opus_encode") {
 +  sources = [
 +    "src/tests/test_opus_encode.c",
 +  ]
 +
 +  configs -= [ "//build/config/compiler:chromium_code" ]
 +  configs += [
 +    "//build/config/compiler:no_chromium_code",
 +    ":opus_test_config",
 +  ]
 +
 +  deps = [
 +    ":opus",
 +  ]
 +}
 +
 +# GN orders flags on a target before flags from configs. The default config
 +# adds -Wall, and this flag have to be after -Wall -- so they need to
 +# come from a config and can't be on the target directly.
 +config("test_opus_decode_config") {
 +  # test_opus_decode passes a null pointer to opus_decode() for an argument
 +  # marked as requiring a non-null value by the nonnull function attribute,
 +  # and expects opus_decode() to fail. Disable the -Wnonnull option to avoid
 +  # a compilation error if -Werror is specified.
 +  if (is_posix) {
 +    cflags = [ "-Wno-nonnull" ]
 +  }
 +}
 +
 +test("test_opus_decode") {
 +  sources = [
 +    "src/tests/test_opus_decode.c",
 +  ]
 +
 +  configs -= [ "//build/config/compiler:chromium_code" ]
 +  configs += [
 +    "//build/config/compiler:no_chromium_code",
 +    ":opus_test_config",
 +    ":test_opus_decode_config",
 +  ]
 +
 +  deps = [
 +    ":opus",
 +  ]
 +}
 +
 +test("test_opus_padding") {
 +  sources = [
 +    "src/tests/test_opus_padding.c",
 +  ]
 +
 +  configs -= [ "//build/config/compiler:chromium_code" ]
 +  configs += [
 +    "//build/config/compiler:no_chromium_code",
 +    ":opus_test_config",
 +  ]
 +
 +  deps = [
 +    ":opus",
 +  ]
 +}
 +
 diff -up chromium-54.0.2840.59/build/linux/unbundle/replace_gn_files.py.gnsystem chromium-54.0.2840.59/build/linux/unbundle/replace_gn_files.py
 --- chromium-54.0.2840.59/build/linux/unbundle/replace_gn_files.py.gnsystem	2016-10-12 15:02:53.000000000 -0400
 +++ chromium-54.0.2840.59/build/linux/unbundle/replace_gn_files.py	2016-10-13 15:47:48.147891525 -0400
@@ -23,10 +23,12 @@ REPLACEMENTS = {
   'libevent': 'base/third_party/libevent/BUILD.gn',
   'libjpeg': 'build/secondary/third_party/libjpeg_turbo/BUILD.gn',
   'libpng': 'third_party/libpng/BUILD.gn',
 +  'libusb': 'third_party/libusb/BUILD.gn',
   'libvpx': 'third_party/libvpx/BUILD.gn',
   'libwebp': 'third_party/libwebp/BUILD.gn',
   'libxml': 'third_party/libxml/BUILD.gn',
   'libxslt': 'third_party/libxslt/BUILD.gn',
 +  'opus': 'third_party/opus/BUILD.gn',
   're2': 'third_party/re2/BUILD.gn',
   'snappy': 'third_party/snappy/BUILD.gn',
   'yasm': 'third_party/yasm/yasm_assemble.gni',
--- a/chromium-54.0.2840.59-i686-ld-memory-tricks.patch
+++ b/chromium-54.0.2840.59-i686-ld-memory-tricks.patch
@ -1,12 +0,0 @@
 diff -up chromium-54.0.2840.59/build/toolchain/linux/BUILD.gn.ldmemory chromium-54.0.2840.59/build/toolchain/linux/BUILD.gn
 --- chromium-54.0.2840.59/build/toolchain/linux/BUILD.gn.ldmemory	2016-10-19 15:56:20.253096784 -0400
 +++ chromium-54.0.2840.59/build/toolchain/linux/BUILD.gn	2016-10-19 15:58:17.940833948 -0400
@@ -71,7 +71,7 @@ gcc_toolchain("x86") {
   nm = "nm"
   ar = "ar"
   ld = cxx
 -  extra_cppflags = "-fno-delete-null-pointer-checks"
 +  extra_cppflags = "-fno-delete-null-pointer-checks -g1"
   toolchain_args = {
     current_cpu = "x86"
--- a/chromium-54.0.2840.59-nullfix.patch
+++ b/chromium-54.0.2840.59-nullfix.patch
@ -1,35 +0,0 @@
 diff -up chromium-54.0.2840.59/build/toolchain/linux/BUILD.gn.nullfix chromium-54.0.2840.59/build/toolchain/linux/BUILD.gn
 --- chromium-54.0.2840.59/build/toolchain/linux/BUILD.gn.nullfix	2016-10-13 16:49:26.844221023 -0400
 +++ chromium-54.0.2840.59/build/toolchain/linux/BUILD.gn	2016-10-13 16:50:49.882605484 -0400
@@ -31,6 +31,7 @@ gcc_toolchain("arm") {
   ld = cxx
   readelf = "${toolprefix}readelf"
   nm = "${toolprefix}nm"
 +  extra_cppflags = "-fno-delete-null-pointer-checks"
   toolchain_args = {
     current_cpu = "arm"
@@ -70,6 +71,7 @@ gcc_toolchain("x86") {
   nm = "nm"
   ar = "ar"
   ld = cxx
 +  extra_cppflags = "-fno-delete-null-pointer-checks"
   toolchain_args = {
     current_cpu = "x86"
@@ -109,6 +111,7 @@ gcc_toolchain("x64") {
   nm = "nm"
   ar = "ar"
   ld = cxx
 +  extra_cppflags = "-fno-delete-null-pointer-checks"
   toolchain_args = {
     current_cpu = "x64"
@@ -131,6 +134,7 @@ gcc_toolchain("mipsel") {
   ld = cxx
   readelf = "mipsel-linux-gnu-readelf"
   nm = "mipsel-linux-gnu-nm"
 +  extra_cppflags = "-fno-delete-null-pointer-checks"
   toolchain_args = {
     cc_wrapper = ""
--- a/chromium-54.0.2840.90-aura-browser-link-to-snapshot.patch
+++ b/chromium-54.0.2840.90-aura-browser-link-to-snapshot.patch
@ -1,11 +0,0 @@
 diff -up chromium-54.0.2840.90/chrome/browser/BUILD.gn.fixme chromium-54.0.2840.90/chrome/browser/BUILD.gn
 --- chromium-54.0.2840.90/chrome/browser/BUILD.gn.fixme	2016-11-04 09:52:43.712072361 -0400
 +++ chromium-54.0.2840.90/chrome/browser/BUILD.gn	2016-11-04 09:53:21.495864624 -0400
@@ -605,6 +605,7 @@ split_static_library("browser") {
       "//services/ui/public/cpp/input_devices",
       "//ui/aura",
       "//ui/compositor",
 +      "//ui/snapshot",
       "//ui/views/mus",
     ]
   }
--- a/chromium-54.0.2840.90-setopaque.patch
+++ b/chromium-54.0.2840.90-setopaque.patch
@ -1,13 +0,0 @@
 diff -up chromium-54.0.2840.90/cc/blink/web_layer_impl.h.setopaque chromium-54.0.2840.90/cc/blink/web_layer_impl.h
 --- chromium-54.0.2840.90/cc/blink/web_layer_impl.h.setopaque	2016-11-03 09:07:03.422497483 -0400
 +++ chromium-54.0.2840.90/cc/blink/web_layer_impl.h	2016-11-03 09:07:13.302307531 -0400
@@ -80,7 +80,7 @@ class WebLayerImpl : public blink::WebLa
   blink::WebBlendMode blendMode() const override;
   void setIsRootForIsolatedGroup(bool root) override;
   bool isRootForIsolatedGroup() override;
 -  void setOpaque(bool opaque) override;
 +  CC_BLINK_EXPORT void setOpaque(bool opaque) override;
   bool opaque() const override;
   void setPosition(const blink::WebFloatPoint& position) override;
   blink::WebFloatPoint position() const override;
 diff -up chromium-54.0.2840.90/content/renderer/child_frame_compositing_helper.cc.setopaque chromium-54.0.2840.90/content/renderer/child_frame_compositing_helper.cc
--- a/chromium-55.0.2883.75-gcc5.patch
+++ b/chromium-55.0.2883.75-gcc5.patch
@ -1,354 +0,0 @@
 diff -up chromium-55.0.2883.75/third_party/cld_2/src/internal/cld_generated_cjk_uni_prop_80.cc.gcc5 chromium-55.0.2883.75/third_party/cld_2/src/internal/cld_generated_cjk_uni_prop_80.cc
 --- chromium-55.0.2883.75/third_party/cld_2/src/internal/cld_generated_cjk_uni_prop_80.cc.gcc5	2016-12-01 18:03:09.000000000 -0500
 +++ chromium-55.0.2883.75/third_party/cld_2/src/internal/cld_generated_cjk_uni_prop_80.cc	2016-12-12 15:24:01.171747843 -0500
@@ -165,8 +165,8 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
 // state[16 + 2] 0x000000 Byte 2 of 3 (relative offsets)
 X__,X__,X__,X__,X__,X__,X__,X__, X__,X__,X__,X__,X__,X__,X__,X__,
 X__,X__,X__,X__,X__,X__,X__,X__, X__,X__,X__,X__,X__,X__,X__,X__,
 --14,-14,-14,-14,-14,-14,-14,-14, -14,-14,-14,-14,-14,-14,-14,-14,
 --14,-14,-14,-14,-14,-14,-14,-14, -14,-14,-14,-14,-14,-14,-14,-14,
 +(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14, (uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,
 +(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14, (uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,
 // state[17 + 2] 0x0031c0 Byte 3 of 3 (property)
   0,  0,  0,  0,  0,  0,  0,  0,   0,  0,  0,  0,  0,  0,  0,  0,
@@ -259,10 +259,10 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
 229,229,229,  3,208,  0,229,  5, 233,  0,229,229,229,208,229,229,
 // state[32 + 2] 0x002000 Byte 2 of 3 (relative offsets)
 --30,-30,-30,-30,-30,-30,-30,-30, -30,-30,-30,-30,-30,-30,-30,-30,
 --30,-30,-30,-30,-30,-30,-30,-30, -30,-30,-30,-30,-30,-30,-30,-30,
 --30,-30,-30,-30,-30,-30,-30,-30, -30,-30,-30,-30,-30,-30,-30,-30,
 --30,-30,-30,-30,-30,-30,-30,-30, -30,-30,-30,-30,-30,-30,-30,-30,
 +(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30, (uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,
 +(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30, (uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,
 +(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30, (uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,
 +(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30, (uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,
 // state[33 + 2] 0x003780 Byte 3 of 3 (property)
 229,208,229,229,208,229,229,229, 208,208,208,208,208,  4,  6,208,
@@ -355,10 +355,10 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
 228,229,229,229,229,233,233,  6, 208,229,  3,229,233,  6,  6,  0,
 // state[48 + 2] 0x001000 Byte 2 of 3 (relative offsets)
 --46,-46,-46,-46,-42,-41,-40,-39, -46,-46,-46,-46,-46,-46,-46,-46,
 --46,-46,-46,-46,-46,-46,-46,-46, -46,-46,-46,-46,-46,-46,-46,-46,
 --46,-46,-46,-46,-46,-46,-46,-46, -46,-46,-46,-46,-46,-46,-46,-46,
 --46,-46,-46,-46,-46,-46,-46,-46, -46,-46,-46,-46,-46,-46,-46,-46,
 +(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-42,(uint8)-41,(uint8)-40,(uint8)-39, (uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,
 +(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46, (uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,
 +(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46, (uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,
 +(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46, (uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,
 // state[49 + 2] 0x003b40 Byte 3 of 3 (property)
   6,227,208,233,208,  3,  3,208, 208,229,  0,229,233,219,  0,  6,
@@ -451,10 +451,10 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
 229,208,208,208,217,208,229,229, 229,229,208,217,208,229,229,229,
 // state[64 + 2] 0x003000 Byte 2 of 3 (relative offsets)
 --54,-53,-52,-51,-50,-58,-49,-47, -62,-62,-62,-62,-62,-62,-62,-62,
 --46,-45,-44,-43,-42,-41,-40,-39, -38,-37,-36,-35,-34,-33,-31,-30,
 --29,-28,-27,-26,-25,-24,-23,-22, -21,-20,-19,-18,-17,-15,-14,-13,
 --12,-11,-10, -9, -8, -7, -6, -5,  -4, -3, -2, -1,  1,  2,  3,  4,
 +(uint8)-54,(uint8)-53,(uint8)-52,(uint8)-51,(uint8)-50,(uint8)-58,(uint8)-49,(uint8)-47, (uint8)-62,(uint8)-62,(uint8)-62,(uint8)-62,(uint8)-62,(uint8)-62,(uint8)-62,(uint8)-62,
 +(uint8)-46,(uint8)-45,(uint8)-44,(uint8)-43,(uint8)-42,(uint8)-41,(uint8)-40,(uint8)-39, (uint8)-38,(uint8)-37,(uint8)-36,(uint8)-35,(uint8)-34,(uint8)-33,(uint8)-31,(uint8)-30,
 +(uint8)-29,(uint8)-28,(uint8)-27,(uint8)-26,(uint8)-25,(uint8)-24,(uint8)-23,(uint8)-22, (uint8)-21,(uint8)-20,(uint8)-19,(uint8)-18,(uint8)-17,(uint8)-15,(uint8)-14,(uint8)-13,
 +(uint8)-12,(uint8)-11,(uint8)-10, (uint8)-9, (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5,  (uint8)-4, (uint8)-3, (uint8)-2, (uint8)-1,  1,  2,  3,  4,
 // state[65 + 2] 0x003f00 Byte 3 of 3 (property)
 217,217,208,  3,208,217,208,208,   6,229,208,228,229,229,208,229,
@@ -547,10 +547,10 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
 229,208,229,229,208,229,233,  0, 208,208,229,208,227,229,229,229,
 // state[80 + 2] 0x004000 Byte 2 of 3 (relative offsets)
 --11,-10, -9, -8, -7, -6, -5, -4,  -3, -2, -1,  1,  2,  3,  4,  5,
 +(uint8)-11,(uint8)-10, (uint8)-9, (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4,  (uint8)-3, (uint8)-2, (uint8)-1,  1,  2,  3,  4,  5,
   6,  7,  8,  9, 10, 11, 12, 13,  14, 15, 16, 17, 18, 19, 20, 21,
  22, 23, 24, 25, 26, 27, 28, 29,  30, 31, 32, 33, 34, 35, 36, 37,
 - 38, 39, 40, 41, 42, 43, 44,-78,  45, 46, 47, 48, 49, 50, 51, 52,
 + 38, 39, 40, 41, 42, 43, 44,(uint8)-78,  45, 46, 47, 48, 49, 50, 51, 52,
 // state[81 + 2] 0x0042c0 Byte 3 of 3 (property)
 229,  0,229,229,229,  3,  4,  4, 229,229,229,229,208,229,  0,208,
@@ -931,7 +931,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
   0,142, 98, 28,117,206,212,212, 220, 15,  0,231,199,231,111, 28,
 // state[144 + 2] 0x005000 Byte 2 of 3 (relative offsets)
 --11,-10, -9, -8, -7, -6, -5, -4,  -3, -2, -1,  1,  2,  3,  4,  5,
 +(uint8)-11,(uint8)-10, (uint8)-9, (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4,  (uint8)-3, (uint8)-2, (uint8)-1,  1,  2,  3,  4,  5,
   6,  7,  8,  9, 10, 11, 12, 13,  14, 15, 16, 17, 18, 19, 20, 21,
  22, 23, 24, 25, 26, 27, 28, 29,  30, 31, 32, 33, 34, 35, 36, 37,
  38, 39, 40, 41, 42, 43, 44, 45,  46, 47, 48, 49, 50, 51, 52, 53,
@@ -1315,7 +1315,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
  16, 15,211,118,  0,231, 68,231,   0, 99,161,  0,115,221,144,140,
 // state[208 + 2] 0x006000 Byte 2 of 3 (relative offsets)
 --10, -9, -8, -7, -6, -5, -4, -3,  -2, -1,  1,  2,  3,  4,  5,  6,
 +(uint8)-10, (uint8)-9, (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4, (uint8)-3,  (uint8)-2, (uint8)-1,  1,  2,  3,  4,  5,  6,
   7,  8,  9, 10, 11, 12, 13, 14,  15, 16, 17, 18, 19, 20, 21, 22,
  23, 24, 25, 26, 27, 28, 29, 30,  31, 32, 33, 34, 35, 36, 37, 38,
  39, 40, 41, 42, 43, 44, 45, 46,  47, 48, 49, 50, 51, 52, 53, 54,
@@ -1699,7 +1699,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
 119, 16, 51,  0,  0, 68,136, 72, 144,118, 87,201,191,136, 78,233,
 // state[272 + 2] 0x007000 Byte 2 of 3 (relative offsets)
 - -9, -8, -7, -6, -5, -4, -3, -2,  -1,  1,  2,  3,  4,  5,  6,  7,
 + (uint8)-9, (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4, (uint8)-3, (uint8)-2,  (uint8)-1,  1,  2,  3,  4,  5,  6,  7,
   8,  9, 10, 11, 12, 13, 14, 15,  16, 17, 18, 19, 20, 21, 22, 23,
  24, 25, 26, 27, 28, 29, 30, 31,  32, 33, 34, 35, 36, 37, 38, 39,
  40, 41, 42, 43, 44, 45, 46, 47,  48, 49, 50, 51, 52, 53, 54, 55,
@@ -2083,7 +2083,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
 212,212,  0,126,140,220,220,  0,   0,  0,127,118,106,  0,199,  0,
 // state[336 + 2] 0x008000 Byte 2 of 3 (relative offsets)
 - -8, -7, -6, -5, -4, -3, -2, -1,   1,  2,  3,  4,  5,  6,  7,  8,
 + (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4, (uint8)-3, (uint8)-2, (uint8)-1,   1,  2,  3,  4,  5,  6,  7,  8,
   9, 10, 11, 12, 13, 14, 15, 16,  17, 18, 19, 20, 21, 22, 23, 24,
  25, 26, 27, 28, 29, 30, 31, 32,  33, 34, 35, 36, 37, 38, 39, 40,
  41, 42, 43, 44, 45, 46, 47, 48,  49, 50, 51, 52, 53, 54, 55, 56,
@@ -2467,7 +2467,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
   0,122,  0,231,100,232,  0,  0, 117,  0,206,231,  0,  0,231,  0,
 // state[400 + 2] 0x009000 Byte 2 of 3 (relative offsets)
 - -7, -6, -5, -4, -3, -2, -1,  1,   2,  3,  4,  5,  6,  7,  8,  9,
 + (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4, (uint8)-3, (uint8)-2, (uint8)-1,  1,   2,  3,  4,  5,  6,  7,  8,  9,
  10, 11, 12, 13, 14, 15, 16, 17,  18, 19, 20, 21, 22, 23, 24, 25,
  26, 27, 28, 29, 30, 31, 32, 33,  34, 35, 36, 37, 38, 39, 40, 41,
  42, 43, 44, 45, 46, 47, 48, 49,  50, 51, 52, 53, 54, 55, 56, 57,
@@ -2851,10 +2851,10 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
   0,  0,  0,  0,  0,  0,  0,  0,   0,  0,  0,  0,  0,  0,  0,  0,
 // state[464 + 2] 0x00a000 Byte 2 of 3 (relative offsets)
 - -6, -6, -6, -6, -6, -6, -6, -6,  -6, -6, -6, -6, -6, -6, -6, -6,
 - -6, -6, -6, -6, -6, -6, -6, -6,  -6, -6, -6, -6, -6, -6, -6, -6,
 - -6, -6, -6, -6, -6, -6, -6, -6,  -6, -6, -6, -6, -6, -6, -6, -6,
 - -5, -5, -5, -5, -5, -5, -5, -5,  -5, -5, -5, -5, -5, -5, -5, -5,
 + (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6,  (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6,
 + (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6,  (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6,
 + (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6,  (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6,
 + (uint8)-5, (uint8)-5, (uint8)-5, (uint8)-5, (uint8)-5, (uint8)-5, (uint8)-5, (uint8)-5,  (uint8)-5, (uint8)-5, (uint8)-5, (uint8)-5, (uint8)-5, (uint8)-5, (uint8)-5, (uint8)-5,
 // state[465 + 2] 0x000080 Byte 2 of 2 (property)
   0,  0,  0,  0,  0,  0,  0,  0,   0,  0,  0,  0,  0,  0,  0,  0,
@@ -2947,10 +2947,10 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
 208,208,208,208,  5,  6,208,  2,   0,  6,  6,  5,208,208,208,  6,
 // state[480 + 2] 0x00b000 Byte 2 of 3 (relative offsets)
 --20,-20,-20,-20,-20,-20,-20,-20, -20,-20,-20,-20,-20,-20,-20,-20,
 --20,-20,-20,-20,-20,-20,-20,-20, -20,-20,-20,-20,-20,-20,-20,-20,
 --20,-20,-20,-20,-20,-20,-20,-20, -20,-20,-20,-20,-20,-20,-20,-20,
 --20,-20,-20,-20,-20,-20,-20,-20, -20,-20,-20,-20,-20,-20,-20,-20,
 +(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20, (uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,
 +(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20, (uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,
 +(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20, (uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,
 +(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20, (uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,
 // state[481 + 2] 0x020100 Byte 4 of 4 (property)
   2,  6,  5,  6,  5,229,  5,208, 208,208,208,208,208,208,208,229,
@@ -3043,10 +3043,10 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
 208,208,  5,  5,  5,208,208,  2, 229,  5,  5,  5,  5,  5,  6,208,
 // state[496 + 2] 0x00d000 Byte 2 of 3 (relative offsets)
 --35,-35,-35,-35,-35,-35,-35,-35, -35,-35,-35,-35,-35,-35,-35,-35,
 --35,-35,-35,-35,-35,-35,-35,-35, -35,-35,-35,-35,-35,-35,-34,-33,
 --33,-33,-33,-33,-33,-33,-33,-33, -33,-33,-33,-33,-33,-33,-33,-33,
 --33,-33,-33,-33,-33,-33,-33,-33, -33,-33,-33,-33,-33,-33,-33,-33,
 +(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35, (uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,
 +(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35, (uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-34,(uint8)-33,
 +(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33, (uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,
 +(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33, (uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,
 // state[497 + 2] 0x0204c0 Byte 4 of 4 (property)
   2,  2,  5,  5,  5,  2,208,  2,   5,  5,  6,208,208,  5,  5,  5,
@@ -3139,10 +3139,10 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
 208,208,  5,  5,  5,  5,  6,  6, 208,208,  2,208,208,208,208,208,
 // state[512 + 2] 0x00f000 Byte 2 of 3 (relative offsets)
 --47,-47,-47,-47,-47,-47,-47,-47, -47,-47,-47,-47,-47,-47,-47,-47,
 --47,-47,-47,-47,-47,-47,-47,-47, -47,-47,-47,-47,-47,-47,-47,-47,
 --47,-47,-47,-47,-46,-45,-44,-43, -42,-41,-44,-40,-47,-47,-47,-47,
 --47,-47,-47,-47,-47,-47,-47,-47, -47,-47,-47,-47,-47,-39,-38,-37,
 +(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47, (uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,
 +(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47, (uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,
 +(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-46,(uint8)-45,(uint8)-44,(uint8)-43, (uint8)-42,(uint8)-41,(uint8)-44,(uint8)-40,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,
 +(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47, (uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-39,(uint8)-38,(uint8)-37,
 // state[513 + 2] 0x020880 Byte 4 of 4 (property)
   5,  5,  5,  6,208,208,208,208, 208,208,  5,  5,  6,  6,208,208,
@@ -3235,10 +3235,10 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
   5,  6,208,218,208,208,208,218, 208,  6,227,229,  6,  6,  6,208,
 // state[528 + 2] 0x020000 Byte 3 of 4 (relative offsets)
 --52,-51,-50,-49,-47,-46,-45,-44, -43,-42,-41,-40,-39,-38,-37,-36,
 --35,-34,-33,-31,-30,-29,-28,-27, -26,-25,-24,-23,-22,-21,-20,-19,
 --18,-17,-15,-14,-13,-12,-11,-10,  -9, -8, -7, -6, -5, -4, -3, -2,
 - -1,  1,  2,  3,  4,  5,  6,  7,   8,  9, 10, 11, 12, 13, 14, 15,
 +(uint8)-52,(uint8)-51,(uint8)-50,(uint8)-49,(uint8)-47,(uint8)-46,(uint8)-45,(uint8)-44, (uint8)-43,(uint8)-42,(uint8)-41,(uint8)-40,(uint8)-39,(uint8)-38,(uint8)-37,(uint8)-36,
 +(uint8)-35,(uint8)-34,(uint8)-33,(uint8)-31,(uint8)-30,(uint8)-29,(uint8)-28,(uint8)-27, (uint8)-26,(uint8)-25,(uint8)-24,(uint8)-23,(uint8)-22,(uint8)-21,(uint8)-20,(uint8)-19,
 +(uint8)-18,(uint8)-17,(uint8)-15,(uint8)-14,(uint8)-13,(uint8)-12,(uint8)-11,(uint8)-10,  (uint8)-9, (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4, (uint8)-3, (uint8)-2,
 + (uint8)-1,  1,  2,  3,  4,  5,  6,  7,   8,  9, 10, 11, 12, 13, 14, 15,
 // state[529 + 2] 0x020c40 Byte 4 of 4 (property)
 227,  5,  5,  5,  2,  2,  2,  2, 213,  2,  2,  2,  2,  2,208,  6,
@@ -3427,7 +3427,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
 208,208,208,208,208,208,208,208, 208,  6,  6,  6,  6,  2,  5,  5,
 // state[560 + 2] 0x021000 Byte 3 of 4 (relative offsets)
 --16,-15,-14,-13,-12,-11,-10, -9,  -8, -7, -6, -5, -4, -3, -2, -1,
 +(uint8)-16,(uint8)-15,(uint8)-14,(uint8)-13,(uint8)-12,(uint8)-11,(uint8)-10, (uint8)-9,  (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4, (uint8)-3, (uint8)-2, (uint8)-1,
   1,  2,  3,  4,  5,  6,  7,  8,   9, 10, 11, 12, 13, 14, 15, 16,
  17, 18, 19, 20, 21, 22, 23, 24,  25, 26, 27, 28, 29, 30, 31, 32,
  33, 34, 35, 36, 37, 38, 39, 40,  41, 42, 43, 44, 45, 46, 47, 48,
@@ -3811,7 +3811,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
   5,  5,  5,  6,  6,  6,  5,208, 208,229,208,208,  5,  5,  5,  5,
 // state[624 + 2] 0x022000 Byte 3 of 4 (relative offsets)
 --15,-14,-13,-12,-11,-10, -9, -8,  -7, -6, -5, -4, -3, -2, -1,  1,
 +(uint8)-15,(uint8)-14,(uint8)-13,(uint8)-12,(uint8)-11,(uint8)-10, (uint8)-9, (uint8)-8,  (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4, (uint8)-3, (uint8)-2, (uint8)-1,  1,
   2,  3,  4,  5,  6,  7,  8,  9,  10, 11, 12, 13, 14, 15, 16, 17,
  18, 19, 20, 21, 22, 23, 24, 25,  26, 27, 28, 29, 30, 31, 32, 33,
  34, 35, 36, 37, 38, 39, 40, 41,  42, 43, 44, 45, 46, 47, 48, 49,
@@ -4195,7 +4195,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
   6,  6,  4,  5,208,208,208,208, 208,208,229,  6,  5,  6,  6,  6,
 // state[688 + 2] 0x023000 Byte 3 of 4 (relative offsets)
 --14,-13,-12,-11,-10, -9, -8, -7,  -6, -5, -4, -3, -2, -1,  1,  2,
 +(uint8)-14,(uint8)-13,(uint8)-12,(uint8)-11,(uint8)-10, (uint8)-9, (uint8)-8, (uint8)-7,  (uint8)-6, (uint8)-5, (uint8)-4, (uint8)-3, (uint8)-2, (uint8)-1,  1,  2,
   3,  4,  5,  6,  7,  8,  9, 10,  11, 12, 13, 14, 15, 16, 17, 18,
  19, 20, 21, 22, 23, 24, 25, 26,  27, 28, 29, 30, 31, 32, 33, 34,
  35, 36, 37, 38, 39, 40, 41, 42,  43, 44, 45, 46, 47, 48, 49, 50,
@@ -4579,7 +4579,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
   5,  5,  5,  5,  5,  5,  5,  6, 208,208,208,208,208,208,  6,  6,
 // state[752 + 2] 0x024000 Byte 3 of 4 (relative offsets)
 --13,-12,-11,-10, -9, -8, -7, -6,  -5, -4, -3, -2, -1,  1,  2,  3,
 +(uint8)-13,(uint8)-12,(uint8)-11,(uint8)-10, (uint8)-9, (uint8)-8, (uint8)-7, (uint8)-6,  (uint8)-5, (uint8)-4, (uint8)-3, (uint8)-2, (uint8)-1,  1,  2,  3,
   4,  5,  6,  7,  8,  9, 10, 11,  12, 13, 14, 15, 16, 17, 18, 19,
  20, 21, 22, 23, 24, 25, 26, 27,  28, 29, 30, 31, 32, 33, 34, 35,
  36, 37, 38, 39, 40, 41, 42, 43,  44, 45, 46, 47, 48, 49, 50, 51,
@@ -4963,7 +4963,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
 229,  6,  2,  2,  2,  2,  2,  2,   2,  2,  2,  5,  2,  2,  6,229,
 // state[816 + 2] 0x025000 Byte 3 of 4 (relative offsets)
 --12,-11,-10, -9, -8, -7, -6, -5,  -4, -3, -2, -1,  1,  2,  3,  4,
 +(uint8)-12,(uint8)-11,(uint8)-10, (uint8)-9, (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5,  (uint8)-4, (uint8)-3, (uint8)-2, (uint8)-1,  1,  2,  3,  4,
   5,  6,  7,  8,  9, 10, 11, 12,  13, 14, 15, 16, 17, 18, 19, 20,
  21, 22, 23, 24, 25, 26, 27, 28,  29, 30, 31, 32, 33, 34, 35, 36,
  37, 38, 39, 40, 41, 42, 43, 44,  45, 46, 47, 48, 49, 50, 51, 52,
@@ -5347,7 +5347,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
   6,  6,  6,  5,  5,  5,  5,  6,   6,  6,  3,  6,229,208,208,229,
 // state[880 + 2] 0x026000 Byte 3 of 4 (relative offsets)
 --11,-10, -9, -8, -7, -6, -5, -4,  -3, -2, -1,  1,  2,  3,  4,  5,
 +(uint8)-11,(uint8)-10, (uint8)-9, (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4,  (uint8)-3, (uint8)-2, (uint8)-1,  1,  2,  3,  4,  5,
   6,  7,  8,  9, 10, 11, 12, 13,  14, 15, 16, 17, 18, 19, 20, 21,
  22, 23, 24, 25, 26, 27, 28, 29,  30, 31, 32, 33, 34, 35, 36, 37,
  38, 39, 40, 41, 42, 43, 44, 45,  46, 47, 48, 49, 50, 51, 52, 53,
@@ -5731,7 +5731,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
 208,  6,  6,208,208,208,208,208,   6,  6,  6,216,  5,  5,  5,  5,
 // state[944 + 2] 0x027000 Byte 3 of 4 (relative offsets)
 --10, -9, -8, -7, -6, -5, -4, -3,  -2, -1,  1,  2,  3,  4,  5,  6,
 +(uint8)-10, (uint8)-9, (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4, (uint8)-3,  (uint8)-2, (uint8)-1,  1,  2,  3,  4,  5,  6,
   7,  8,  9, 10, 11, 12, 13, 14,  15, 16, 17, 18, 19, 20, 21, 22,
  23, 24, 25, 26, 27, 28, 29, 30,  31, 32, 33, 34, 35, 36, 37, 38,
  39, 40, 41, 42, 43, 44, 45, 46,  47, 48, 49, 50, 51, 52, 53, 54,
@@ -6115,7 +6115,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
   5,  5,  5,  6,208,208,  6,  6, 208,229,208,208,208,  5,  5,  5,
 // state[1008 + 2] 0x028000 Byte 3 of 4 (relative offsets)
 - -9, -8, -7, -6, -5, -4, -3, -2,  -1,  1,  2,  3,  4,  5,  6,  7,
 + (uint8)-9, (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4, (uint8)-3, (uint8)-2,  (uint8)-1,  1,  2,  3,  4,  5,  6,  7,
   8,  9, 10, 11, 12, 13, 14, 15,  16, 17, 18, 19, 20, 21, 22, 23,
  24, 25, 26, 27, 28, 29, 30, 31,  32, 33, 34, 35, 36, 37, 38, 39,
  40, 41, 42, 43, 44, 45, 46, 47,  48, 49, 50, 51, 52, 53, 54, 55,
@@ -6499,7 +6499,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
 208,208,  5,  5,  6,208,208,  5, 208,208,208,  6,208,  6,208,208,
 // state[1072 + 2] 0x029000 Byte 3 of 4 (relative offsets)
 - -8, -7, -6, -5, -4, -3, -2, -1,   1,  2,  3,  4,  5,  6,  7,  8,
 + (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4, (uint8)-3, (uint8)-2, (uint8)-1,   1,  2,  3,  4,  5,  6,  7,  8,
   9, 10, 11, 12, 13, 14, 15, 16,  17, 18, 19, 20, 21, 22, 23, 24,
  25, 26, 27, 28, 29, 30, 31, 32,  33, 34, 35, 36, 37, 38, 39, 40,
  41, 42, 43, 44, 45, 46, 47, 48,  49, 50, 51, 52, 53, 54, 55, 56,
@@ -6883,7 +6883,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
 229,229,229,229,208,208,208,229, 208,208,208,229,  0,229,208,208,
 // state[1136 + 2] 0x02a000 Byte 3 of 4 (relative offsets)
 - -7, -6, -5, -4, -3, -2, -1,  1,   2,  3,  4,  5,  6,  7,  8,  9,
 + (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4, (uint8)-3, (uint8)-2, (uint8)-1,  1,   2,  3,  4,  5,  6,  7,  8,  9,
  10, 11, 12, 13, 14, 15, 16, 17,  18, 19, 20, 21, 22, 22, 22, 22,
  22, 22, 22, 22, 22, 22, 22, 22,  22, 22, 22, 22, 22, 22, 22, 22,
  22, 22, 22, 22, 22, 22, 22, 22,  22, 22, 22, 22, 22, 22, 22, 22,
@@ -7075,10 +7075,10 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__
   5,  5,  5,  5,  5,  5,  5,  5,   5,  5,  5,  5,  5,  5,  5,  5,
 // state[1168 + 2] 0x02f000 Byte 3 of 4 (relative offsets)
 - -9, -9, -9, -9, -9, -9, -9, -9,  -9, -9, -9, -9, -9, -9, -9, -9,
 - -9, -9, -9, -9, -9, -9, -9, -9,  -9, -9, -9, -9, -9, -9, -9, -9,
 - -8, -7, -6, -5, -4, -3, -2, -1,   1, -9, -9, -9, -9, -9, -9, -9,
 - -9, -9, -9, -9, -9, -9, -9, -9,  -9, -9, -9, -9, -9, -9, -9, -9,
 + (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9,  (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9,
 + (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9,  (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9,
 + (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4, (uint8)-3, (uint8)-2, (uint8)-1,   1, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9,
 + (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9,  (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9,
 // state[1169 + 2] 0x02fa00 Byte 4 of 4 (property)
 217,  5,  5,  5,  5,  5,  5,  5,   5,  5,  5,  5,  5,217,  5,  5,
 diff -up chromium-55.0.2883.75/third_party/webgl/src/specs/latest/2.0/webgl2.idl.gcc5 chromium-55.0.2883.75/third_party/webgl/src/specs/latest/2.0/webgl2.idl
 --- chromium-55.0.2883.75/third_party/webgl/src/specs/latest/2.0/webgl2.idl.gcc5	2016-12-01 18:03:16.000000000 -0500
 +++ chromium-55.0.2883.75/third_party/webgl/src/specs/latest/2.0/webgl2.idl	2016-12-12 15:24:01.209747655 -0500
@@ -264,7 +264,7 @@ interface WebGL2RenderingContextBase
   const GLenum UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES          = 0x8A43;
   const GLenum UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER     = 0x8A44;
   const GLenum UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER   = 0x8A46;
 -  const GLenum INVALID_INDEX                                 = 0xFFFFFFFF;
 +  const GLenum INVALID_INDEX                                 = 256;
   const GLenum MAX_VERTEX_OUTPUT_COMPONENTS                  = 0x9122;
   const GLenum MAX_FRAGMENT_INPUT_COMPONENTS                 = 0x9125;
   const GLenum MAX_SERVER_WAIT_TIMEOUT                       = 0x9111;
 diff -up chromium-55.0.2883.75/third_party/WebKit/Source/core/dom/NodeFilter.h.gcc5 chromium-55.0.2883.75/third_party/WebKit/Source/core/dom/NodeFilter.h
 --- chromium-55.0.2883.75/third_party/WebKit/Source/core/dom/NodeFilter.h.gcc5	2016-12-12 15:24:01.210747650 -0500
 +++ chromium-55.0.2883.75/third_party/WebKit/Source/core/dom/NodeFilter.h	2016-12-12 15:26:23.176045106 -0500
@@ -49,7 +49,7 @@ class NodeFilter final : public GarbageC
      * to the value of NodeType for the equivalent node type.
      */
   enum {
 -    kShowAll = 0xFFFFFFFF,
 +    kShowAll = 256 /* 0xFFFFFFFF */,
     kShowElement = 0x00000001,
     kShowAttribute = 0x00000002,
     kShowText = 0x00000004,
 diff -up chromium-55.0.2883.75/third_party/WebKit/Source/core/dom/NodeFilter.idl.gcc5 chromium-55.0.2883.75/third_party/WebKit/Source/core/dom/NodeFilter.idl
 --- chromium-55.0.2883.75/third_party/WebKit/Source/core/dom/NodeFilter.idl.gcc5	2016-12-01 18:02:30.000000000 -0500
 +++ chromium-55.0.2883.75/third_party/WebKit/Source/core/dom/NodeFilter.idl	2016-12-12 15:24:01.211747645 -0500
@@ -30,7 +30,7 @@
     const unsigned short FILTER_SKIP = 3;
     // Constants for whatToShow
 -    const unsigned long SHOW_ALL = 0xFFFFFFFF;
 +    const unsigned long SHOW_ALL = 256; // 0xFFFFFFFF
     const unsigned long SHOW_ELEMENT = 0x1;
     const unsigned long SHOW_ATTRIBUTE = 0x2; // historical
     const unsigned long SHOW_TEXT = 0x4;
 diff -up chromium-55.0.2883.75/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.idl.gcc5 chromium-55.0.2883.75/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.idl
 --- chromium-55.0.2883.75/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.idl.gcc5	2016-12-01 18:02:32.000000000 -0500
 +++ chromium-55.0.2883.75/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.idl	2016-12-12 15:24:01.214747631 -0500
@@ -239,7 +239,7 @@ typedef long long      GLint64;
     const GLenum UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES          = 0x8A43;
     const GLenum UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER     = 0x8A44;
     const GLenum UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER   = 0x8A46;
 -    const GLenum INVALID_INDEX                                 = 0xFFFFFFFF;
 +    const GLenum INVALID_INDEX                                 = 256;
     const GLenum MAX_VERTEX_OUTPUT_COMPONENTS                  = 0x9122;
     const GLenum MAX_FRAGMENT_INPUT_COMPONENTS                 = 0x9125;
     const GLenum MAX_SERVER_WAIT_TIMEOUT                       = 0x9111;
@@ -282,7 +282,7 @@ typedef long long      GLint64;
     const GLenum MAX_ELEMENT_INDEX                             = 0x8D6B;
     const GLenum NUM_SAMPLE_COUNTS                             = 0x9380;
     const GLenum TEXTURE_IMMUTABLE_LEVELS                      = 0x82DF;
 -    const GLint TIMEOUT_IGNORED                                = -1;
 +    const GLint TIMEOUT_IGNORED                                = 256;
     /* WebGL-specific enums */
     const GLenum MAX_CLIENT_WAIT_TIMEOUT_WEBGL                 = 0x9247;
--- a/chromium-55.0.2883.75-more-codec-aliases.patch
+++ b/chromium-55.0.2883.75-more-codec-aliases.patch
@ -1,15 +0,0 @@
 diff -up chromium-55.0.2883.75/third_party/WebKit/Source/wtf/text/TextCodecICU.cpp.morealiases chromium-55.0.2883.75/third_party/WebKit/Source/wtf/text/TextCodecICU.cpp
 --- chromium-55.0.2883.75/third_party/WebKit/Source/wtf/text/TextCodecICU.cpp.morealiases	2016-12-12 15:53:06.545149310 -0500
 +++ chromium-55.0.2883.75/third_party/WebKit/Source/wtf/text/TextCodecICU.cpp	2016-12-12 15:55:25.808468122 -0500
@@ -213,7 +213,11 @@ void TextCodecICU::registerEncodingNames
   registrar("iso_8859-6", "ISO-8859-6");
   registrar("iso_8859-7", "ISO-8859-7");
   registrar("iso_8859-8", "ISO-8859-8");
 +  registrar("iso_8859-8-I", "ISO-8859-8-I");
   registrar("iso_8859-9", "windows-1254");
 +  registrar("iso_8859-10", "ISO-8859-10");
 +  registrar("iso_8859-13", "ISO-8859-13");
 +  registrar("iso_8859-14", "ISO-8859-14");
   registrar("iso_8859-15", "ISO-8859-15");
   registrar("koi8_r", "KOI8-R");
   registrar("x-cp1253", "windows-1253");
--- a/chromium-55.0.2883.75-use_system_harfbuzz.patch
+++ b/chromium-55.0.2883.75-use_system_harfbuzz.patch
@ -1,12 +0,0 @@
 diff -up chromium-55.0.2883.75/ui/gfx/render_text_harfbuzz.h.use_system_harfbuzz chromium-55.0.2883.75/ui/gfx/render_text_harfbuzz.h
 --- chromium-55.0.2883.75/ui/gfx/render_text_harfbuzz.h.use_system_harfbuzz	2016-12-12 16:09:03.873466669 -0500
 +++ chromium-55.0.2883.75/ui/gfx/render_text_harfbuzz.h	2016-12-12 16:09:57.507204326 -0500
@@ -12,7 +12,7 @@
 #include "base/macros.h"
 #include "base/memory/scoped_vector.h"
 -#include "third_party/harfbuzz-ng/src/hb.h"
 +#include <harfbuzz/hb.h>
 #include "third_party/icu/source/common/unicode/ubidi.h"
 #include "third_party/icu/source/common/unicode/uscript.h"
 #include "ui/gfx/render_text.h"
--- a/chromium-55.0.2883.87-rvalue-fix.patch
+++ b/chromium-55.0.2883.87-rvalue-fix.patch
@ -1,17 +0,0 @@
 diff -up chromium-55.0.2883.87/buildtools/third_party/libc++/trunk/test/std/input.output/iostream.format/input.streams/istream.rvalue chromium-55.0.2883.87/buildtools/third_party/libc++/trunk/test/std/input.output/iostream.format/input.streams/istream
 Only in chromium-55.0.2883.87/buildtools/third_party/libc++/trunk/test/std/input.output/iostream.format/input.streams/istream: istream.assign
 Only in chromium-55.0.2883.87/buildtools/third_party/libc++/trunk/test/std/input.output/iostream.format/input.streams/istream: istream.cons
 Only in chromium-55.0.2883.87/buildtools/third_party/libc++/trunk/test/std/input.output/iostream.format/input.streams/istream: istream_sentry
 diff -up chromium-55.0.2883.87/buildtools/third_party/libc++/trunk/test/std/input.output/iostream.format/output.streams/ostream.rvalue chromium-55.0.2883.87/buildtools/third_party/libc++/trunk/test/std/input.output/iostream.format/output.streams/ostream
 diff -up chromium-55.0.2883.87/remoting/host/fake_desktop_environment.cc.rvalue chromium-55.0.2883.87/remoting/host/fake_desktop_environment.cc
 --- chromium-55.0.2883.87/remoting/host/fake_desktop_environment.cc.rvalue	2016-12-14 11:19:16.150103994 -0500
 +++ chromium-55.0.2883.87/remoting/host/fake_desktop_environment.cc	2016-12-14 11:19:44.003563271 -0500
@@ -84,7 +84,7 @@ FakeDesktopEnvironment::CreateVideoCaptu
   std::unique_ptr<DesktopCapturerProxy> result(
       new DesktopCapturerProxy(capture_thread_));
   result->set_capturer(std::move(fake_capturer));
 -  return result;
 +  return std::move(result);
 }
 std::unique_ptr<webrtc::MouseCursorMonitor>
--- a/chromium-56.0.2924.87-gcc7.patch
+++ b/chromium-56.0.2924.87-gcc7.patch
@ -1,82 +0,0 @@
 diff -up chromium-56.0.2924.87/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h.gcc7 chromium-56.0.2924.87/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h
 --- chromium-56.0.2924.87/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h.gcc7	2017-03-01 11:29:32.681142930 -0500
 +++ chromium-56.0.2924.87/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h	2017-03-01 11:30:19.396536499 -0500
@@ -5,6 +5,7 @@
 #include "platform/PlatformExport.h"
 #include "wtf/ThreadSpecific.h"
 +#include <functional>
 #include <memory>
 namespace gpu {
 diff -up chromium-56.0.2924.87/v8/src/objects-body-descriptors.h.gcc7 chromium-56.0.2924.87/v8/src/objects-body-descriptors.h
 --- chromium-56.0.2924.87/v8/src/objects-body-descriptors.h.gcc7	2017-02-28 16:00:27.313172210 -0500
 +++ chromium-56.0.2924.87/v8/src/objects-body-descriptors.h	2017-02-28 16:00:46.016804708 -0500
@@ -99,7 +99,7 @@ class FixedBodyDescriptor final : public
   template <typename StaticVisitor>
   static inline void IterateBody(HeapObject* obj, int object_size) {
 -    IterateBody(obj);
 +    IterateBody<StaticVisitor>(obj);
   }
 };
 diff -up chromium-56.0.2924.87/v8/src/objects.h.gcc7 chromium-56.0.2924.87/v8/src/objects.h
 --- chromium-56.0.2924.87/v8/src/objects.h.gcc7	2017-02-28 15:58:27.368527968 -0500
 +++ chromium-56.0.2924.87/v8/src/objects.h	2017-02-28 15:59:25.868379455 -0500
@@ -3531,22 +3531,10 @@ class HashTable : public HashTableBase {
  public:
   typedef Shape ShapeT;
 -  // Wrapper methods
 -  inline uint32_t Hash(Key key) {
 -    if (Shape::UsesSeed) {
 -      return Shape::SeededHash(key, GetHeap()->HashSeed());
 -    } else {
 -      return Shape::Hash(key);
 -    }
 -  }
 -
 -  inline uint32_t HashForObject(Key key, Object* object) {
 -    if (Shape::UsesSeed) {
 -      return Shape::SeededHashForObject(key, GetHeap()->HashSeed(), object);
 -    } else {
 -      return Shape::HashForObject(key, object);
 -    }
 -  }
 +  // Wrapper methods.  Defined in src/objects-inl.h
 +  // to break a cycle with src/heap/heap.h.
 +  inline uint32_t Hash(Key key);
 +  inline uint32_t HashForObject(Key key, Object* object);
   // Returns a new HashTable object.
   MUST_USE_RESULT static Handle<Derived> New(
 diff -up chromium-56.0.2924.87/v8/src/objects-inl.h.gcc7 chromium-56.0.2924.87/v8/src/objects-inl.h
 --- chromium-56.0.2924.87/v8/src/objects-inl.h.gcc7	2017-02-28 15:59:44.293016928 -0500
 +++ chromium-56.0.2924.87/v8/src/objects-inl.h	2017-02-28 16:00:18.187351116 -0500
@@ -39,6 +39,25 @@
 namespace v8 {
 namespace internal {
 +template <typename Derived, typename Shape, typename Key>
 +uint32_t HashTable<Derived, Shape, Key>::Hash(Key key) {
 +  if (Shape::UsesSeed) {
 +    return Shape::SeededHash(key, GetHeap()->HashSeed());
 +  } else {
 +    return Shape::Hash(key);
 +  }
 +}
 +
 +template <typename Derived, typename Shape, typename Key>
 +uint32_t HashTable<Derived, Shape, Key>::HashForObject(Key key,
 +                                                       Object* object) {
 +  if (Shape::UsesSeed) {
 +    return Shape::SeededHashForObject(key, GetHeap()->HashSeed(), object);
 +  } else {
 +    return Shape::HashForObject(key, object);
 +  }
 +}
 +
 PropertyDetails::PropertyDetails(Smi* smi) {
   value_ = smi->value();
 }
--- a/chromium-58.0.3029.81-enable-mp3.patch
+++ b/chromium-58.0.3029.81-enable-mp3.patch
@ -1,144 +0,0 @@
 diff -up chromium-58.0.3029.81/media/base/mime_util_internal.cc.mp3 chromium-58.0.3029.81/media/base/mime_util_internal.cc
 --- chromium-58.0.3029.81/media/base/mime_util_internal.cc.mp3	2017-04-21 14:46:15.817743487 -0400
 +++ chromium-58.0.3029.81/media/base/mime_util_internal.cc	2017-04-21 14:52:58.544150880 -0400
@@ -244,10 +244,10 @@ void MimeUtil::AddSupportedMediaFormats(
   CodecSet webm_codecs(webm_audio_codecs);
   webm_codecs.insert(webm_video_codecs.begin(), webm_video_codecs.end());
 -#if BUILDFLAG(USE_PROPRIETARY_CODECS)
   CodecSet mp3_codecs;
   mp3_codecs.insert(MP3);
 +#if BUILDFLAG(USE_PROPRIETARY_CODECS)
   CodecSet aac;
   aac.insert(MPEG2_AAC);
   aac.insert(MPEG4_AAC);
@@ -291,10 +291,10 @@ void MimeUtil::AddSupportedMediaFormats(
   AddContainerWithCodecs("application/ogg", ogg_codecs, false);
   AddContainerWithCodecs("audio/flac", implicit_codec, false);
 -#if BUILDFLAG(USE_PROPRIETARY_CODECS)
   AddContainerWithCodecs("audio/mpeg", mp3_codecs, true);  // Allow "mp3".
   AddContainerWithCodecs("audio/mp3", implicit_codec, true);
   AddContainerWithCodecs("audio/x-mp3", implicit_codec, true);
 +#if BUILDFLAG(USE_PROPRIETARY_CODECS)
   AddContainerWithCodecs("audio/aac", implicit_codec, true);  // AAC / ADTS.
   AddContainerWithCodecs("audio/mp4", mp4_audio_codecs, true);
   DCHECK(!mp4_video_codecs.empty());
@@ -715,7 +715,6 @@ bool MimeUtil::IsCodecProprietary(Codec
     case INVALID_CODEC:
     case AC3:
     case EAC3:
 -    case MP3:
     case MPEG2_AAC:
     case MPEG4_AAC:
     case H264:
@@ -723,6 +722,7 @@ bool MimeUtil::IsCodecProprietary(Codec
     case DOLBY_VISION:
       return true;
 +    case MP3:
     case PCM:
     case VORBIS:
     case OPUS:
 diff -up chromium-58.0.3029.81/third_party/ffmpeg/ffmpeg_generated.gni.mp3 chromium-58.0.3029.81/third_party/ffmpeg/ffmpeg_generated.gni
 --- chromium-58.0.3029.81/third_party/ffmpeg/ffmpeg_generated.gni.mp3	2017-04-21 11:49:42.000000000 -0400
 +++ chromium-58.0.3029.81/third_party/ffmpeg/ffmpeg_generated.gni	2017-04-21 14:46:15.816743506 -0400
@@ -176,19 +176,12 @@ if ((is_linux && current_cpu == "arm" &&
   ]
 }
 -if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_win && ffmpeg_branding == "Chrome")) {
 +if ((current_cpu == "x64") || (is_android && current_cpu == "arm" && arm_use_neon) || (is_android && current_cpu == "arm64") || (is_android && current_cpu == "mips64el") || (is_android && current_cpu == "mipsel") || (is_android && current_cpu == "x86") || (is_linux && current_cpu == "arm" && arm_use_neon) || (is_linux && current_cpu == "arm" && arm_use_neon) || (is_linux && current_cpu == "arm") || (is_linux && current_cpu == "arm64") || (is_linux && current_cpu == "mipsel") || (is_linux && current_cpu == "x64") || (is_linux && current_cpu == "x86") || (is_win))
 +{
   ffmpeg_c_sources += [
 -    "libavcodec/aac_ac3_parser.c",
 -    "libavcodec/aac_parser.c",
 -    "libavcodec/aacadtsdec.c",
 -    "libavcodec/aacps_float.c",
 -    "libavcodec/aacpsdsp_float.c",
 -    "libavcodec/aacsbr.c",
 -    "libavcodec/aactab.c",
 -    "libavcodec/ac3tab.c",
 -    "libavcodec/autorename_libavcodec_aacdec.c",
     "libavcodec/autorename_libavcodec_mpegaudiodsp.c",
     "libavcodec/autorename_libavcodec_sbrdsp.c",
 +    "libavcodec/ac3tab.c",
     "libavcodec/cbrt_data.c",
     "libavcodec/dct.c",
     "libavcodec/dct32_fixed.c",
@@ -204,7 +197,6 @@ if ((current_cpu == "x64" && ffmpeg_bran
     "libavcodec/mpegaudiodsp_float.c",
     "libavcodec/sinewin.c",
     "libavcodec/sinewin_fixed.c",
 -    "libavformat/aacdec.c",
     "libavformat/apetag.c",
     "libavformat/img2.c",
     "libavformat/mov.c",
@@ -213,6 +205,21 @@ if ((current_cpu == "x64" && ffmpeg_bran
   ]
 }
 +if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_win && ffmpeg_branding == "Chrome")) 
 +{
 +  ffmpeg_c_sources += [
 +    "libavcodec/aac_ac3_parser.c",
 +    "libavcodec/aac_parser.c",
 +    "libavcodec/aacadtsdec.c",
 +    "libavcodec/aacps_float.c",
 +    "libavcodec/aacpsdsp_float.c",
 +    "libavcodec/aacsbr.c",
 +    "libavcodec/aactab.c",
 +    "libavcodec/autorename_libavcodec_aacdec.c",
 +    "libavformat/aacdec.c",
 +  ]
 +}
 +
 if ((is_android && current_cpu == "x64") || (is_android && current_cpu == "x86") || (is_linux && current_cpu == "x64") || (is_linux && current_cpu == "x86") || (is_mac) || (is_win)) {
   ffmpeg_c_sources += [
     "libavcodec/x86/autorename_libavcodec_x86_vorbisdsp_init.c",
@@ -312,21 +319,31 @@ if ((is_linux && current_cpu == "x64") |
 if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_win && ffmpeg_branding == "Chrome")) {
   ffmpeg_c_sources += [
     "libavcodec/x86/aacpsdsp_init.c",
 +   ]
 +}
 +
 +if ((current_cpu == "x64") || (is_android && current_cpu == "x86") || (is_linux && current_cpu == "x64") || (is_linux && current_cpu == "x86") || (is_win)) {
 +  ffmpeg_c_sources += [
     "libavcodec/x86/dct_init.c",
     "libavcodec/x86/mpegaudiodsp.c",
     "libavcodec/x86/sbrdsp_init.c",
   ]
 }
 -if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_win && ffmpeg_branding == "Chrome")) {
 +if ((current_cpu == "x64") || (is_android && current_cpu == "x86") || (is_linux && current_cpu == "x64") || (is_linux && current_cpu == "x86") || (is_win)) {
   ffmpeg_yasm_sources += [
 -    "libavcodec/x86/aacpsdsp.asm",
     "libavcodec/x86/dct32.asm",
     "libavcodec/x86/imdct36.asm",
     "libavcodec/x86/sbrdsp.asm",
   ]
 }
 +if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_win && ffmpeg_branding == "Chrome")) {
 +  ffmpeg_yasm_sources += [
 +    "libavcodec/x86/aacpsdsp.asm",
 +  ]
 +}
 +
 if ((is_linux && current_cpu == "arm" && arm_use_neon) || (is_linux && current_cpu == "arm")) {
   ffmpeg_c_sources += [
     "libavcodec/arm/h264pred_init_arm.c",
 diff -up chromium-58.0.3029.81/third_party/ffmpeg/libavcodec/sbrdsp.c.mp3 chromium-58.0.3029.81/third_party/ffmpeg/libavcodec/sbrdsp.c
 --- chromium-58.0.3029.81/third_party/ffmpeg/libavcodec/sbrdsp.c.mp3	2017-04-21 11:49:43.000000000 -0400
 +++ chromium-58.0.3029.81/third_party/ffmpeg/libavcodec/sbrdsp.c	2017-04-21 14:46:15.817743487 -0400
@@ -23,6 +23,7 @@
 #define USE_FIXED 0
 #include "aac.h"
 +#include "aacsbrdata.h"
 #include "config.h"
 #include "libavutil/attributes.h"
 #include "libavutil/intfloat.h"
--- a/chromium-58.0.3029.81-ffmpeg-stdatomic.patch
+++ b/chromium-58.0.3029.81-ffmpeg-stdatomic.patch
@ -1,14 +0,0 @@
 diff -up chromium-57.0.2987.21/third_party/ffmpeg/libavutil/cpu.c.ffmpeg_stdatomic chromium-57.0.2987.21/third_party/ffmpeg/libavutil/cpu.c
 --- chromium-57.0.2987.21/third_party/ffmpeg/libavutil/cpu.c.ffmpeg_stdatomic	2017-02-03 07:07:36.000000000 +0100
 +++ chromium-57.0.2987.21/third_party/ffmpeg/libavutil/cpu.c	2017-02-09 11:54:34.083000442 +0100
@@ -20,6 +20,10 @@
 // Chromium: Windows doesn't provide stdatomic.h, so use the compat version.
 #if defined(_MSC_VER)
 #include <compat/atomics/win32/stdatomic.h>
 +// GCC 4.8 didn't have stdatomic, but was advertising it.
 +// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58016
 +#elif !defined(__clang__) && defined(__GNUC__) && (__GNUC__ == 4 || (__GNUC__ == 4 && (__GNUC_MINOR__ == 8)))
 +#include <compat/atomics/gcc/stdatomic.h>
 #else
 #include <stdatomic.h>
 #endif
--- a/chromium-58.0.3029.81-fix-gn.patch
+++ b/chromium-58.0.3029.81-fix-gn.patch
@ -1,11 +0,0 @@
 diff -up chromium-58.0.3029.81/tools/gn/bootstrap/bootstrap.py.fixgn chromium-58.0.3029.81/tools/gn/bootstrap/bootstrap.py
 --- chromium-58.0.3029.81/tools/gn/bootstrap/bootstrap.py.fixgn	2017-04-21 15:39:59.704874747 -0400
 +++ chromium-58.0.3029.81/tools/gn/bootstrap/bootstrap.py	2017-04-21 15:43:06.778809475 -0400
@@ -384,6 +384,7 @@ def write_gn_ninja(path, root_gen_dir, o
       'base/base_paths.cc',
       'base/base_switches.cc',
       'base/build_time.cc',
 +      'base/callback_helpers.cc',
       'base/callback_internal.cc',
       'base/command_line.cc',
       'base/debug/activity_tracker.cc',
--- a/chromium-58.0.3029.81-use_system_harfbuzz.patch
+++ b/chromium-58.0.3029.81-use_system_harfbuzz.patch
@ -1,12 +0,0 @@
 diff -up chromium-58.0.3029.81/ui/gfx/render_text_harfbuzz.h.use_system_harfbuzz chromium-58.0.3029.81/ui/gfx/render_text_harfbuzz.h
 --- chromium-58.0.3029.81/ui/gfx/render_text_harfbuzz.h.use_system_harfbuzz	2017-04-21 14:58:23.182030756 -0400
 +++ chromium-58.0.3029.81/ui/gfx/render_text_harfbuzz.h	2017-04-21 15:06:22.681991351 -0400
@@ -12,7 +12,7 @@
 #include <vector>
 #include "base/macros.h"
 -#include "third_party/harfbuzz-ng/src/hb.h"
 +#include <harfbuzz/hb.h>
 #include "third_party/icu/source/common/unicode/ubidi.h"
 #include "third_party/icu/source/common/unicode/uscript.h"
 #include "ui/gfx/render_text.h"
--- a/chromium-59.0.3071.86-dma-buf-header-hack.patch
+++ b/chromium-59.0.3071.86-dma-buf-header-hack.patch
@ -1,13 +0,0 @@
 diff -up chromium-59.0.3071.86/ui/gfx/linux/client_native_pixmap_dmabuf.cc.headerhack chromium-59.0.3071.86/ui/gfx/linux/client_native_pixmap_dmabuf.cc
 --- chromium-59.0.3071.86/ui/gfx/linux/client_native_pixmap_dmabuf.cc.headerhack	2017-06-09 15:12:49.684832489 -0400
 +++ chromium-59.0.3071.86/ui/gfx/linux/client_native_pixmap_dmabuf.cc	2017-06-09 15:13:13.907342001 -0400
@@ -17,7 +17,8 @@
 #include "base/strings/stringprintf.h"
 #include "base/trace_event/trace_event.h"
 -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0)
 +//#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0)
 +#if 1
 #include <linux/types.h>
 struct local_dma_buf_sync {
--- a/chromium-59.0.3071.86-enable-mp3.patch
+++ b/chromium-59.0.3071.86-enable-mp3.patch
@ -1,477 +0,0 @@
 diff -up chromium-59.0.3071.86/components/neterror/resources/sounds/button-press.mp3 chromium-59.0.3071.86/components/neterror/resources/sounds/button-press
 diff -up chromium-59.0.3071.86/components/neterror/resources/sounds/hit.mp3 chromium-59.0.3071.86/components/neterror/resources/sounds/hit
 diff -up chromium-59.0.3071.86/components/neterror/resources/sounds/score-reached.mp3 chromium-59.0.3071.86/components/neterror/resources/sounds/score-reached
 diff -up chromium-59.0.3071.86/media/base/mime_util_internal.cc.mp3 chromium-59.0.3071.86/media/base/mime_util_internal.cc
 --- chromium-59.0.3071.86/media/base/mime_util_internal.cc.mp3	2017-06-05 15:03:08.000000000 -0400
 +++ chromium-59.0.3071.86/media/base/mime_util_internal.cc	2017-06-15 12:37:05.162650032 -0400
@@ -286,10 +286,10 @@ void MimeUtil::AddSupportedMediaFormats(
   CodecSet webm_codecs(webm_audio_codecs);
   webm_codecs.insert(webm_video_codecs.begin(), webm_video_codecs.end());
 -#if BUILDFLAG(USE_PROPRIETARY_CODECS)
   CodecSet mp3_codecs;
   mp3_codecs.insert(MP3);
 +#if BUILDFLAG(USE_PROPRIETARY_CODECS)
   CodecSet aac;
   aac.insert(MPEG2_AAC);
   aac.insert(MPEG4_AAC);
@@ -333,10 +333,10 @@ void MimeUtil::AddSupportedMediaFormats(
   AddContainerWithCodecs("application/ogg", ogg_codecs, false);
   AddContainerWithCodecs("audio/flac", implicit_codec, false);
 -#if BUILDFLAG(USE_PROPRIETARY_CODECS)
   AddContainerWithCodecs("audio/mpeg", mp3_codecs, true);  // Allow "mp3".
   AddContainerWithCodecs("audio/mp3", implicit_codec, true);
   AddContainerWithCodecs("audio/x-mp3", implicit_codec, true);
 +#if BUILDFLAG(USE_PROPRIETARY_CODECS)
   AddContainerWithCodecs("audio/aac", implicit_codec, true);  // AAC / ADTS.
   AddContainerWithCodecs("audio/mp4", mp4_audio_codecs, true);
   DCHECK(!mp4_video_codecs.empty());
@@ -789,7 +789,6 @@ bool MimeUtil::IsCodecProprietary(Codec
     case INVALID_CODEC:
     case AC3:
     case EAC3:
 -    case MP3:
     case MPEG2_AAC:
     case MPEG4_AAC:
     case H264:
@@ -797,6 +796,7 @@ bool MimeUtil::IsCodecProprietary(Codec
     case DOLBY_VISION:
       return true;
 +    case MP3:
     case PCM:
     case VORBIS:
     case OPUS:
 diff -up chromium-59.0.3071.86/media/BUILD.gn.mp3 chromium-59.0.3071.86/media/BUILD.gn
 --- chromium-59.0.3071.86/media/BUILD.gn.mp3	2017-06-15 12:48:07.277772389 -0400
 +++ chromium-59.0.3071.86/media/BUILD.gn	2017-06-15 12:50:34.342911710 -0400
@@ -229,6 +229,14 @@ component("media") {
     "formats/webm/webm_video_client.h",
     "formats/webm/webm_webvtt_parser.cc",
     "formats/webm/webm_webvtt_parser.h",
 +    "formats/mpeg/adts_constants.cc",
 +    "formats/mpeg/adts_constants.h",
 +    "formats/mpeg/adts_stream_parser.cc",
 +    "formats/mpeg/adts_stream_parser.h",
 +    "formats/mpeg/mpeg1_audio_stream_parser.cc",
 +    "formats/mpeg/mpeg1_audio_stream_parser.h",
 +    "formats/mpeg/mpeg_audio_stream_parser_base.cc",
 +    "formats/mpeg/mpeg_audio_stream_parser_base.h",
     "muxers/webm_muxer.cc",
     "muxers/webm_muxer.h",
     "renderers/audio_renderer_impl.cc",
@@ -442,14 +450,6 @@ component("media") {
       "formats/mp4/sample_to_group_iterator.h",
       "formats/mp4/track_run_iterator.cc",
       "formats/mp4/track_run_iterator.h",
 -      "formats/mpeg/adts_constants.cc",
 -      "formats/mpeg/adts_constants.h",
 -      "formats/mpeg/adts_stream_parser.cc",
 -      "formats/mpeg/adts_stream_parser.h",
 -      "formats/mpeg/mpeg1_audio_stream_parser.cc",
 -      "formats/mpeg/mpeg1_audio_stream_parser.h",
 -      "formats/mpeg/mpeg_audio_stream_parser_base.cc",
 -      "formats/mpeg/mpeg_audio_stream_parser_base.h",
     ]
     if (enable_mse_mpeg2ts_stream_parser) {
       sources += [
 diff -up chromium-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/config.h.mp3 chromium-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/config.h
 --- chromium-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/config.h.mp3	2017-06-16 14:34:19.233333696 -0400
 +++ chromium-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/config.h	2017-06-16 14:35:36.235836034 -0400
@@ -1,7 +1,7 @@
 /* Automatically generated by configure - do not modify! */
 #ifndef FFMPEG_CONFIG_H
 #define FFMPEG_CONFIG_H
 -#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-nvenc --disable-cuda --disable-cuvid --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/usr/local/google/home/tguilbert/Code/chromium/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-cross-compile --cross-prefix=/usr/bin/aarch64-linux-gnu- --target-os=linux --arch=aarch64 --enable-armv8 --extra-cflags='-march=armv8-a' --enable-pic"
 +#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-nvenc --disable-cuda --disable-cuvid --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/usr/local/google/home/tguilbert/Code/chromium/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-cross-compile --cross-prefix=/usr/bin/aarch64-linux-gnu- --target-os=linux --arch=aarch64 --enable-armv8 --extra-cflags='-march=armv8-a' --enable-pic --enable-decoder='mp3' --enable-demuxer='mp3' --enable-parser='mpegaudio'"
 #define FFMPEG_LICENSE "LGPL version 2.1 or later"
 #define CONFIG_THIS_YEAR 2017
 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
@@ -550,7 +550,7 @@
 #define CONFIG_FFPROBE 0
 #define CONFIG_FFSERVER 0
 #define CONFIG_FFMPEG 0
 -#define CONFIG_DCT 0
 +#define CONFIG_DCT 1
 #define CONFIG_DWT 0
 #define CONFIG_ERROR_RESILIENCE 0
 #define CONFIG_FAAN 1
@@ -617,8 +617,8 @@
 #define CONFIG_LZF 0
 #define CONFIG_ME_CMP 0
 #define CONFIG_MPEG_ER 0
 -#define CONFIG_MPEGAUDIO 0
 -#define CONFIG_MPEGAUDIODSP 0
 +#define CONFIG_MPEGAUDIO 1
 +#define CONFIG_MPEGAUDIODSP 1
 #define CONFIG_MPEGVIDEO 0
 #define CONFIG_MPEGVIDEOENC 0
 #define CONFIG_MSS34DSP 0
@@ -957,7 +957,7 @@
 #define CONFIG_MP1FLOAT_DECODER 0
 #define CONFIG_MP2_DECODER 0
 #define CONFIG_MP2FLOAT_DECODER 0
 -#define CONFIG_MP3_DECODER 0
 +#define CONFIG_MP3_DECODER 1
 #define CONFIG_MP3FLOAT_DECODER 0
 #define CONFIG_MP3ADU_DECODER 0
 #define CONFIG_MP3ADUFLOAT_DECODER 0
@@ -1263,7 +1263,7 @@
 #define CONFIG_MM_DEMUXER 0
 #define CONFIG_MMF_DEMUXER 0
 #define CONFIG_MOV_DEMUXER 0
 -#define CONFIG_MP3_DEMUXER 0
 +#define CONFIG_MP3_DEMUXER 1
 #define CONFIG_MPC_DEMUXER 0
 #define CONFIG_MPC8_DEMUXER 0
 #define CONFIG_MPEGPS_DEMUXER 0
@@ -2196,7 +2196,7 @@
 #define CONFIG_MJPEG_PARSER 0
 #define CONFIG_MLP_PARSER 0
 #define CONFIG_MPEG4VIDEO_PARSER 0
 -#define CONFIG_MPEGAUDIO_PARSER 0
 +#define CONFIG_MPEGAUDIO_PARSER 1
 #define CONFIG_MPEGVIDEO_PARSER 0
 #define CONFIG_OPUS_PARSER 1
 #define CONFIG_PNG_PARSER 0
 diff -up chromium-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/arm/config.h.mp3 chromium-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/arm/config.h
 --- chromium-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/arm/config.h.mp3	2017-06-16 14:33:03.565804834 -0400
 +++ chromium-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/arm/config.h	2017-06-16 14:34:00.538697021 -0400
@@ -1,7 +1,7 @@
 /* Automatically generated by configure - do not modify! */
 #ifndef FFMPEG_CONFIG_H
 #define FFMPEG_CONFIG_H
 -#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-nvenc --disable-cuda --disable-cuvid --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/home/tguilbert/chrome_root/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=arm --enable-armv6 --enable-armv6t2 --enable-vfp --enable-thumb --extra-cflags='-march=armv7-a' --enable-cross-compile --target-os=linux --cross-prefix=armv7a-cros-linux-gnueabi- --extra-cflags='-mtune=cortex-a8' --extra-cflags='-mfloat-abi=hard' --disable-neon --extra-cflags='-mfpu=vfpv3-d16' --enable-pic"
 +#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-nvenc --disable-cuda --disable-cuvid --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/home/tguilbert/chrome_root/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=arm --enable-armv6 --enable-armv6t2 --enable-vfp --enable-thumb --extra-cflags='-march=armv7-a' --enable-cross-compile --target-os=linux --cross-prefix=armv7a-cros-linux-gnueabi- --extra-cflags='-mtune=cortex-a8' --extra-cflags='-mfloat-abi=hard' --disable-neon --extra-cflags='-mfpu=vfpv3-d16' --enable-pic --enable-decoder='mp3' --enable-demuxer='mp3' --enable-parser='mpegaudio'"
 #define FFMPEG_LICENSE "LGPL version 2.1 or later"
 #define CONFIG_THIS_YEAR 2017
 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
@@ -550,7 +550,7 @@
 #define CONFIG_FFPROBE 0
 #define CONFIG_FFSERVER 0
 #define CONFIG_FFMPEG 0
 -#define CONFIG_DCT 0
 +#define CONFIG_DCT 1
 #define CONFIG_DWT 0
 #define CONFIG_ERROR_RESILIENCE 0
 #define CONFIG_FAAN 1
@@ -617,8 +617,8 @@
 #define CONFIG_LZF 0
 #define CONFIG_ME_CMP 0
 #define CONFIG_MPEG_ER 0
 -#define CONFIG_MPEGAUDIO 0
 -#define CONFIG_MPEGAUDIODSP 0
 +#define CONFIG_MPEGAUDIO 1
 +#define CONFIG_MPEGAUDIODSP 1
 #define CONFIG_MPEGVIDEO 0
 #define CONFIG_MPEGVIDEOENC 0
 #define CONFIG_MSS34DSP 0
@@ -957,7 +957,7 @@
 #define CONFIG_MP1FLOAT_DECODER 0
 #define CONFIG_MP2_DECODER 0
 #define CONFIG_MP2FLOAT_DECODER 0
 -#define CONFIG_MP3_DECODER 0
 +#define CONFIG_MP3_DECODER 1
 #define CONFIG_MP3FLOAT_DECODER 0
 #define CONFIG_MP3ADU_DECODER 0
 #define CONFIG_MP3ADUFLOAT_DECODER 0
@@ -1263,7 +1263,7 @@
 #define CONFIG_MM_DEMUXER 0
 #define CONFIG_MMF_DEMUXER 0
 #define CONFIG_MOV_DEMUXER 0
 -#define CONFIG_MP3_DEMUXER 0
 +#define CONFIG_MP3_DEMUXER 1
 #define CONFIG_MPC_DEMUXER 0
 #define CONFIG_MPC8_DEMUXER 0
 #define CONFIG_MPEGPS_DEMUXER 0
@@ -2196,7 +2196,7 @@
 #define CONFIG_MJPEG_PARSER 0
 #define CONFIG_MLP_PARSER 0
 #define CONFIG_MPEG4VIDEO_PARSER 0
 -#define CONFIG_MPEGAUDIO_PARSER 0
 +#define CONFIG_MPEGAUDIO_PARSER 1
 #define CONFIG_MPEGVIDEO_PARSER 0
 #define CONFIG_OPUS_PARSER 1
 #define CONFIG_PNG_PARSER 0
 diff -up chromium-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/arm-neon/config.h.mp3 chromium-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/arm-neon/config.h
 --- chromium-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/arm-neon/config.h.mp3	2017-06-16 14:35:50.558558013 -0400
 +++ chromium-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/arm-neon/config.h	2017-06-16 14:36:34.140710462 -0400
@@ -1,7 +1,7 @@
 /* Automatically generated by configure - do not modify! */
 #ifndef FFMPEG_CONFIG_H
 #define FFMPEG_CONFIG_H
 -#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-nvenc --disable-cuda --disable-cuvid --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/home/tguilbert/chrome_root/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=arm --enable-armv6 --enable-armv6t2 --enable-vfp --enable-thumb --extra-cflags='-march=armv7-a' --enable-cross-compile --target-os=linux --cross-prefix=armv7a-cros-linux-gnueabi- --extra-cflags='-mtune=cortex-a8' --extra-cflags='-mfloat-abi=hard' --enable-neon --extra-cflags='-mfpu=neon' --enable-pic"
 +#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-nvenc --disable-cuda --disable-cuvid --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/home/tguilbert/chrome_root/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=arm --enable-armv6 --enable-armv6t2 --enable-vfp --enable-thumb --extra-cflags='-march=armv7-a' --enable-cross-compile --target-os=linux --cross-prefix=armv7a-cros-linux-gnueabi- --extra-cflags='-mtune=cortex-a8' --extra-cflags='-mfloat-abi=hard' --enable-neon --extra-cflags='-mfpu=neon' --enable-pic --enable-decoder='mp3' --enable-demuxer='mp3' --enable-parser='mpegaudio'"
 #define FFMPEG_LICENSE "LGPL version 2.1 or later"
 #define CONFIG_THIS_YEAR 2017
 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
@@ -550,7 +550,7 @@
 #define CONFIG_FFPROBE 0
 #define CONFIG_FFSERVER 0
 #define CONFIG_FFMPEG 0
 -#define CONFIG_DCT 0
 +#define CONFIG_DCT 1
 #define CONFIG_DWT 0
 #define CONFIG_ERROR_RESILIENCE 0
 #define CONFIG_FAAN 1
@@ -617,8 +617,8 @@
 #define CONFIG_LZF 0
 #define CONFIG_ME_CMP 0
 #define CONFIG_MPEG_ER 0
 -#define CONFIG_MPEGAUDIO 0
 -#define CONFIG_MPEGAUDIODSP 0
 +#define CONFIG_MPEGAUDIO 1
 +#define CONFIG_MPEGAUDIODSP 1
 #define CONFIG_MPEGVIDEO 0
 #define CONFIG_MPEGVIDEOENC 0
 #define CONFIG_MSS34DSP 0
@@ -957,7 +957,7 @@
 #define CONFIG_MP1FLOAT_DECODER 0
 #define CONFIG_MP2_DECODER 0
 #define CONFIG_MP2FLOAT_DECODER 0
 -#define CONFIG_MP3_DECODER 0
 +#define CONFIG_MP3_DECODER 1
 #define CONFIG_MP3FLOAT_DECODER 0
 #define CONFIG_MP3ADU_DECODER 0
 #define CONFIG_MP3ADUFLOAT_DECODER 0
@@ -1263,7 +1263,7 @@
 #define CONFIG_MM_DEMUXER 0
 #define CONFIG_MMF_DEMUXER 0
 #define CONFIG_MOV_DEMUXER 0
 -#define CONFIG_MP3_DEMUXER 0
 +#define CONFIG_MP3_DEMUXER 1
 #define CONFIG_MPC_DEMUXER 0
 #define CONFIG_MPC8_DEMUXER 0
 #define CONFIG_MPEGPS_DEMUXER 0
@@ -2196,7 +2196,7 @@
 #define CONFIG_MJPEG_PARSER 0
 #define CONFIG_MLP_PARSER 0
 #define CONFIG_MPEG4VIDEO_PARSER 0
 -#define CONFIG_MPEGAUDIO_PARSER 0
 +#define CONFIG_MPEGAUDIO_PARSER 1
 #define CONFIG_MPEGVIDEO_PARSER 0
 #define CONFIG_OPUS_PARSER 1
 #define CONFIG_PNG_PARSER 0
 diff -up chromium-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h.mp3 chromium-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h
 --- chromium-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h.mp3	2017-06-16 14:31:10.694999531 -0400
 +++ chromium-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h	2017-06-16 14:32:48.921089988 -0400
@@ -1,7 +1,7 @@
 /* Automatically generated by configure - do not modify! */
 #ifndef FFMPEG_CONFIG_H
 #define FFMPEG_CONFIG_H
 -#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-nvenc --disable-cuda --disable-cuvid --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/usr/local/google/home/tguilbert/Code/chromium/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=i686 --extra-cflags='\"-m32\"' --extra-ldflags='\"-m32\"' --enable-yasm --enable-pic"
 +#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-nvenc --disable-cuda --disable-cuvid --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/usr/local/google/home/tguilbert/Code/chromium/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=i686 --extra-cflags='\"-m32\"' --extra-ldflags='\"-m32\"' --enable-yasm --enable-pic --enable-decoder='mp3' --enable-demuxer='mp3' --enable-parser='mpegaudio'"
 #define FFMPEG_LICENSE "LGPL version 2.1 or later"
 #define CONFIG_THIS_YEAR 2017
 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
@@ -550,7 +550,7 @@
 #define CONFIG_FFPROBE 0
 #define CONFIG_FFSERVER 0
 #define CONFIG_FFMPEG 0
 -#define CONFIG_DCT 0
 +#define CONFIG_DCT 1
 #define CONFIG_DWT 0
 #define CONFIG_ERROR_RESILIENCE 0
 #define CONFIG_FAAN 1
@@ -617,8 +617,8 @@
 #define CONFIG_LZF 0
 #define CONFIG_ME_CMP 0
 #define CONFIG_MPEG_ER 0
 -#define CONFIG_MPEGAUDIO 0
 -#define CONFIG_MPEGAUDIODSP 0
 +#define CONFIG_MPEGAUDIO 1
 +#define CONFIG_MPEGAUDIODSP 1
 #define CONFIG_MPEGVIDEO 0
 #define CONFIG_MPEGVIDEOENC 0
 #define CONFIG_MSS34DSP 0
@@ -957,7 +957,7 @@
 #define CONFIG_MP1FLOAT_DECODER 0
 #define CONFIG_MP2_DECODER 0
 #define CONFIG_MP2FLOAT_DECODER 0
 -#define CONFIG_MP3_DECODER 0
 +#define CONFIG_MP3_DECODER 1
 #define CONFIG_MP3FLOAT_DECODER 0
 #define CONFIG_MP3ADU_DECODER 0
 #define CONFIG_MP3ADUFLOAT_DECODER 0
@@ -1263,7 +1263,7 @@
 #define CONFIG_MM_DEMUXER 0
 #define CONFIG_MMF_DEMUXER 0
 #define CONFIG_MOV_DEMUXER 0
 -#define CONFIG_MP3_DEMUXER 0
 +#define CONFIG_MP3_DEMUXER 1
 #define CONFIG_MPC_DEMUXER 0
 #define CONFIG_MPC8_DEMUXER 0
 #define CONFIG_MPEGPS_DEMUXER 0
@@ -2196,7 +2196,7 @@
 #define CONFIG_MJPEG_PARSER 0
 #define CONFIG_MLP_PARSER 0
 #define CONFIG_MPEG4VIDEO_PARSER 0
 -#define CONFIG_MPEGAUDIO_PARSER 0
 +#define CONFIG_MPEGAUDIO_PARSER 1
 #define CONFIG_MPEGVIDEO_PARSER 0
 #define CONFIG_OPUS_PARSER 1
 #define CONFIG_PNG_PARSER 0
 diff -up chromium-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.h.mp3 chromium-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.h
 --- chromium-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.h.mp3	2017-06-16 14:27:17.782528334 -0400
 +++ chromium-59.0.3071.86/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.h	2017-06-16 14:29:24.962054946 -0400
@@ -1,7 +1,7 @@
 /* Automatically generated by configure - do not modify! */
 #ifndef FFMPEG_CONFIG_H
 #define FFMPEG_CONFIG_H
 -#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-nvenc --disable-cuda --disable-cuvid --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/usr/local/google/home/tguilbert/Code/chromium/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-pic --enable-lto"
 +#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-nvenc --disable-cuda --disable-cuvid --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/usr/local/google/home/tguilbert/Code/chromium/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-pic --enable-lto --enable-decoder='mp3' --enable-demuxer='mp3' --enable-parser='mpegaudio'"
 #define FFMPEG_LICENSE "LGPL version 2.1 or later"
 #define CONFIG_THIS_YEAR 2017
 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
@@ -550,7 +550,7 @@
 #define CONFIG_FFPROBE 0
 #define CONFIG_FFSERVER 0
 #define CONFIG_FFMPEG 0
 -#define CONFIG_DCT 0
 +#define CONFIG_DCT 1
 #define CONFIG_DWT 0
 #define CONFIG_ERROR_RESILIENCE 0
 #define CONFIG_FAAN 1
@@ -617,8 +617,8 @@
 #define CONFIG_LZF 0
 #define CONFIG_ME_CMP 0
 #define CONFIG_MPEG_ER 0
 -#define CONFIG_MPEGAUDIO 0
 -#define CONFIG_MPEGAUDIODSP 0
 +#define CONFIG_MPEGAUDIO 1
 +#define CONFIG_MPEGAUDIODSP 1
 #define CONFIG_MPEGVIDEO 0
 #define CONFIG_MPEGVIDEOENC 0
 #define CONFIG_MSS34DSP 0
@@ -957,7 +957,7 @@
 #define CONFIG_MP1FLOAT_DECODER 0
 #define CONFIG_MP2_DECODER 0
 #define CONFIG_MP2FLOAT_DECODER 0
 -#define CONFIG_MP3_DECODER 0
 +#define CONFIG_MP3_DECODER 1
 #define CONFIG_MP3FLOAT_DECODER 0
 #define CONFIG_MP3ADU_DECODER 0
 #define CONFIG_MP3ADUFLOAT_DECODER 0
@@ -1263,7 +1263,7 @@
 #define CONFIG_MM_DEMUXER 0
 #define CONFIG_MMF_DEMUXER 0
 #define CONFIG_MOV_DEMUXER 0
 -#define CONFIG_MP3_DEMUXER 0
 +#define CONFIG_MP3_DEMUXER 1
 #define CONFIG_MPC_DEMUXER 0
 #define CONFIG_MPC8_DEMUXER 0
 #define CONFIG_MPEGPS_DEMUXER 0
@@ -2196,7 +2196,7 @@
 #define CONFIG_MJPEG_PARSER 0
 #define CONFIG_MLP_PARSER 0
 #define CONFIG_MPEG4VIDEO_PARSER 0
 -#define CONFIG_MPEGAUDIO_PARSER 0
 +#define CONFIG_MPEGAUDIO_PARSER 1
 #define CONFIG_MPEGVIDEO_PARSER 0
 #define CONFIG_OPUS_PARSER 1
 #define CONFIG_PNG_PARSER 0
 diff -up chromium-59.0.3071.86/third_party/ffmpeg/ffmpeg_generated.gni.mp3 chromium-59.0.3071.86/third_party/ffmpeg/ffmpeg_generated.gni
 --- chromium-59.0.3071.86/third_party/ffmpeg/ffmpeg_generated.gni.mp3	2017-06-08 11:40:39.000000000 -0400
 +++ chromium-59.0.3071.86/third_party/ffmpeg/ffmpeg_generated.gni	2017-06-15 12:37:05.163650012 -0400
@@ -177,19 +177,12 @@ if ((is_linux && current_cpu == "arm" &&
   ]
 }
 -if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_win && ffmpeg_branding == "Chrome")) {
 +if ((current_cpu == "x64") || (is_android && current_cpu == "arm" && arm_use_neon) || (is_android && current_cpu == "arm64") || (is_android && current_cpu == "mips64el") || (is_android && current_cpu == "mipsel") || (is_android && current_cpu == "x86") || (is_linux && current_cpu == "arm" && arm_use_neon) || (is_linux && current_cpu == "arm" && arm_use_neon) || (is_linux && current_cpu == "arm") || (is_linux && current_cpu == "arm64") || (is_linux && current_cpu == "mipsel") || (is_linux && current_cpu == "x64") || (is_linux && current_cpu == "x86") || (is_win))
 +{
   ffmpeg_c_sources += [
 -    "libavcodec/aac_ac3_parser.c",
 -    "libavcodec/aac_parser.c",
 -    "libavcodec/aacadtsdec.c",
 -    "libavcodec/aacps_float.c",
 -    "libavcodec/aacpsdsp_float.c",
 -    "libavcodec/aacsbr.c",
 -    "libavcodec/aactab.c",
 -    "libavcodec/ac3tab.c",
 -    "libavcodec/autorename_libavcodec_aacdec.c",
     "libavcodec/autorename_libavcodec_mpegaudiodsp.c",
     "libavcodec/autorename_libavcodec_sbrdsp.c",
 +    "libavcodec/ac3tab.c",
     "libavcodec/cbrt_data.c",
     "libavcodec/dct.c",
     "libavcodec/dct32_fixed.c",
@@ -205,7 +198,6 @@ if ((current_cpu == "x64" && ffmpeg_bran
     "libavcodec/mpegaudiodsp_float.c",
     "libavcodec/sinewin.c",
     "libavcodec/sinewin_fixed.c",
 -    "libavformat/aacdec.c",
     "libavformat/apetag.c",
     "libavformat/img2.c",
     "libavformat/mov.c",
@@ -214,6 +206,21 @@ if ((current_cpu == "x64" && ffmpeg_bran
   ]
 }
 +if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_win && ffmpeg_branding == "Chrome")) 
 +{
 +  ffmpeg_c_sources += [
 +    "libavcodec/aac_ac3_parser.c",
 +    "libavcodec/aac_parser.c",
 +    "libavcodec/aacadtsdec.c",
 +    "libavcodec/aacps_float.c",
 +    "libavcodec/aacpsdsp_float.c",
 +    "libavcodec/aacsbr.c",
 +    "libavcodec/aactab.c",
 +    "libavcodec/autorename_libavcodec_aacdec.c",
 +    "libavformat/aacdec.c",
 +  ]
 +}
 +
 if ((is_android && current_cpu == "x64") || (is_android && current_cpu == "x86") || (is_linux && current_cpu == "x64") || (is_linux && current_cpu == "x86") || (is_mac) || (is_win)) {
   ffmpeg_c_sources += [
     "libavcodec/x86/autorename_libavcodec_x86_vorbisdsp_init.c",
@@ -315,21 +322,31 @@ if ((is_linux && current_cpu == "x64") |
 if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_win && ffmpeg_branding == "Chrome")) {
   ffmpeg_c_sources += [
     "libavcodec/x86/aacpsdsp_init.c",
 +   ]
 +}
 +
 +if ((current_cpu == "x64") || (is_android && current_cpu == "x86") || (is_linux && current_cpu == "x64") || (is_linux && current_cpu == "x86") || (is_win)) {
 +  ffmpeg_c_sources += [
     "libavcodec/x86/dct_init.c",
     "libavcodec/x86/mpegaudiodsp.c",
     "libavcodec/x86/sbrdsp_init.c",
   ]
 }
 -if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_win && ffmpeg_branding == "Chrome")) {
 +if ((current_cpu == "x64") || (is_android && current_cpu == "x86") || (is_linux && current_cpu == "x64") || (is_linux && current_cpu == "x86") || (is_win)) {
   ffmpeg_yasm_sources += [
 -    "libavcodec/x86/aacpsdsp.asm",
     "libavcodec/x86/dct32.asm",
     "libavcodec/x86/imdct36.asm",
     "libavcodec/x86/sbrdsp.asm",
   ]
 }
 +if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_win && ffmpeg_branding == "Chrome")) {
 +  ffmpeg_yasm_sources += [
 +    "libavcodec/x86/aacpsdsp.asm",
 +  ]
 +}
 +
 if ((is_linux && current_cpu == "arm" && arm_use_neon) || (is_linux && current_cpu == "arm")) {
   ffmpeg_c_sources += [
     "libavcodec/arm/h264pred_init_arm.c",
 diff -up chromium-59.0.3071.86/third_party/ffmpeg/libavcodec/sbrdsp.c.mp3 chromium-59.0.3071.86/third_party/ffmpeg/libavcodec/sbrdsp.c
 --- chromium-59.0.3071.86/third_party/ffmpeg/libavcodec/sbrdsp.c.mp3	2017-06-08 11:40:41.000000000 -0400
 +++ chromium-59.0.3071.86/third_party/ffmpeg/libavcodec/sbrdsp.c	2017-06-15 12:37:05.163650012 -0400
@@ -23,6 +23,7 @@
 #define USE_FIXED 0
 #include "aac.h"
 +#include "aacsbrdata.h"
 #include "config.h"
 #include "libavutil/attributes.h"
 #include "libavutil/intfloat.h"
 diff -up chromium-59.0.3071.86/third_party/webrtc/examples/objc/AppRTCMobile/ios/resources/mozart.mp3 chromium-59.0.3071.86/third_party/webrtc/examples/objc/AppRTCMobile/ios/resources/mozart
 diff -up chromium-59.0.3071.86/tools/android/audio_focus_grabber/java/res/raw/ping.mp3 chromium-59.0.3071.86/tools/android/audio_focus_grabber/java/res/raw/ping
--- a/chromium-59.0.3071.86-gcc7.patch
+++ b/chromium-59.0.3071.86-gcc7.patch
@ -1,81 +0,0 @@
 diff -up chromium-59.0.3071.86/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h.gcc7 chromium-59.0.3071.86/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h
 --- chromium-59.0.3071.86/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h.gcc7	2017-06-07 16:30:12.351173420 -0400
 +++ chromium-59.0.3071.86/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h	2017-06-07 16:32:43.005163948 -0400
@@ -5,6 +5,7 @@
 #include "platform/PlatformExport.h"
 #include "platform/wtf/ThreadSpecific.h"
 +#include <functional>
 #include <memory>
 namespace gpu {
 diff -up chromium-59.0.3071.86/v8/src/objects-body-descriptors.h.gcc7 chromium-59.0.3071.86/v8/src/objects-body-descriptors.h
 --- chromium-59.0.3071.86/v8/src/objects-body-descriptors.h.gcc7	2017-06-05 15:04:29.000000000 -0400
 +++ chromium-59.0.3071.86/v8/src/objects-body-descriptors.h	2017-06-07 16:30:12.352173401 -0400
@@ -99,7 +99,7 @@ class FixedBodyDescriptor final : public
   template <typename StaticVisitor>
   static inline void IterateBody(HeapObject* obj, int object_size) {
 -    IterateBody(obj);
 +    IterateBody<StaticVisitor>(obj);
   }
 };
 diff -up chromium-59.0.3071.86/v8/src/objects/hash-table.h.gcc7 chromium-59.0.3071.86/v8/src/objects/hash-table.h
 --- chromium-59.0.3071.86/v8/src/objects/hash-table.h.gcc7	2017-06-07 16:35:26.052900374 -0400
 +++ chromium-59.0.3071.86/v8/src/objects/hash-table.h	2017-06-07 16:35:53.982340480 -0400
@@ -135,22 +135,8 @@ class HashTable : public HashTableBase {
  public:
   typedef Shape ShapeT;
 -  // Wrapper methods
 -  inline uint32_t Hash(Key key) {
 -    if (Shape::UsesSeed) {
 -      return Shape::SeededHash(key, GetHeap()->HashSeed());
 -    } else {
 -      return Shape::Hash(key);
 -    }
 -  }
 -
 -  inline uint32_t HashForObject(Key key, Object* object) {
 -    if (Shape::UsesSeed) {
 -      return Shape::SeededHashForObject(key, GetHeap()->HashSeed(), object);
 -    } else {
 -      return Shape::HashForObject(key, object);
 -    }
 -  }
 +  inline uint32_t Hash(Key key);
 +  inline uint32_t HashForObject(Key key, Object* object);
   // Returns a new HashTable object.
   MUST_USE_RESULT static Handle<Derived> New(
 diff -up chromium-59.0.3071.86/v8/src/objects.h.gcc7 chromium-59.0.3071.86/v8/src/objects.h
 diff -up chromium-59.0.3071.86/v8/src/objects-inl.h.gcc7 chromium-59.0.3071.86/v8/src/objects-inl.h
 --- chromium-59.0.3071.86/v8/src/objects-inl.h.gcc7	2017-06-05 15:04:29.000000000 -0400
 +++ chromium-59.0.3071.86/v8/src/objects-inl.h	2017-06-07 16:30:12.477171021 -0400
@@ -46,6 +46,25 @@
 namespace v8 {
 namespace internal {
 +template <typename Derived, typename Shape, typename Key>
 +uint32_t HashTable<Derived, Shape, Key>::Hash(Key key) {
 +  if (Shape::UsesSeed) {
 +    return Shape::SeededHash(key, GetHeap()->HashSeed());
 +  } else {
 +    return Shape::Hash(key);
 +  }
 +}
 +
 +template <typename Derived, typename Shape, typename Key>
 +uint32_t HashTable<Derived, Shape, Key>::HashForObject(Key key,
 +                                                       Object* object) {
 +  if (Shape::UsesSeed) {
 +    return Shape::SeededHashForObject(key, GetHeap()->HashSeed(), object);
 +  } else {
 +    return Shape::HashForObject(key, object);
 +  }
 +}
 +
 PropertyDetails::PropertyDetails(Smi* smi) {
   value_ = smi->value();
 }
--- a/chromium-59.0.3071.86-setopaque.patch
+++ b/chromium-59.0.3071.86-setopaque.patch
@ -1,12 +0,0 @@
 diff -up chromium-59.0.3071.86/cc/blink/web_layer_impl.h.setopaque chromium-59.0.3071.86/cc/blink/web_layer_impl.h
 --- chromium-59.0.3071.86/cc/blink/web_layer_impl.h.setopaque	2017-06-07 15:48:52.240620197 -0400
 +++ chromium-59.0.3071.86/cc/blink/web_layer_impl.h	2017-06-07 16:25:48.311448200 -0400
@@ -69,7 +69,7 @@ class CC_BLINK_EXPORT WebLayerImpl : pub
   blink::WebBlendMode BlendMode() const override;
   void SetIsRootForIsolatedGroup(bool root) override;
   bool IsRootForIsolatedGroup() override;
 -  void SetOpaque(bool opaque) override;
 +  CC_BLINK_EXPORT void SetOpaque(bool opaque) override;
   bool Opaque() const override;
   void SetPosition(const blink::WebFloatPoint& position) override;
   blink::WebFloatPoint GetPosition() const override;
--- a/chromium-60.0.3112.101-camfix.patch
+++ b/chromium-60.0.3112.101-camfix.patch
@ -1,25 +0,0 @@
 diff -up chromium-60.0.3112.101/content/browser/renderer_host/media/media_devices_dispatcher_host.cc.camfix chromium-60.0.3112.101/content/browser/renderer_host/media/media_devices_dispatcher_host.cc
 --- chromium-60.0.3112.101/content/browser/renderer_host/media/media_devices_dispatcher_host.cc.camfix	2017-08-16 17:02:07.177832503 -0400
 +++ chromium-60.0.3112.101/content/browser/renderer_host/media/media_devices_dispatcher_host.cc	2017-08-16 17:02:56.378883520 -0400
@@ -6,6 +6,7 @@
 #include <stddef.h>
 +#include <algorithm>
 #include <utility>
 #include <vector>
@@ -454,6 +455,13 @@ media::VideoCaptureFormats MediaDevicesD
   media_stream_manager_->video_capture_manager()->GetDeviceSupportedFormats(
       device_id, &formats);
 +  // Remove formats that have zero resolution.
 +  formats.erase(std::remove_if(formats.begin(), formats.end(),
 +                               [](const media::VideoCaptureFormat& format) {
 +                                 return format.frame_size.GetArea() <= 0;
 +                               }),
 +                formats.end());
 +
   return formats;
 }
--- a/chromium-60.0.3112.101-fix-ffmpeg-aarch64.patch
+++ b/chromium-60.0.3112.101-fix-ffmpeg-aarch64.patch
@ -1,12 +0,0 @@
 diff -up chromium-60.0.3112.101/third_party/ffmpeg/ffmpeg_generated.gni.aarch64 chromium-60.0.3112.101/third_party/ffmpeg/ffmpeg_generated.gni
 --- chromium-60.0.3112.101/third_party/ffmpeg/ffmpeg_generated.gni.aarch64	2017-08-23 14:46:37.305832399 -0400
 +++ chromium-60.0.3112.101/third_party/ffmpeg/ffmpeg_generated.gni	2017-08-23 14:47:06.217148864 -0400
@@ -539,7 +539,7 @@ if (is_linux && current_cpu == "arm64")
   ]
 }
 -if ((is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS")) {
 +if ((is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chromium")) {
   ffmpeg_c_sources += [
     "libavcodec/aarch64/mpegaudiodsp_init.c",
   ]
--- a/chromium-60.0.3112.78-enable-mp3.patch
+++ b/chromium-60.0.3112.78-enable-mp3.patch
@ -1,479 +0,0 @@
 diff -up chromium-60.0.3112.78/components/neterror/resources/sounds/button-press.mp3 chromium-60.0.3112.78/components/neterror/resources/sounds/button-press
 diff -up chromium-60.0.3112.78/components/neterror/resources/sounds/hit.mp3 chromium-60.0.3112.78/components/neterror/resources/sounds/hit
 diff -up chromium-60.0.3112.78/components/neterror/resources/sounds/score-reached.mp3 chromium-60.0.3112.78/components/neterror/resources/sounds/score-reached
 diff -up chromium-60.0.3112.78/media/base/mime_util_internal.cc.mp3 chromium-60.0.3112.78/media/base/mime_util_internal.cc
 --- chromium-60.0.3112.78/media/base/mime_util_internal.cc.mp3	2017-07-25 15:04:57.000000000 -0400
 +++ chromium-60.0.3112.78/media/base/mime_util_internal.cc	2017-07-31 10:57:55.054231795 -0400
@@ -278,10 +278,10 @@ void MimeUtil::AddSupportedMediaFormats(
   CodecSet webm_codecs(webm_audio_codecs);
   webm_codecs.insert(webm_video_codecs.begin(), webm_video_codecs.end());
 -#if BUILDFLAG(USE_PROPRIETARY_CODECS)
   CodecSet mp3_codecs;
   mp3_codecs.insert(MP3);
 +#if BUILDFLAG(USE_PROPRIETARY_CODECS)
   CodecSet aac;
   aac.insert(MPEG2_AAC);
   aac.insert(MPEG4_AAC);
@@ -325,10 +325,10 @@ void MimeUtil::AddSupportedMediaFormats(
   AddContainerWithCodecs("application/ogg", ogg_codecs, false);
   AddContainerWithCodecs("audio/flac", implicit_codec, false);
 -#if BUILDFLAG(USE_PROPRIETARY_CODECS)
   AddContainerWithCodecs("audio/mpeg", mp3_codecs, true);  // Allow "mp3".
   AddContainerWithCodecs("audio/mp3", implicit_codec, true);
   AddContainerWithCodecs("audio/x-mp3", implicit_codec, true);
 +#if BUILDFLAG(USE_PROPRIETARY_CODECS)
   AddContainerWithCodecs("audio/aac", implicit_codec, true);  // AAC / ADTS.
   AddContainerWithCodecs("audio/mp4", mp4_audio_codecs, true);
   DCHECK(!mp4_video_codecs.empty());
@@ -928,7 +928,6 @@ bool MimeUtil::IsCodecProprietary(Codec
     case INVALID_CODEC:
     case AC3:
     case EAC3:
 -    case MP3:
     case MPEG2_AAC:
     case MPEG4_AAC:
     case H264:
@@ -936,6 +935,7 @@ bool MimeUtil::IsCodecProprietary(Codec
     case DOLBY_VISION:
       return true;
 +    case MP3:
     case PCM:
     case VORBIS:
     case OPUS:
 diff -up chromium-60.0.3112.78/media/BUILD.gn.mp3 chromium-60.0.3112.78/media/BUILD.gn
 diff -up chromium-60.0.3112.78/media/formats/BUILD.gn.mp3 chromium-60.0.3112.78/media/formats/BUILD.gn
 --- chromium-60.0.3112.78/media/formats/BUILD.gn.mp3	2017-07-31 11:00:08.486638957 -0400
 +++ chromium-60.0.3112.78/media/formats/BUILD.gn	2017-07-31 11:01:17.867290730 -0400
@@ -12,6 +12,14 @@ source_set("formats") {
     "ac3/ac3_util.h",
     "common/offset_byte_queue.cc",
     "common/offset_byte_queue.h",
 +    "mpeg/adts_constants.cc",
 +    "mpeg/adts_constants.h",
 +    "mpeg/adts_stream_parser.cc",
 +    "mpeg/adts_stream_parser.h",
 +    "mpeg/mpeg1_audio_stream_parser.cc",
 +    "mpeg/mpeg1_audio_stream_parser.h",
 +    "mpeg/mpeg_audio_stream_parser_base.cc",
 +    "mpeg/mpeg_audio_stream_parser_base.h",
     "webm/webm_audio_client.cc",
     "webm/webm_audio_client.h",
     "webm/webm_cluster_parser.cc",
@@ -76,14 +84,6 @@ source_set("formats") {
       "mp4/sample_to_group_iterator.h",
       "mp4/track_run_iterator.cc",
       "mp4/track_run_iterator.h",
 -      "mpeg/adts_constants.cc",
 -      "mpeg/adts_constants.h",
 -      "mpeg/adts_stream_parser.cc",
 -      "mpeg/adts_stream_parser.h",
 -      "mpeg/mpeg1_audio_stream_parser.cc",
 -      "mpeg/mpeg1_audio_stream_parser.h",
 -      "mpeg/mpeg_audio_stream_parser_base.cc",
 -      "mpeg/mpeg_audio_stream_parser_base.h",
     ]
   }
 diff -up chromium-60.0.3112.78/third_party/catapult/third_party/gsutil/gslib/tests/test_data/test.mp3 chromium-60.0.3112.78/third_party/catapult/third_party/gsutil/gslib/tests/test_data/test
 diff -up chromium-60.0.3112.78/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/config.h.mp3 chromium-60.0.3112.78/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/config.h
 --- chromium-60.0.3112.78/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/config.h.mp3	2017-07-31 10:18:49.000000000 -0400
 +++ chromium-60.0.3112.78/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/config.h	2017-07-31 10:57:55.056231757 -0400
@@ -1,7 +1,7 @@
 /* Automatically generated by configure - do not modify! */
 #ifndef FFMPEG_CONFIG_H
 #define FFMPEG_CONFIG_H
 -#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-nvenc --disable-cuda --disable-cuvid --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/usr/local/google/home/tguilbert/Code/chromium/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-cross-compile --cross-prefix=/usr/bin/aarch64-linux-gnu- --target-os=linux --arch=aarch64 --enable-armv8 --extra-cflags='-march=armv8-a' --enable-pic"
 +#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-nvenc --disable-cuda --disable-cuvid --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/usr/local/google/home/tguilbert/Code/chromium/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-cross-compile --cross-prefix=/usr/bin/aarch64-linux-gnu- --target-os=linux --arch=aarch64 --enable-armv8 --extra-cflags='-march=armv8-a' --enable-pic --enable-decoder='mp3' --enable-demuxer='mp3' --enable-parser='mpegaudio'"
 #define FFMPEG_LICENSE "LGPL version 2.1 or later"
 #define CONFIG_THIS_YEAR 2017
 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
@@ -550,7 +550,7 @@
 #define CONFIG_FFPROBE 0
 #define CONFIG_FFSERVER 0
 #define CONFIG_FFMPEG 0
 -#define CONFIG_DCT 0
 +#define CONFIG_DCT 1
 #define CONFIG_DWT 0
 #define CONFIG_ERROR_RESILIENCE 0
 #define CONFIG_FAAN 1
@@ -617,8 +617,8 @@
 #define CONFIG_LZF 0
 #define CONFIG_ME_CMP 0
 #define CONFIG_MPEG_ER 0
 -#define CONFIG_MPEGAUDIO 0
 -#define CONFIG_MPEGAUDIODSP 0
 +#define CONFIG_MPEGAUDIO 1
 +#define CONFIG_MPEGAUDIODSP 1
 #define CONFIG_MPEGVIDEO 0
 #define CONFIG_MPEGVIDEOENC 0
 #define CONFIG_MSS34DSP 0
@@ -957,7 +957,7 @@
 #define CONFIG_MP1FLOAT_DECODER 0
 #define CONFIG_MP2_DECODER 0
 #define CONFIG_MP2FLOAT_DECODER 0
 -#define CONFIG_MP3_DECODER 0
 +#define CONFIG_MP3_DECODER 1
 #define CONFIG_MP3FLOAT_DECODER 0
 #define CONFIG_MP3ADU_DECODER 0
 #define CONFIG_MP3ADUFLOAT_DECODER 0
@@ -1263,7 +1263,7 @@
 #define CONFIG_MM_DEMUXER 0
 #define CONFIG_MMF_DEMUXER 0
 #define CONFIG_MOV_DEMUXER 0
 -#define CONFIG_MP3_DEMUXER 0
 +#define CONFIG_MP3_DEMUXER 1
 #define CONFIG_MPC_DEMUXER 0
 #define CONFIG_MPC8_DEMUXER 0
 #define CONFIG_MPEGPS_DEMUXER 0
@@ -2196,7 +2196,7 @@
 #define CONFIG_MJPEG_PARSER 0
 #define CONFIG_MLP_PARSER 0
 #define CONFIG_MPEG4VIDEO_PARSER 0
 -#define CONFIG_MPEGAUDIO_PARSER 0
 +#define CONFIG_MPEGAUDIO_PARSER 1
 #define CONFIG_MPEGVIDEO_PARSER 0
 #define CONFIG_OPUS_PARSER 1
 #define CONFIG_PNG_PARSER 0
 diff -up chromium-60.0.3112.78/third_party/ffmpeg/chromium/config/Chromium/linux/arm/config.h.mp3 chromium-60.0.3112.78/third_party/ffmpeg/chromium/config/Chromium/linux/arm/config.h
 --- chromium-60.0.3112.78/third_party/ffmpeg/chromium/config/Chromium/linux/arm/config.h.mp3	2017-07-31 10:18:49.000000000 -0400
 +++ chromium-60.0.3112.78/third_party/ffmpeg/chromium/config/Chromium/linux/arm/config.h	2017-07-31 10:57:55.057231738 -0400
@@ -1,7 +1,7 @@
 /* Automatically generated by configure - do not modify! */
 #ifndef FFMPEG_CONFIG_H
 #define FFMPEG_CONFIG_H
 -#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-nvenc --disable-cuda --disable-cuvid --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/home/tguilbert/chrome_root/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=arm --enable-armv6 --enable-armv6t2 --enable-vfp --enable-thumb --extra-cflags='-march=armv7-a' --enable-cross-compile --target-os=linux --cross-prefix=armv7a-cros-linux-gnueabi- --extra-cflags='-mtune=cortex-a8' --extra-cflags='-mfloat-abi=hard' --disable-neon --extra-cflags='-mfpu=vfpv3-d16' --enable-pic"
 +#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-nvenc --disable-cuda --disable-cuvid --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/home/tguilbert/chrome_root/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=arm --enable-armv6 --enable-armv6t2 --enable-vfp --enable-thumb --extra-cflags='-march=armv7-a' --enable-cross-compile --target-os=linux --cross-prefix=armv7a-cros-linux-gnueabi- --extra-cflags='-mtune=cortex-a8' --extra-cflags='-mfloat-abi=hard' --disable-neon --extra-cflags='-mfpu=vfpv3-d16' --enable-pic --enable-decoder='mp3' --enable-demuxer='mp3' --enable-parser='mpegaudio'"
 #define FFMPEG_LICENSE "LGPL version 2.1 or later"
 #define CONFIG_THIS_YEAR 2017
 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
@@ -550,7 +550,7 @@
 #define CONFIG_FFPROBE 0
 #define CONFIG_FFSERVER 0
 #define CONFIG_FFMPEG 0
 -#define CONFIG_DCT 0
 +#define CONFIG_DCT 1
 #define CONFIG_DWT 0
 #define CONFIG_ERROR_RESILIENCE 0
 #define CONFIG_FAAN 1
@@ -617,8 +617,8 @@
 #define CONFIG_LZF 0
 #define CONFIG_ME_CMP 0
 #define CONFIG_MPEG_ER 0
 -#define CONFIG_MPEGAUDIO 0
 -#define CONFIG_MPEGAUDIODSP 0
 +#define CONFIG_MPEGAUDIO 1
 +#define CONFIG_MPEGAUDIODSP 1
 #define CONFIG_MPEGVIDEO 0
 #define CONFIG_MPEGVIDEOENC 0
 #define CONFIG_MSS34DSP 0
@@ -957,7 +957,7 @@
 #define CONFIG_MP1FLOAT_DECODER 0
 #define CONFIG_MP2_DECODER 0
 #define CONFIG_MP2FLOAT_DECODER 0
 -#define CONFIG_MP3_DECODER 0
 +#define CONFIG_MP3_DECODER 1
 #define CONFIG_MP3FLOAT_DECODER 0
 #define CONFIG_MP3ADU_DECODER 0
 #define CONFIG_MP3ADUFLOAT_DECODER 0
@@ -1263,7 +1263,7 @@
 #define CONFIG_MM_DEMUXER 0
 #define CONFIG_MMF_DEMUXER 0
 #define CONFIG_MOV_DEMUXER 0
 -#define CONFIG_MP3_DEMUXER 0
 +#define CONFIG_MP3_DEMUXER 1
 #define CONFIG_MPC_DEMUXER 0
 #define CONFIG_MPC8_DEMUXER 0
 #define CONFIG_MPEGPS_DEMUXER 0
@@ -2196,7 +2196,7 @@
 #define CONFIG_MJPEG_PARSER 0
 #define CONFIG_MLP_PARSER 0
 #define CONFIG_MPEG4VIDEO_PARSER 0
 -#define CONFIG_MPEGAUDIO_PARSER 0
 +#define CONFIG_MPEGAUDIO_PARSER 1
 #define CONFIG_MPEGVIDEO_PARSER 0
 #define CONFIG_OPUS_PARSER 1
 #define CONFIG_PNG_PARSER 0
 diff -up chromium-60.0.3112.78/third_party/ffmpeg/chromium/config/Chromium/linux/arm-neon/config.h.mp3 chromium-60.0.3112.78/third_party/ffmpeg/chromium/config/Chromium/linux/arm-neon/config.h
 --- chromium-60.0.3112.78/third_party/ffmpeg/chromium/config/Chromium/linux/arm-neon/config.h.mp3	2017-07-31 10:18:49.000000000 -0400
 +++ chromium-60.0.3112.78/third_party/ffmpeg/chromium/config/Chromium/linux/arm-neon/config.h	2017-07-31 10:57:55.106230806 -0400
@@ -1,7 +1,7 @@
 /* Automatically generated by configure - do not modify! */
 #ifndef FFMPEG_CONFIG_H
 #define FFMPEG_CONFIG_H
 -#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-nvenc --disable-cuda --disable-cuvid --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/home/tguilbert/chrome_root/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=arm --enable-armv6 --enable-armv6t2 --enable-vfp --enable-thumb --extra-cflags='-march=armv7-a' --enable-cross-compile --target-os=linux --cross-prefix=armv7a-cros-linux-gnueabi- --extra-cflags='-mtune=cortex-a8' --extra-cflags='-mfloat-abi=hard' --enable-neon --extra-cflags='-mfpu=neon' --enable-pic"
 +#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-nvenc --disable-cuda --disable-cuvid --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/home/tguilbert/chrome_root/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=arm --enable-armv6 --enable-armv6t2 --enable-vfp --enable-thumb --extra-cflags='-march=armv7-a' --enable-cross-compile --target-os=linux --cross-prefix=armv7a-cros-linux-gnueabi- --extra-cflags='-mtune=cortex-a8' --extra-cflags='-mfloat-abi=hard' --enable-neon --extra-cflags='-mfpu=neon' --enable-pic --enable-decoder='mp3' --enable-demuxer='mp3' --enable-parser='mpegaudio'"
 #define FFMPEG_LICENSE "LGPL version 2.1 or later"
 #define CONFIG_THIS_YEAR 2017
 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
@@ -550,7 +550,7 @@
 #define CONFIG_FFPROBE 0
 #define CONFIG_FFSERVER 0
 #define CONFIG_FFMPEG 0
 -#define CONFIG_DCT 0
 +#define CONFIG_DCT 1
 #define CONFIG_DWT 0
 #define CONFIG_ERROR_RESILIENCE 0
 #define CONFIG_FAAN 1
@@ -617,8 +617,8 @@
 #define CONFIG_LZF 0
 #define CONFIG_ME_CMP 0
 #define CONFIG_MPEG_ER 0
 -#define CONFIG_MPEGAUDIO 0
 -#define CONFIG_MPEGAUDIODSP 0
 +#define CONFIG_MPEGAUDIO 1
 +#define CONFIG_MPEGAUDIODSP 1
 #define CONFIG_MPEGVIDEO 0
 #define CONFIG_MPEGVIDEOENC 0
 #define CONFIG_MSS34DSP 0
@@ -957,7 +957,7 @@
 #define CONFIG_MP1FLOAT_DECODER 0
 #define CONFIG_MP2_DECODER 0
 #define CONFIG_MP2FLOAT_DECODER 0
 -#define CONFIG_MP3_DECODER 0
 +#define CONFIG_MP3_DECODER 1
 #define CONFIG_MP3FLOAT_DECODER 0
 #define CONFIG_MP3ADU_DECODER 0
 #define CONFIG_MP3ADUFLOAT_DECODER 0
@@ -1263,7 +1263,7 @@
 #define CONFIG_MM_DEMUXER 0
 #define CONFIG_MMF_DEMUXER 0
 #define CONFIG_MOV_DEMUXER 0
 -#define CONFIG_MP3_DEMUXER 0
 +#define CONFIG_MP3_DEMUXER 1
 #define CONFIG_MPC_DEMUXER 0
 #define CONFIG_MPC8_DEMUXER 0
 #define CONFIG_MPEGPS_DEMUXER 0
@@ -2196,7 +2196,7 @@
 #define CONFIG_MJPEG_PARSER 0
 #define CONFIG_MLP_PARSER 0
 #define CONFIG_MPEG4VIDEO_PARSER 0
 -#define CONFIG_MPEGAUDIO_PARSER 0
 +#define CONFIG_MPEGAUDIO_PARSER 1
 #define CONFIG_MPEGVIDEO_PARSER 0
 #define CONFIG_OPUS_PARSER 1
 #define CONFIG_PNG_PARSER 0
 diff -up chromium-60.0.3112.78/third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h.mp3 chromium-60.0.3112.78/third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h
 --- chromium-60.0.3112.78/third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h.mp3	2017-07-31 10:18:49.000000000 -0400
 +++ chromium-60.0.3112.78/third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h	2017-07-31 10:57:55.107230787 -0400
@@ -1,7 +1,7 @@
 /* Automatically generated by configure - do not modify! */
 #ifndef FFMPEG_CONFIG_H
 #define FFMPEG_CONFIG_H
 -#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-nvenc --disable-cuda --disable-cuvid --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/usr/local/google/home/tguilbert/Code/chromium/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=i686 --extra-cflags='\"-m32\"' --extra-ldflags='\"-m32\"' --enable-yasm --enable-pic"
 +#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-nvenc --disable-cuda --disable-cuvid --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/usr/local/google/home/tguilbert/Code/chromium/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=i686 --extra-cflags='\"-m32\"' --extra-ldflags='\"-m32\"' --enable-yasm --enable-pic --enable-decoder='mp3' --enable-demuxer='mp3' --enable-parser='mpegaudio'"
 #define FFMPEG_LICENSE "LGPL version 2.1 or later"
 #define CONFIG_THIS_YEAR 2017
 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
@@ -550,7 +550,7 @@
 #define CONFIG_FFPROBE 0
 #define CONFIG_FFSERVER 0
 #define CONFIG_FFMPEG 0
 -#define CONFIG_DCT 0
 +#define CONFIG_DCT 1
 #define CONFIG_DWT 0
 #define CONFIG_ERROR_RESILIENCE 0
 #define CONFIG_FAAN 1
@@ -617,8 +617,8 @@
 #define CONFIG_LZF 0
 #define CONFIG_ME_CMP 0
 #define CONFIG_MPEG_ER 0
 -#define CONFIG_MPEGAUDIO 0
 -#define CONFIG_MPEGAUDIODSP 0
 +#define CONFIG_MPEGAUDIO 1
 +#define CONFIG_MPEGAUDIODSP 1
 #define CONFIG_MPEGVIDEO 0
 #define CONFIG_MPEGVIDEOENC 0
 #define CONFIG_MSS34DSP 0
@@ -957,7 +957,7 @@
 #define CONFIG_MP1FLOAT_DECODER 0
 #define CONFIG_MP2_DECODER 0
 #define CONFIG_MP2FLOAT_DECODER 0
 -#define CONFIG_MP3_DECODER 0
 +#define CONFIG_MP3_DECODER 1
 #define CONFIG_MP3FLOAT_DECODER 0
 #define CONFIG_MP3ADU_DECODER 0
 #define CONFIG_MP3ADUFLOAT_DECODER 0
@@ -1263,7 +1263,7 @@
 #define CONFIG_MM_DEMUXER 0
 #define CONFIG_MMF_DEMUXER 0
 #define CONFIG_MOV_DEMUXER 0
 -#define CONFIG_MP3_DEMUXER 0
 +#define CONFIG_MP3_DEMUXER 1
 #define CONFIG_MPC_DEMUXER 0
 #define CONFIG_MPC8_DEMUXER 0
 #define CONFIG_MPEGPS_DEMUXER 0
@@ -2196,7 +2196,7 @@
 #define CONFIG_MJPEG_PARSER 0
 #define CONFIG_MLP_PARSER 0
 #define CONFIG_MPEG4VIDEO_PARSER 0
 -#define CONFIG_MPEGAUDIO_PARSER 0
 +#define CONFIG_MPEGAUDIO_PARSER 1
 #define CONFIG_MPEGVIDEO_PARSER 0
 #define CONFIG_OPUS_PARSER 1
 #define CONFIG_PNG_PARSER 0
 diff -up chromium-60.0.3112.78/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.h.mp3 chromium-60.0.3112.78/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.h
 --- chromium-60.0.3112.78/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.h.mp3	2017-07-31 10:18:49.000000000 -0400
 +++ chromium-60.0.3112.78/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.h	2017-07-31 10:57:55.108230768 -0400
@@ -1,7 +1,7 @@
 /* Automatically generated by configure - do not modify! */
 #ifndef FFMPEG_CONFIG_H
 #define FFMPEG_CONFIG_H
 -#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-nvenc --disable-cuda --disable-cuvid --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/usr/local/google/home/tguilbert/Code/chromium/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-pic --enable-lto"
 +#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-nvenc --disable-cuda --disable-cuvid --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/usr/local/google/home/tguilbert/Code/chromium/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-pic --enable-lto --enable-decoder='mp3' --enable-demuxer='mp3' --enable-parser='mpegaudio'"
 #define FFMPEG_LICENSE "LGPL version 2.1 or later"
 #define CONFIG_THIS_YEAR 2017
 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
@@ -550,7 +550,7 @@
 #define CONFIG_FFPROBE 0
 #define CONFIG_FFSERVER 0
 #define CONFIG_FFMPEG 0
 -#define CONFIG_DCT 0
 +#define CONFIG_DCT 1
 #define CONFIG_DWT 0
 #define CONFIG_ERROR_RESILIENCE 0
 #define CONFIG_FAAN 1
@@ -617,8 +617,8 @@
 #define CONFIG_LZF 0
 #define CONFIG_ME_CMP 0
 #define CONFIG_MPEG_ER 0
 -#define CONFIG_MPEGAUDIO 0
 -#define CONFIG_MPEGAUDIODSP 0
 +#define CONFIG_MPEGAUDIO 1
 +#define CONFIG_MPEGAUDIODSP 1
 #define CONFIG_MPEGVIDEO 0
 #define CONFIG_MPEGVIDEOENC 0
 #define CONFIG_MSS34DSP 0
@@ -957,7 +957,7 @@
 #define CONFIG_MP1FLOAT_DECODER 0
 #define CONFIG_MP2_DECODER 0
 #define CONFIG_MP2FLOAT_DECODER 0
 -#define CONFIG_MP3_DECODER 0
 +#define CONFIG_MP3_DECODER 1
 #define CONFIG_MP3FLOAT_DECODER 0
 #define CONFIG_MP3ADU_DECODER 0
 #define CONFIG_MP3ADUFLOAT_DECODER 0
@@ -1263,7 +1263,7 @@
 #define CONFIG_MM_DEMUXER 0
 #define CONFIG_MMF_DEMUXER 0
 #define CONFIG_MOV_DEMUXER 0
 -#define CONFIG_MP3_DEMUXER 0
 +#define CONFIG_MP3_DEMUXER 1
 #define CONFIG_MPC_DEMUXER 0
 #define CONFIG_MPC8_DEMUXER 0
 #define CONFIG_MPEGPS_DEMUXER 0
@@ -2196,7 +2196,7 @@
 #define CONFIG_MJPEG_PARSER 0
 #define CONFIG_MLP_PARSER 0
 #define CONFIG_MPEG4VIDEO_PARSER 0
 -#define CONFIG_MPEGAUDIO_PARSER 0
 +#define CONFIG_MPEGAUDIO_PARSER 1
 #define CONFIG_MPEGVIDEO_PARSER 0
 #define CONFIG_OPUS_PARSER 1
 #define CONFIG_PNG_PARSER 0
 diff -up chromium-60.0.3112.78/third_party/ffmpeg/ffmpeg_generated.gni.mp3 chromium-60.0.3112.78/third_party/ffmpeg/ffmpeg_generated.gni
 --- chromium-60.0.3112.78/third_party/ffmpeg/ffmpeg_generated.gni.mp3	2017-07-31 10:18:46.000000000 -0400
 +++ chromium-60.0.3112.78/third_party/ffmpeg/ffmpeg_generated.gni	2017-07-31 10:57:55.109230749 -0400
@@ -177,19 +177,12 @@ if ((is_linux && current_cpu == "arm" &&
   ]
 }
 -if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_win && ffmpeg_branding == "Chrome")) {
 +if ((current_cpu == "x64") || (is_android && current_cpu == "arm" && arm_use_neon) || (is_android && current_cpu == "arm64") || (is_android && current_cpu == "mips64el") || (is_android && current_cpu == "mipsel") || (is_android && current_cpu == "x86") || (is_linux && current_cpu == "arm" && arm_use_neon) || (is_linux && current_cpu == "arm" && arm_use_neon) || (is_linux && current_cpu == "arm") || (is_linux && current_cpu == "arm64") || (is_linux && current_cpu == "mipsel") || (is_linux && current_cpu == "x64") || (is_linux && current_cpu == "x86") || (is_win))
 +{
   ffmpeg_c_sources += [
 -    "libavcodec/aac_ac3_parser.c",
 -    "libavcodec/aac_parser.c",
 -    "libavcodec/aacadtsdec.c",
 -    "libavcodec/aacps_float.c",
 -    "libavcodec/aacpsdsp_float.c",
 -    "libavcodec/aacsbr.c",
 -    "libavcodec/aactab.c",
 -    "libavcodec/ac3tab.c",
 -    "libavcodec/autorename_libavcodec_aacdec.c",
     "libavcodec/autorename_libavcodec_mpegaudiodsp.c",
     "libavcodec/autorename_libavcodec_sbrdsp.c",
 +    "libavcodec/ac3tab.c",
     "libavcodec/cbrt_data.c",
     "libavcodec/dct.c",
     "libavcodec/dct32_fixed.c",
@@ -205,7 +198,6 @@ if ((current_cpu == "x64" && ffmpeg_bran
     "libavcodec/mpegaudiodsp_float.c",
     "libavcodec/sinewin.c",
     "libavcodec/sinewin_fixed.c",
 -    "libavformat/aacdec.c",
     "libavformat/apetag.c",
     "libavformat/img2.c",
     "libavformat/mov.c",
@@ -214,6 +206,21 @@ if ((current_cpu == "x64" && ffmpeg_bran
   ]
 }
 +if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_win && ffmpeg_branding == "Chrome")) 
 +{
 +  ffmpeg_c_sources += [
 +    "libavcodec/aac_ac3_parser.c",
 +    "libavcodec/aac_parser.c",
 +    "libavcodec/aacadtsdec.c",
 +    "libavcodec/aacps_float.c",
 +    "libavcodec/aacpsdsp_float.c",
 +    "libavcodec/aacsbr.c",
 +    "libavcodec/aactab.c",
 +    "libavcodec/autorename_libavcodec_aacdec.c",
 +    "libavformat/aacdec.c",
 +  ]
 +}
 +
 if ((is_android && current_cpu == "x64") || (is_android && current_cpu == "x86") || (is_linux && current_cpu == "x64") || (is_linux && current_cpu == "x86") || (is_mac) || (is_win)) {
   ffmpeg_c_sources += [
     "libavcodec/x86/autorename_libavcodec_x86_vorbisdsp_init.c",
@@ -315,21 +322,31 @@ if ((is_linux && current_cpu == "x64") |
 if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_win && ffmpeg_branding == "Chrome")) {
   ffmpeg_c_sources += [
     "libavcodec/x86/aacpsdsp_init.c",
 +   ]
 +}
 +
 +if ((current_cpu == "x64") || (is_android && current_cpu == "x86") || (is_linux && current_cpu == "x64") || (is_linux && current_cpu == "x86") || (is_win)) {
 +  ffmpeg_c_sources += [
     "libavcodec/x86/dct_init.c",
     "libavcodec/x86/mpegaudiodsp.c",
     "libavcodec/x86/sbrdsp_init.c",
   ]
 }
 -if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_win && ffmpeg_branding == "Chrome")) {
 +if ((current_cpu == "x64") || (is_android && current_cpu == "x86") || (is_linux && current_cpu == "x64") || (is_linux && current_cpu == "x86") || (is_win)) {
   ffmpeg_yasm_sources += [
 -    "libavcodec/x86/aacpsdsp.asm",
     "libavcodec/x86/dct32.asm",
     "libavcodec/x86/imdct36.asm",
     "libavcodec/x86/sbrdsp.asm",
   ]
 }
 +if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_win && ffmpeg_branding == "Chrome")) {
 +  ffmpeg_yasm_sources += [
 +    "libavcodec/x86/aacpsdsp.asm",
 +  ]
 +}
 +
 if ((is_linux && current_cpu == "arm" && arm_use_neon) || (is_linux && current_cpu == "arm")) {
   ffmpeg_c_sources += [
     "libavcodec/arm/h264pred_init_arm.c",
 diff -up chromium-60.0.3112.78/third_party/ffmpeg/libavcodec/sbrdsp.c.mp3 chromium-60.0.3112.78/third_party/ffmpeg/libavcodec/sbrdsp.c
 --- chromium-60.0.3112.78/third_party/ffmpeg/libavcodec/sbrdsp.c.mp3	2017-07-31 10:18:48.000000000 -0400
 +++ chromium-60.0.3112.78/third_party/ffmpeg/libavcodec/sbrdsp.c	2017-07-31 10:57:55.110230730 -0400
@@ -23,6 +23,7 @@
 #define USE_FIXED 0
 #include "aac.h"
 +#include "aacsbrdata.h"
 #include "config.h"
 #include "libavutil/attributes.h"
 #include "libavutil/intfloat.h"
 diff -up chromium-60.0.3112.78/third_party/webrtc/examples/objc/AppRTCMobile/ios/resources/mozart.mp3 chromium-60.0.3112.78/third_party/webrtc/examples/objc/AppRTCMobile/ios/resources/mozart
 diff -up chromium-60.0.3112.78/tools/android/audio_focus_grabber/java/res/raw/ping.mp3 chromium-60.0.3112.78/tools/android/audio_focus_grabber/java/res/raw/ping
--- a/chromium-60.0.3112.78-fix-gn-bootstrap.patch
+++ b/chromium-60.0.3112.78-fix-gn-bootstrap.patch
@ -1,11 +0,0 @@
 diff -up chromium-60.0.3112.78/tools/gn/bootstrap/bootstrap.py.fixme chromium-60.0.3112.78/tools/gn/bootstrap/bootstrap.py
 --- chromium-60.0.3112.78/tools/gn/bootstrap/bootstrap.py.fixme	2017-07-31 11:47:11.660774702 -0400
 +++ chromium-60.0.3112.78/tools/gn/bootstrap/bootstrap.py	2017-07-31 11:47:32.859362600 -0400
@@ -487,6 +487,7 @@ def write_gn_ninja(path, root_gen_dir, o
       'base/sys_info.cc',
       'base/task_runner.cc',
       'base/task_scheduler/delayed_task_manager.cc',
 +      'base/task_scheduler/environment_config.cc',
       'base/task_scheduler/post_task.cc',
       'base/task_scheduler/priority_queue.cc',
       'base/task_scheduler/scheduler_lock_impl.cc',
--- a/chromium-60.0.3112.78-gcc7.patch
+++ b/chromium-60.0.3112.78-gcc7.patch
@ -1,80 +0,0 @@
 diff -up chromium-60.0.3112.78/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h.gcc7 chromium-60.0.3112.78/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h
 --- chromium-60.0.3112.78/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h.gcc7	2017-07-25 15:05:15.000000000 -0400
 +++ chromium-60.0.3112.78/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h	2017-07-31 10:51:08.530131802 -0400
@@ -8,6 +8,7 @@
 #include "platform/PlatformExport.h"
 #include "platform/wtf/ThreadSpecific.h"
 +#include <functional>
 #include <memory>
 namespace gpu {
 diff -up chromium-60.0.3112.78/v8/src/objects-body-descriptors.h.gcc7 chromium-60.0.3112.78/v8/src/objects-body-descriptors.h
 --- chromium-60.0.3112.78/v8/src/objects-body-descriptors.h.gcc7	2017-07-31 10:51:08.531131782 -0400
 +++ chromium-60.0.3112.78/v8/src/objects-body-descriptors.h	2017-07-31 10:55:08.989458924 -0400
@@ -99,7 +99,7 @@ class FixedBodyDescriptor final : public
   template <typename StaticVisitor>
   static inline void IterateBody(HeapObject* obj, int object_size) {
 -    IterateBody(obj);
 +    IterateBody<StaticVisitor>(obj);
   }
   static inline int SizeOf(Map* map, HeapObject* object) { return kSize; }
 diff -up chromium-60.0.3112.78/v8/src/objects/hash-table.h.gcc7 chromium-60.0.3112.78/v8/src/objects/hash-table.h
 --- chromium-60.0.3112.78/v8/src/objects/hash-table.h.gcc7	2017-07-25 15:06:36.000000000 -0400
 +++ chromium-60.0.3112.78/v8/src/objects/hash-table.h	2017-07-31 10:51:08.531131782 -0400
@@ -138,22 +138,8 @@ class HashTable : public HashTableBase {
  public:
   typedef Shape ShapeT;
 -  // Wrapper methods
 -  inline uint32_t Hash(Key key) {
 -    if (Shape::UsesSeed) {
 -      return Shape::SeededHash(key, GetHeap()->HashSeed());
 -    } else {
 -      return Shape::Hash(key);
 -    }
 -  }
 -
 -  inline uint32_t HashForObject(Key key, Object* object) {
 -    if (Shape::UsesSeed) {
 -      return Shape::SeededHashForObject(key, GetHeap()->HashSeed(), object);
 -    } else {
 -      return Shape::HashForObject(key, object);
 -    }
 -  }
 +  inline uint32_t Hash(Key key);
 +  inline uint32_t HashForObject(Key key, Object* object);
   // Returns a new HashTable object.
   MUST_USE_RESULT static Handle<Derived> New(
 diff -up chromium-60.0.3112.78/v8/src/objects-inl.h.gcc7 chromium-60.0.3112.78/v8/src/objects-inl.h
 --- chromium-60.0.3112.78/v8/src/objects-inl.h.gcc7	2017-07-25 15:06:36.000000000 -0400
 +++ chromium-60.0.3112.78/v8/src/objects-inl.h	2017-07-31 10:51:08.533131742 -0400
@@ -47,6 +47,25 @@
 namespace v8 {
 namespace internal {
 +template <typename Derived, typename Shape, typename Key>
 +uint32_t HashTable<Derived, Shape, Key>::Hash(Key key) {
 +  if (Shape::UsesSeed) {
 +    return Shape::SeededHash(key, GetHeap()->HashSeed());
 +  } else {
 +    return Shape::Hash(key);
 +  }
 +}
 +
 +template <typename Derived, typename Shape, typename Key>
 +uint32_t HashTable<Derived, Shape, Key>::HashForObject(Key key,
 +                                                       Object* object) {
 +  if (Shape::UsesSeed) {
 +    return Shape::SeededHashForObject(key, GetHeap()->HashSeed(), object);
 +  } else {
 +    return Shape::HashForObject(key, object);
 +  }
 +}
 +
 PropertyDetails::PropertyDetails(Smi* smi) {
   value_ = smi->value();
 }
--- a/chromium-60.0.3112.78-gtk2fix.patch
+++ b/chromium-60.0.3112.78-gtk2fix.patch
@ -1,612 +0,0 @@
 diff -up chromium-60.0.3112.78/chrome/browser/ui/libgtkui/gtk_ui.cc.gtk2fix chromium-60.0.3112.78/chrome/browser/ui/libgtkui/gtk_ui.cc
 --- chromium-60.0.3112.78/chrome/browser/ui/libgtkui/gtk_ui.cc.gtk2fix	2017-08-03 10:26:36.816787227 -0400
 +++ chromium-60.0.3112.78/chrome/browser/ui/libgtkui/gtk_ui.cc	2017-08-03 10:56:53.345661368 -0400
@@ -60,6 +60,7 @@
 #include "ui/views/controls/button/blue_button.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/button/label_button_border.h"
 +#include "ui/views/linux_ui/device_scale_factor_observer.h"
 #include "ui/views/linux_ui/window_button_order_observer.h"
 #include "ui/views/resources/grit/views_resources.h"
@@ -315,17 +316,6 @@ gfx::FontRenderParams GetGtkFontRenderPa
   return params;
 }
 -float GetRawDeviceScaleFactor() {
 -  if (display::Display::HasForceDeviceScaleFactor())
 -    return display::Display::GetForcedDeviceScaleFactor();
 -
 -  GdkScreen* screen = gdk_screen_get_default();
 -  gint scale = gdk_screen_get_monitor_scale_factor(
 -      screen, gdk_screen_get_primary_monitor(screen));
 -  gdouble resolution = gdk_screen_get_resolution(screen);
 -  return resolution <= 0 ? scale : resolution * scale / kDefaultDPI;
 -}
 -
 views::LinuxUI::NonClientMiddleClickAction GetDefaultMiddleClickAction() {
   std::unique_ptr<base::Environment> env(base::Environment::Create());
   switch (base::nix::GetDesktopEnvironment(env.get())) {
@@ -414,19 +404,17 @@ GtkUi::GtkUi() : middle_click_action_(Ge
 #if GTK_MAJOR_VERSION == 2
   native_theme_ = NativeThemeGtk2::instance();
   fake_window_ = chrome_gtk_frame_new();
 -  gtk_widget_realize(fake_window_);  // Is this necessary?
 #elif GTK_MAJOR_VERSION == 3
   native_theme_ = NativeThemeGtk3::instance();
 -  (void)fake_window_;  // Silence the unused warning.
 +  fake_window_ = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 #else
 #error "Unsupported GTK version"
 #endif
 +  gtk_widget_realize(fake_window_);
 }
 GtkUi::~GtkUi() {
 -#if GTK_MAJOR_VERSION == 2
   gtk_widget_destroy(fake_window_);
 -#endif
 }
 void OnThemeChanged(GObject* obj, GParamSpec* param, GtkUi* gtkui) {
@@ -440,6 +428,17 @@ void GtkUi::Initialize() {
   g_signal_connect_after(settings, "notify::gtk-icon-theme-name",
                          G_CALLBACK(OnThemeChanged), this);
 +  GdkScreen* screen = gdk_screen_get_default();
 +  // Listen for DPI changes.
 +  g_signal_connect_after(screen, "notify::resolution",
 +                         G_CALLBACK(OnDeviceScaleFactorMaybeChangedThunk),
 +                         this);
 +  // Listen for scale factor changes.  We would prefer to listen on
 +  // |screen|, but there is no scale-factor property, so use an
 +  // unmapped window instead.
 +  g_signal_connect(fake_window_, "notify::scale-factor",
 +                   G_CALLBACK(OnDeviceScaleFactorMaybeChangedThunk), this);
 +
   LoadGtkValues();
 #if BUILDFLAG(ENABLE_BASIC_PRINTING)
@@ -701,12 +700,12 @@ void GtkUi::AddWindowButtonOrderObserver
     observer->OnWindowButtonOrderingChange(leading_buttons_, trailing_buttons_);
   }
 -  observer_list_.AddObserver(observer);
 +  window_button_order_observer_list_.AddObserver(observer);
 }
 void GtkUi::RemoveWindowButtonOrderObserver(
     views::WindowButtonOrderObserver* observer) {
 -  observer_list_.RemoveObserver(observer);
 +  window_button_order_observer_list_.RemoveObserver(observer);
 }
 void GtkUi::SetWindowButtonOrdering(
@@ -715,8 +714,10 @@ void GtkUi::SetWindowButtonOrdering(
   leading_buttons_ = leading_buttons;
   trailing_buttons_ = trailing_buttons;
 -  for (views::WindowButtonOrderObserver& observer : observer_list_)
 +  for (views::WindowButtonOrderObserver& observer :
 +       window_button_order_observer_list_) {
     observer.OnWindowButtonOrderingChange(leading_buttons_, trailing_buttons_);
 +  }
 }
 void GtkUi::SetNonClientMiddleClickAction(NonClientMiddleClickAction action) {
@@ -768,6 +769,16 @@ void GtkUi::NotifyWindowManagerStartupCo
   gdk_notify_startup_complete();
 }
 +void GtkUi::AddDeviceScaleFactorObserver(
 +    views::DeviceScaleFactorObserver* observer) {
 +  device_scale_factor_observer_list_.AddObserver(observer);
 +}
 +
 +void GtkUi::RemoveDeviceScaleFactorObserver(
 +    views::DeviceScaleFactorObserver* observer) {
 +  device_scale_factor_observer_list_.RemoveObserver(observer);
 +}
 +
 bool GtkUi::MatchEvent(const ui::Event& event,
                        std::vector<ui::TextEditCommandAuraLinux>* commands) {
   // Ensure that we have a keyboard handler.
@@ -777,6 +788,10 @@ bool GtkUi::MatchEvent(const ui::Event&
   return key_bindings_handler_->MatchEvent(event, commands);
 }
 +void GtkUi::OnDeviceScaleFactorMaybeChanged(void*, GParamSpec*) {
 +  UpdateDeviceScaleFactor();
 +}
 +
 void GtkUi::SetScrollbarColors() {
   thumb_active_color_ = SkColorSetRGB(244, 244, 244);
   thumb_inactive_color_ = SkColorSetRGB(234, 234, 234);
@@ -1037,14 +1052,38 @@ void GtkUi::ResetStyle() {
   native_theme_->NotifyObservers();
 }
 -void GtkUi::UpdateDeviceScaleFactor() {
 -  // Note: Linux chrome currently does not support dynamic DPI
 -  // changes.  This is to allow flags to override the DPI settings
 -  // during startup.
 -  float scale = GetRawDeviceScaleFactor();
 +float GtkUi::GetRawDeviceScaleFactor() {
 +  if (display::Display::HasForceDeviceScaleFactor())
 +    return display::Display::GetForcedDeviceScaleFactor();
 +
 +#if GTK_MAJOR_VERSION == 2
 +  GtkSettings* gtk_settings = gtk_settings_get_default();
 +  gint gtk_dpi = -1;
 +  g_object_get(gtk_settings, "gtk-xft-dpi", &gtk_dpi, nullptr);
 +  const float scale_factor = gtk_dpi / (1024 * kDefaultDPI);
 +#else
 +  GdkScreen* screen = gdk_screen_get_default();
 +  gint scale = gtk_widget_get_scale_factor(fake_window_);
 +  DCHECK_GT(scale, 0);
 +  gdouble resolution = gdk_screen_get_resolution(screen);
 +  const float scale_factor =
 +      resolution <= 0 ? scale : resolution * scale / kDefaultDPI;
 +#endif
 +
   // Blacklist scaling factors <120% (crbug.com/484400) and round
   // to 1 decimal to prevent rendering problems (crbug.com/485183).
 -  device_scale_factor_ = scale < 1.2f ? 1.0f : roundf(scale * 10) / 10;
 +  return scale_factor < 1.2f ? 1.0f : roundf(scale_factor * 10) / 10;
 +}
 +
 +void GtkUi::UpdateDeviceScaleFactor() {
 +  float old_device_scale_factor = device_scale_factor_;
 +  device_scale_factor_ = GetRawDeviceScaleFactor();
 +  if (device_scale_factor_ != old_device_scale_factor) {
 +    for (views::DeviceScaleFactorObserver& observer :
 +         device_scale_factor_observer_list_) {
 +      observer.OnDeviceScaleFactorChanged();
 +    }
 +  }
   UpdateDefaultFont();
 }
 diff -up chromium-60.0.3112.78/chrome/browser/ui/libgtkui/gtk_ui.h.gtk2fix chromium-60.0.3112.78/chrome/browser/ui/libgtkui/gtk_ui.h
 --- chromium-60.0.3112.78/chrome/browser/ui/libgtkui/gtk_ui.h.gtk2fix	2017-08-03 10:35:28.031517634 -0400
 +++ chromium-60.0.3112.78/chrome/browser/ui/libgtkui/gtk_ui.h	2017-08-03 10:37:29.300173415 -0400
@@ -18,12 +18,14 @@
 #include "ui/views/linux_ui/linux_ui.h"
 #include "ui/views/window/frame_buttons.h"
 +typedef struct _GParamSpec GParamSpec;
 typedef struct _GtkStyle GtkStyle;
 typedef struct _GtkWidget GtkWidget;
 namespace libgtkui {
 class Gtk2KeyBindingsHandler;
 class GConfListener;
 +class DeviceScaleFactorObserver;
 // Interface to GTK2 desktop features.
 //
@@ -97,6 +99,10 @@ class GtkUi : public views::LinuxUI {
   bool UnityIsRunning() override;
   NonClientMiddleClickAction GetNonClientMiddleClickAction() override;
   void NotifyWindowManagerStartupComplete() override;
 +  void AddDeviceScaleFactorObserver(
 +      views::DeviceScaleFactorObserver* observer) override;
 +  void RemoveDeviceScaleFactorObserver(
 +      views::DeviceScaleFactorObserver* observer) override;
   // ui::TextEditKeybindingDelegate:
   bool MatchEvent(const ui::Event& event,
@@ -110,6 +116,12 @@ class GtkUi : public views::LinuxUI {
   typedef std::map<int, SkColor> ColorMap;
   typedef std::map<int, color_utils::HSL> TintMap;
 +  CHROMEG_CALLBACK_1(GtkUi,
 +                     void,
 +                     OnDeviceScaleFactorMaybeChanged,
 +                     void*,
 +                     GParamSpec*);
 +
   // This method returns the colors webkit will use for the scrollbars. When no
   // colors are specified by the GTK+ theme, this function averages of the
   // thumb part and of the track colors.
@@ -129,9 +141,12 @@ class GtkUi : public views::LinuxUI {
   bool GetChromeStyleColor(const char* sytle_property,
                            SkColor* ret_color) const;
 +  float GetRawDeviceScaleFactor();
 +
   ui::NativeTheme* native_theme_;
 -  // A GtkWindow object with the class "ChromeGtkFrame".
 +  // On Gtk2, A GtkWindow object with the class "ChromeGtkFrame".  On
 +  // Gtk3, a regular GtkWindow.
   GtkWidget* fake_window_;
   // Colors calculated by LoadGtkValues() that are given to the
@@ -171,7 +186,12 @@ class GtkUi : public views::LinuxUI {
   std::unique_ptr<Gtk2KeyBindingsHandler> key_bindings_handler_;
   // Objects to notify when the window frame button order changes.
 -  base::ObserverList<views::WindowButtonOrderObserver> observer_list_;
 +  base::ObserverList<views::WindowButtonOrderObserver>
 +      window_button_order_observer_list_;
 +
 +  // Objects to notify when the device scale factor changes.
 +  base::ObserverList<views::DeviceScaleFactorObserver>
 +      device_scale_factor_observer_list_;
   // Whether we should lower the window on a middle click to the non client
   // area.
 diff -up chromium-60.0.3112.78/ui/views/linux_ui/device_scale_factor_observer.h.gtk2fix chromium-60.0.3112.78/ui/views/linux_ui/device_scale_factor_observer.h
 --- chromium-60.0.3112.78/ui/views/linux_ui/device_scale_factor_observer.h.gtk2fix	2017-08-03 10:39:23.600963296 -0400
 +++ chromium-60.0.3112.78/ui/views/linux_ui/device_scale_factor_observer.h	2017-08-03 10:39:39.024664885 -0400
@@ -0,0 +1,19 @@
 +// Copyright 2017 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.
 +
 +#ifndef UI_VIEWS_LINUX_UI_DEVICE_SCALE_FACTOR_OBSERVER_H_
 +#define UI_VIEWS_LINUX_UI_DEVICE_SCALE_FACTOR_OBSERVER_H_
 +
 +namespace views {
 +
 +class DeviceScaleFactorObserver {
 + public:
 +  virtual ~DeviceScaleFactorObserver() {}
 +
 +  virtual void OnDeviceScaleFactorChanged() = 0;
 +};
 +
 +}  // namespace views
 +
 +#endif  // UI_VIEWS_LINUX_UI_DEVICE_SCALE_FACTOR_OBSERVER_H_
 diff -up chromium-60.0.3112.78/ui/views/linux_ui/linux_ui.h.gtk2fix chromium-60.0.3112.78/ui/views/linux_ui/linux_ui.h
 --- chromium-60.0.3112.78/ui/views/linux_ui/linux_ui.h.gtk2fix	2017-08-03 10:39:48.866474799 -0400
 +++ chromium-60.0.3112.78/ui/views/linux_ui/linux_ui.h	2017-08-03 10:41:05.598991893 -0400
@@ -38,6 +38,7 @@ class NativeTheme;
 namespace views {
 class Border;
 +class DeviceScaleFactorObserver;
 class LabelButton;
 class LabelButtonBorder;
 class WindowButtonOrderObserver;
@@ -157,6 +158,16 @@ class VIEWS_EXPORT LinuxUI : public ui::
   // Determines the device scale factor of the primary screen.
   virtual float GetDeviceScaleFactor() const = 0;
 +
 +  // Registers |observer| to be notified about changes to the device
 +  // scale factor.
 +  virtual void AddDeviceScaleFactorObserver(
 +      DeviceScaleFactorObserver* observer) = 0;
 +
 +  // Unregisters |observer| from receiving changes to the device scale
 +  // factor.
 +  virtual void RemoveDeviceScaleFactorObserver(
 +      DeviceScaleFactorObserver* observer) = 0;
 };
 }  // namespace views
 diff -up chromium-60.0.3112.78/ui/views/test/desktop_screen_x11_test_api.cc.gtk2fix chromium-60.0.3112.78/ui/views/test/desktop_screen_x11_test_api.cc
 --- chromium-60.0.3112.78/ui/views/test/desktop_screen_x11_test_api.cc.gtk2fix	2017-08-03 10:41:28.014558483 -0400
 +++ chromium-60.0.3112.78/ui/views/test/desktop_screen_x11_test_api.cc	2017-08-03 10:41:49.326146074 -0400
@@ -13,7 +13,7 @@ namespace test {
 void DesktopScreenX11TestApi::UpdateDisplays() {
   DesktopScreenX11* screen =
       static_cast<DesktopScreenX11*>(display::Screen::GetScreen());
 -  screen->ConfigureTimerFired();
 +  screen->UpdateDisplays();
 }
 }  // namespace test
 diff -up chromium-60.0.3112.78/ui/views/widget/desktop_aura/desktop_screen_x11.cc.gtk2fix chromium-60.0.3112.78/ui/views/widget/desktop_aura/desktop_screen_x11.cc
 --- chromium-60.0.3112.78/ui/views/widget/desktop_aura/desktop_screen_x11.cc.gtk2fix	2017-08-03 10:41:59.219954866 -0400
 +++ chromium-60.0.3112.78/ui/views/widget/desktop_aura/desktop_screen_x11.cc	2017-08-03 10:47:16.589818323 -0400
@@ -11,6 +11,7 @@
 #undef RootWindow
 #include "base/logging.h"
 +#include "base/threading/thread_task_runner_handle.h"
 #include "base/trace_event/trace_event.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
@@ -40,10 +41,6 @@ const char* const kAtomsToCache[] = {
   nullptr
 };
 -// The delay to perform configuration after RRNotify.  See the comment
 -// in |Dispatch()|.
 -const int64_t kConfigureDelayMs = 500;
 -
 double GetDeviceScaleFactor() {
   float device_scale_factor = 1.0f;
   if (views::LinuxUI::instance()) {
@@ -95,7 +92,10 @@ DesktopScreenX11::DesktopScreenX11()
       has_xrandr_(false),
       xrandr_event_base_(0),
       primary_display_index_(0),
 +      weak_factory_(this),
       atom_cache_(xdisplay_, kAtomsToCache) {
 +  if (views::LinuxUI::instance())
 +    views::LinuxUI::instance()->AddDeviceScaleFactorObserver(this);
   // We only support 1.3+. There were library changes before this and we should
   // use the new interface instead of the 1.2 one.
   int randr_version_major = 0;
@@ -124,6 +124,8 @@ DesktopScreenX11::DesktopScreenX11()
 }
 DesktopScreenX11::~DesktopScreenX11() {
 +  if (views::LinuxUI::instance())
 +    views::LinuxUI::instance()->AddDeviceScaleFactorObserver(this);
   if (has_xrandr_ && ui::PlatformEventSource::GetInstance())
     ui::PlatformEventSource::GetInstance()->RemovePlatformEventDispatcher(this);
 }
@@ -251,18 +253,7 @@ uint32_t DesktopScreenX11::DispatchEvent
   } else if (event->type - xrandr_event_base_ == RRNotify ||
              (event->type == PropertyNotify &&
               event->xproperty.atom == atom_cache_.GetAtom("_NET_WORKAREA"))) {
 -    // There's some sort of observer dispatch going on here, but I don't think
 -    // it's the screen's?
 -    if (configure_timer_.get() && configure_timer_->IsRunning()) {
 -      configure_timer_->Reset();
 -    } else {
 -      configure_timer_.reset(new base::OneShotTimer());
 -      configure_timer_->Start(
 -          FROM_HERE,
 -          base::TimeDelta::FromMilliseconds(kConfigureDelayMs),
 -          this,
 -          &DesktopScreenX11::ConfigureTimerFired);
 -    }
 +    RestartDelayedConfigurationTask();
   } else {
     NOTREACHED();
   }
@@ -270,11 +261,15 @@ uint32_t DesktopScreenX11::DispatchEvent
   return ui::POST_DISPATCH_NONE;
 }
 +void DesktopScreenX11::OnDeviceScaleFactorChanged() {
 +  RestartDelayedConfigurationTask();
 +}
 +
 // static
 void DesktopScreenX11::UpdateDeviceScaleFactorForTest() {
   DesktopScreenX11* screen =
       static_cast<DesktopScreenX11*>(display::Screen::GetScreen());
 -  screen->ConfigureTimerFired();
 +  screen->UpdateDisplays();
 }
 ////////////////////////////////////////////////////////////////////////////////
@@ -288,7 +283,11 @@ DesktopScreenX11::DesktopScreenX11(
       xrandr_event_base_(0),
       displays_(test_displays),
       primary_display_index_(0),
 -      atom_cache_(xdisplay_, kAtomsToCache) {}
 +      weak_factory_(this),
 +      atom_cache_(xdisplay_, kAtomsToCache) {
 +  if (views::LinuxUI::instance())
 +    views::LinuxUI::instance()->AddDeviceScaleFactorObserver(this);
 +}
 std::vector<display::Display> DesktopScreenX11::BuildDisplaysFromXRandRInfo() {
   std::vector<display::Display> displays;
@@ -390,7 +389,14 @@ std::vector<display::Display> DesktopScr
   return displays;
 }
 -void DesktopScreenX11::ConfigureTimerFired() {
 +void DesktopScreenX11::RestartDelayedConfigurationTask() {
 +  delayed_configuration_task_.Reset(base::Bind(
 +      &DesktopScreenX11::UpdateDisplays, weak_factory_.GetWeakPtr()));
 +  base::ThreadTaskRunnerHandle::Get()->PostTask(
 +      FROM_HERE, delayed_configuration_task_.callback());
 +}
 +
 +void DesktopScreenX11::UpdateDisplays() {
   std::vector<display::Display> old_displays = displays_;
   SetDisplaysInternal(BuildDisplaysFromXRandRInfo());
   change_notifier_.NotifyDisplaysChanged(old_displays, displays_);
 diff -up chromium-60.0.3112.78/ui/views/widget/desktop_aura/desktop_screen_x11.h.gtk2fix chromium-60.0.3112.78/ui/views/widget/desktop_aura/desktop_screen_x11.h
 --- chromium-60.0.3112.78/ui/views/widget/desktop_aura/desktop_screen_x11.h.gtk2fix	2017-08-03 10:47:28.734583288 -0400
 +++ chromium-60.0.3112.78/ui/views/widget/desktop_aura/desktop_screen_x11.h	2017-08-03 10:49:54.850756813 -0400
@@ -9,11 +9,12 @@
 #include <memory>
 +#include "base/cancelable_callback.h"
 #include "base/macros.h"
 -#include "base/timer/timer.h"
 #include "ui/display/display_change_notifier.h"
 #include "ui/display/screen.h"
 #include "ui/events/platform/platform_event_dispatcher.h"
 +#include "ui/views/linux_ui/device_scale_factor_observer.h"
 #include "ui/gfx/x/x11_atom_cache.h"
 #include "ui/views/views_export.h"
@@ -30,7 +31,8 @@ class DesktopScreenX11TestApi;
 // Our singleton screen implementation that talks to xrandr.
 class VIEWS_EXPORT DesktopScreenX11 : public display::Screen,
 -                                      public ui::PlatformEventDispatcher {
 +                                      public ui::PlatformEventDispatcher,
 +                                      public views::DeviceScaleFactorObserver {
  public:
   DesktopScreenX11();
@@ -56,6 +58,9 @@ class VIEWS_EXPORT DesktopScreenX11 : pu
   bool CanDispatchEvent(const ui::PlatformEvent& event) override;
   uint32_t DispatchEvent(const ui::PlatformEvent& event) override;
 +  // views::DeviceScaleFactorObserver:
 +  void OnDeviceScaleFactorChanged() override;
 +
   static void UpdateDeviceScaleFactorForTest();
  private:
@@ -69,10 +74,15 @@ class VIEWS_EXPORT DesktopScreenX11 : pu
   // the X server.
   std::vector<display::Display> BuildDisplaysFromXRandRInfo();
 -  // We delay updating the display so we can coalesce events.
 -  void ConfigureTimerFired();
 +  // Removes |delayed_configuration_task_| from the task queue (if
 +  // it's in the queue) and adds it back at the end of the queue.
 +  void RestartDelayedConfigurationTask();
 +
 +  // Updates |displays_| with the latest XRandR info.
 +  void UpdateDisplays();
 -  // Updates |displays_| and sets FontRenderParams's scale factor.
 +  // Updates |displays_| from |displays| and sets FontRenderParams's scale
 +  // factor.
   void SetDisplaysInternal(const std::vector<display::Display>& displays);
   Display* xdisplay_;
@@ -91,12 +101,14 @@ class VIEWS_EXPORT DesktopScreenX11 : pu
   // The index into displays_ that represents the primary display.
   size_t primary_display_index_;
 -  // The timer to delay configuring outputs. See also the comments in
 -  // Dispatch().
 -  std::unique_ptr<base::OneShotTimer> configure_timer_;
 +  // The task to delay configuring outputs.  We delay updating the
 +  // display so we can coalesce events.
 +  base::CancelableCallback<void()> delayed_configuration_task_;
   display::DisplayChangeNotifier change_notifier_;
 +  base::WeakPtrFactory<DesktopScreenX11> weak_factory_;
 +
   ui::X11AtomCache atom_cache_;
   DISALLOW_COPY_AND_ASSIGN(DesktopScreenX11);
 diff -up chromium-60.0.3112.78/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc.gtk2fix chromium-60.0.3112.78/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc
 --- chromium-60.0.3112.78/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc.gtk2fix	2017-08-03 10:50:14.858370042 -0400
 +++ chromium-60.0.3112.78/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc	2017-08-03 10:52:58.367207187 -0400
@@ -212,13 +212,16 @@ DesktopWindowTreeHostX11::DesktopWindowT
       has_pointer_focus_(false),
       modal_dialog_counter_(0),
       close_widget_factory_(this),
 -      weak_factory_(this) {}
 +      weak_factory_(this) {
 +  display::Screen::GetScreen()->AddObserver(this);
 +}
 DesktopWindowTreeHostX11::~DesktopWindowTreeHostX11() {
   window()->ClearProperty(kHostForRootWindow);
   aura::client::SetWindowMoveClient(window(), NULL);
   desktop_native_widget_aura_->OnDesktopWindowTreeHostDestroyed(this);
   DestroyDispatcher();
 +  display::Screen::GetScreen()->RemoveObserver(this);
 }
 // static
@@ -1360,6 +1363,30 @@ void DesktopWindowTreeHostX11::OnCursorV
 }
 ////////////////////////////////////////////////////////////////////////////////
 +// DesktopWindowTreeHostX11, display::DisplayObserver implementation:
 +
 +void DesktopWindowTreeHostX11::OnDisplayAdded(
 +    const display::Display& new_display) {}
 +
 +void DesktopWindowTreeHostX11::OnDisplayRemoved(
 +    const display::Display& old_display) {}
 +
 +void DesktopWindowTreeHostX11::OnDisplayMetricsChanged(
 +    const display::Display& display,
 +    uint32_t changed_metrics) {
 +  if ((changed_metrics & DISPLAY_METRIC_DEVICE_SCALE_FACTOR) &&
 +      display::Screen::GetScreen()->GetDisplayNearestWindow(window()).id() ==
 +          display.id()) {
 +    // When the scale factor changes, also pretend that a resize
 +    // occured so that the window layout will be refreshed and a
 +    // compositor redraw will be scheduled.  This is weird, but works.
 +    // TODO(thomasanderson): Figure out a more direct way of doing
 +    // this.
 +    RestartDelayedResizeTask();
 +  }
 +}
 +
 +////////////////////////////////////////////////////////////////////////////////
 // DesktopWindowTreeHostX11, private:
 void DesktopWindowTreeHostX11::InitX11Window(
@@ -2079,13 +2106,8 @@ uint32_t DesktopWindowTreeHostX11::Dispa
       if (origin_changed)
         OnHostMovedInPixels(bounds_in_pixels_.origin());
 -      if (size_changed) {
 -        delayed_resize_task_.Reset(base::Bind(
 -            &DesktopWindowTreeHostX11::DelayedResize,
 -            close_widget_factory_.GetWeakPtr(), bounds_in_pixels.size()));
 -        base::ThreadTaskRunnerHandle::Get()->PostTask(
 -            FROM_HERE, delayed_resize_task_.callback());
 -      }
 +      if (size_changed)
 +        RestartDelayedResizeTask();
       break;
     }
     case GenericEvent: {
@@ -2358,6 +2380,14 @@ void DesktopWindowTreeHostX11::EnableEve
     targeter_for_modal_.reset();
 }
 +void DesktopWindowTreeHostX11::RestartDelayedResizeTask() {
 +  delayed_resize_task_.Reset(
 +      base::Bind(&DesktopWindowTreeHostX11::DelayedResize,
 +                 close_widget_factory_.GetWeakPtr(), bounds_in_pixels_.size()));
 +  base::ThreadTaskRunnerHandle::Get()->PostTask(
 +      FROM_HERE, delayed_resize_task_.callback());
 +}
 +
 ////////////////////////////////////////////////////////////////////////////////
 // DesktopWindowTreeHost, public:
 diff -up chromium-60.0.3112.78/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h.gtk2fix chromium-60.0.3112.78/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h
 --- chromium-60.0.3112.78/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h.gtk2fix	2017-08-03 10:54:34.484348046 -0400
 +++ chromium-60.0.3112.78/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h	2017-08-03 10:54:43.564172318 -0400
@@ -18,6 +18,7 @@
 #include "ui/aura/scoped_window_targeter.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/cursor/cursor_loader_x11.h"
 +#include "ui/display/display_observer.h"
 #include "ui/events/platform/platform_event_dispatcher.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/gfx/geometry/rect.h"
@@ -45,7 +46,8 @@ class X11DesktopWindowMoveClient;
 class VIEWS_EXPORT DesktopWindowTreeHostX11
     : public DesktopWindowTreeHost,
       public aura::WindowTreeHost,
 -      public ui::PlatformEventDispatcher {
 +      public ui::PlatformEventDispatcher,
 +      public display::DisplayObserver {
  public:
   DesktopWindowTreeHostX11(
       internal::NativeWidgetDelegate* native_widget_delegate,
@@ -170,6 +172,12 @@ class VIEWS_EXPORT DesktopWindowTreeHost
       const gfx::Point& location_in_pixels) override;
   void OnCursorVisibilityChangedNative(bool show) override;
 +  // Overridden from display::DisplayObserver:
 +  void OnDisplayAdded(const display::Display& new_display) override;
 +  void OnDisplayRemoved(const display::Display& old_display) override;
 +  void OnDisplayMetricsChanged(const display::Display& display,
 +                               uint32_t changed_metrics) override;
 +
  private:
   friend class DesktopWindowTreeHostX11HighDPITest;
   // Initializes our X11 surface to draw on. This method performs all
@@ -278,6 +286,10 @@ class VIEWS_EXPORT DesktopWindowTreeHost
   // Enables event listening after closing |dialog|.
   void EnableEventListening();
 +  // Removes |delayed_resize_task_| from the task queue (if it's in
 +  // the queue) and adds it back at the end of the queue.
 +  void RestartDelayedResizeTask();
 +
   // X11 things
   // The display and the native X window hosting the root window.
   XDisplay* xdisplay_;
--- a/chromium-60.0.3112.90-init-list-hack.patch
+++ b/chromium-60.0.3112.90-init-list-hack.patch
@ -1,27 +0,0 @@
 diff -up chromium-60.0.3112.90/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.cc.tryfix chromium-60.0.3112.90/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.cc
 --- chromium-60.0.3112.90/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.cc.tryfix	2017-08-09 14:45:17.619172987 -0400
 +++ chromium-60.0.3112.90/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.cc	2017-08-11 10:24:10.635245642 -0400
@@ -381,8 +381,9 @@ NGLogicalOffset NGBlockLayoutAlgorithm::
   }
   NGLogicalOffset child_bfc_offset = curr_bfc_offset_;
 -  child_bfc_offset.inline_offset +=
 -      {border_and_padding_.inline_start + curr_child_margins_.inline_start};
 +  LayoutUnit sum_inline_starts = {border_and_padding_.inline_start + curr_child_margins_.inline_start};
 +
 +  child_bfc_offset.inline_offset += sum_inline_starts;
   // Append the current margin strut with child's block start margin.
   // Non empty border/padding, and new FC use cases are handled inside of the
@@ -395,9 +396,8 @@ NGLogicalOffset NGBlockLayoutAlgorithm::
   // Should collapse margins if our child is a legacy block.
   if (IsLegacyBlock(*child)) {
 -    curr_bfc_offset_ +=
 -        {border_and_padding_.inline_start + curr_child_margins_.inline_start,
 -         curr_margin_strut_.Sum()};
 +    LayoutUnit sum_inline_starts2 = {border_and_padding_.inline_start + curr_child_margins_.inline_start};
 +    curr_bfc_offset_ += {sum_inline_starts2, curr_margin_strut_.Sum()};
     MaybeUpdateFragmentBfcOffset(ConstraintSpace(), curr_bfc_offset_,
                                  &container_builder_);
     PositionPendingFloats(curr_bfc_offset_.block_offset, &container_builder_,
--- a/chromium-61.0.3163.79-MOAR-GCC-FIXES.patch
+++ b/chromium-61.0.3163.79-MOAR-GCC-FIXES.patch
@ -1,35 +0,0 @@
 diff -up chromium-61.0.3163.79/base/numerics/safe_math_clang_gcc_impl.h.fixgccagain chromium-61.0.3163.79/base/numerics/safe_math_clang_gcc_impl.h
 --- chromium-61.0.3163.79/base/numerics/safe_math_clang_gcc_impl.h.fixgccagain	2017-09-06 15:48:27.560803028 -0400
 +++ chromium-61.0.3163.79/base/numerics/safe_math_clang_gcc_impl.h	2017-09-06 15:50:08.715853695 -0400
@@ -126,6 +126,7 @@ struct ClampedAddFastOp {
   }
 };
 +#if defined(__clang__)  // Not supported on GCC.
 // This is the fastest negation on Intel, and a decent fallback on arm.
 __attribute__((always_inline)) inline int8_t ClampedNegate(uint8_t value) {
   uint8_t carry;
@@ -169,6 +170,7 @@ __attribute__((always_inline)) inline in
 __attribute__((always_inline)) inline int64_t ClampedNegate(int64_t value) {
   return ClampedNegate(static_cast<uint64_t>(value));
 }
 +#endif
 template <typename T, typename U>
 struct ClampedSubFastOp {
@@ -180,6 +182,7 @@ struct ClampedSubFastOp {
       return ClampedSubFastAsmOp<T, U>::template Do<V>(x, y);
     }
 +#if defined(__clang__)  // Not supported on GCC.
     // Fast path for generic clamped negation.
     if (std::is_same<T, U>::value && std::is_same<U, V>::value &&
         IsCompileTimeConstant(x) && x == 0 && !IsCompileTimeConstant(y)) {
@@ -190,6 +193,7 @@ struct ClampedSubFastOp {
               IntegerBitsPlusSign<T>::value, std::is_signed<T>::value>::type>(
               y));
     }
 +#endif
     V result;
     return !__builtin_sub_overflow(x, y, &result)
--- a/chromium-61.0.3163.79-dde535-gcc-fix.patch
+++ b/chromium-61.0.3163.79-dde535-gcc-fix.patch
@ -1,14 +0,0 @@
 diff -up chromium-61.0.3163.79/content/renderer/service_worker/web_service_worker_installed_scripts_manager_impl.cc.dde5e35 chromium-61.0.3163.79/content/renderer/service_worker/web_service_worker_installed_scripts_manager_impl.cc
 diff -up chromium-61.0.3163.79/services/resource_coordinator/resource_coordinator_service.cc.dde5e35 chromium-61.0.3163.79/services/resource_coordinator/resource_coordinator_service.cc
 --- chromium-61.0.3163.79/services/resource_coordinator/resource_coordinator_service.cc.dde5e35	2017-09-14 10:20:59.750146036 -0400
 +++ chromium-61.0.3163.79/services/resource_coordinator/resource_coordinator_service.cc	2017-09-14 10:21:35.498261516 -0400
@@ -17,7 +17,8 @@ std::unique_ptr<service_manager::Service
   auto resource_coordinator_service =
       base::MakeUnique<ResourceCoordinatorService>();
 -  return resource_coordinator_service;
 +  return std::unique_ptr<service_manager::Service>(
 +      resource_coordinator_service.release());
 }
 ResourceCoordinatorService::ResourceCoordinatorService()
--- a/chromium-61.0.3163.79-epel7-no-nullptr-assignment-on-StructPtr.patch
+++ b/chromium-61.0.3163.79-epel7-no-nullptr-assignment-on-StructPtr.patch
@ -1,12 +0,0 @@
 diff -up chromium-61.0.3163.79/third_party/WebKit/Source/platform/blob/BlobData.cpp.nonullptr chromium-61.0.3163.79/third_party/WebKit/Source/platform/blob/BlobData.cpp
 --- chromium-61.0.3163.79/third_party/WebKit/Source/platform/blob/BlobData.cpp.nonullptr	2017-09-18 11:28:33.541339036 -0400
 +++ chromium-61.0.3163.79/third_party/WebKit/Source/platform/blob/BlobData.cpp	2017-09-18 11:27:35.757799400 -0400
@@ -287,7 +287,7 @@ BlobDataHandle::BlobDataHandle(std::uniq
     size_t current_memory_population = 0;
     Vector<DataElementPtr> elements;
 -    const DataElementPtr null_element = nullptr;
 +    const DataElementPtr null_element;
     BlobBytesProvider* last_bytes_provider = nullptr;
     // TODO(mek): When the mojo code path is the default BlobData should
--- a/chromium-61.0.3163.79-fix-atk-compile.patch
+++ b/chromium-61.0.3163.79-fix-atk-compile.patch
@ -1,12 +0,0 @@
 diff -up chromium-61.0.3163.79/content/browser/accessibility/browser_accessibility_auralinux.cc.fixvarname chromium-61.0.3163.79/content/browser/accessibility/browser_accessibility_auralinux.cc
 --- chromium-61.0.3163.79/content/browser/accessibility/browser_accessibility_auralinux.cc.fixvarname	2017-09-08 13:36:14.985804754 -0400
 +++ chromium-61.0.3163.79/content/browser/accessibility/browser_accessibility_auralinux.cc	2017-09-08 13:36:25.050611274 -0400
@@ -571,7 +571,7 @@ static AtkStateSet* browser_accessibilit
 // it's best to leave this out rather than break people's builds:
 #if defined(ATK_CHECK_VERSION)
 #if ATK_CHECK_VERSION(2, 16, 0)
 -      atk_state_set_add_state(atk_state_set, ATK_STATE_READ_ONLY);
 +      atk_state_set_add_state(state_set, ATK_STATE_READ_ONLY);
 #endif
 #endif
       break;
--- a/chromium-61.0.3163.79-fix-gn-again.patch
+++ b/chromium-61.0.3163.79-fix-gn-again.patch
@ -1,20 +0,0 @@
 diff -up chromium-61.0.3163.79/tools/gn/bootstrap/bootstrap.py.fixit chromium-61.0.3163.79/tools/gn/bootstrap/bootstrap.py
 --- chromium-61.0.3163.79/tools/gn/bootstrap/bootstrap.py.fixit	2017-09-06 15:30:19.199783450 -0400
 +++ chromium-61.0.3163.79/tools/gn/bootstrap/bootstrap.py	2017-09-06 15:31:17.781654042 -0400
@@ -449,6 +449,7 @@ def write_gn_ninja(path, root_gen_dir, o
       'base/metrics/histogram_base.cc',
       'base/metrics/histogram_functions.cc',
       'base/metrics/histogram_samples.cc',
 +      'base/metrics/histogram_snapshot_manager.cc',
       'base/metrics/metrics_hashes.cc',
       'base/metrics/persistent_histogram_allocator.cc',
       'base/metrics/persistent_memory_allocator.cc',
@@ -534,7 +535,7 @@ def write_gn_ninja(path, root_gen_dir, o
       'base/trace_event/heap_profiler_allocation_context_tracker.cc',
       'base/trace_event/heap_profiler_allocation_register.cc',
       'base/trace_event/heap_profiler_event_filter.cc',
 -      'base/trace_event/heap_profiler_event_writer.cc',
 +      'base/trace_event/heap_profiler_heap_dump_writer.cc',
       'base/trace_event/heap_profiler_serialization_state.cc',
       'base/trace_event/heap_profiler_stack_frame_deduplicator.cc',
       'base/trace_event/heap_profiler_type_name_deduplicator.cc',
--- a/chromium-61.0.3163.79-gcc-nc.patch
+++ b/chromium-61.0.3163.79-gcc-nc.patch
@ -1,12 +0,0 @@
 diff -up chromium-61.0.3163.79/content/network/network_service_impl.cc.gcc-nc chromium-61.0.3163.79/content/network/network_service_impl.cc
 --- chromium-61.0.3163.79/content/network/network_service_impl.cc.gcc-nc	2017-09-14 11:15:35.138981701 -0400
 +++ chromium-61.0.3163.79/content/network/network_service_impl.cc	2017-09-14 11:16:15.874070310 -0400
@@ -90,7 +90,7 @@ NetworkServiceImpl::CreateNetworkContext
       base::MakeUnique<NetworkContext>(std::move(request), std::move(params),
                                        std::move(builder));
   *url_request_context = network_context->url_request_context();
 -  return network_context;
 +  return std::unique_ptr<content::NetworkContext>(network_context.release());
 }
 std::unique_ptr<NetworkService> NetworkServiceImpl::CreateForTesting() {
--- a/chromium-61.0.3163.79-gcc5-r1.patch
+++ b/chromium-61.0.3163.79-gcc5-r1.patch
@ -1,67 +0,0 @@
 diff -up chromium-61.0.3163.79/chrome/browser/devtools/devtools_file_system_indexer.cc.gcc5fix chromium-61.0.3163.79/chrome/browser/devtools/devtools_file_system_indexer.cc
 --- chromium-61.0.3163.79/chrome/browser/devtools/devtools_file_system_indexer.cc.gcc5fix	2017-09-06 16:32:34.496782451 -0400
 +++ chromium-61.0.3163.79/chrome/browser/devtools/devtools_file_system_indexer.cc	2017-09-06 16:33:22.053865242 -0400
@@ -34,7 +34,6 @@ using base::TimeDelta;
 using base::TimeTicks;
 using content::BrowserThread;
 using std::map;
 -using std::set;
 using std::string;
 using std::vector;
@@ -191,7 +190,7 @@ vector<FilePath> Index::Search(const str
     if (trigram != kUndefinedTrigram)
       trigrams.push_back(trigram);
   }
 -  set<FileId> file_ids;
 +  std::set<FileId> file_ids;
   bool first = true;
   vector<Trigram>::const_iterator it = trigrams.begin();
   for (; it != trigrams.end(); ++it) {
@@ -203,7 +202,7 @@ vector<FilePath> Index::Search(const str
       first = false;
       continue;
     }
 -    set<FileId> intersection = base::STLSetIntersection<set<FileId> >(
 +    std::set<FileId> intersection = base::STLSetIntersection<std::set<FileId> >(
         file_ids, index_[trigram]);
     file_ids.swap(intersection);
   }
 diff -up chromium-61.0.3163.79/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h.gcc5fix chromium-61.0.3163.79/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h
 --- chromium-61.0.3163.79/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h.gcc5fix	2017-09-06 16:33:35.213611900 -0400
 +++ chromium-61.0.3163.79/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h	2017-09-06 16:34:34.471469606 -0400
@@ -63,7 +63,7 @@ class WTF_EXPORT ArrayBufferContents {
           allocation_length_(0),
           data_(data),
           data_length_(0),
 -          kind_(AllocationKind::kNormal),
 +          kind_(WTF::ArrayBufferContents::AllocationKind::kNormal),
           deleter_(deleter) {}
     DataHandle(void* allocation_base,
                size_t allocation_length,
@@ -94,11 +94,11 @@ class WTF_EXPORT ArrayBufferContents {
              reinterpret_cast<uintptr_t>(allocation_base_) +
                  allocation_length_);
       switch (kind_) {
 -        case AllocationKind::kNormal:
 +        case WTF::ArrayBufferContents::AllocationKind::kNormal:
           DCHECK(deleter_);
           deleter_(data_);
           return;
 -        case AllocationKind::kReservation:
 +        case WTF::ArrayBufferContents::AllocationKind::kReservation:
           ReleaseReservedMemory(allocation_base_, allocation_length_);
           return;
       }
 diff -up chromium-61.0.3163.79/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.gcc5fix chromium-61.0.3163.79/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc
 --- chromium-61.0.3163.79/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.gcc5fix	2017-09-06 16:34:51.959131969 -0400
 +++ chromium-61.0.3163.79/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc	2017-09-06 16:35:03.027919336 -0400
@@ -10,7 +10,7 @@
 #include "webrtc/modules/audio_processing/aec3/aec_state.h"
 -#include <math.h>
 +#include <cmath>
 #include <numeric>
 #include <vector>
--- a/chromium-61.0.3163.79-gcc7.patch
+++ b/chromium-61.0.3163.79-gcc7.patch
@ -1,12 +0,0 @@
 diff -up chromium-61.0.3163.79/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h.gcc7 chromium-61.0.3163.79/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h
 --- chromium-61.0.3163.79/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h.gcc7	2017-09-05 15:05:41.000000000 -0400
 +++ chromium-61.0.3163.79/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h	2017-09-06 14:01:52.461097821 -0400
@@ -8,6 +8,7 @@
 #include "platform/PlatformExport.h"
 #include "platform/wtf/ThreadSpecific.h"
 +#include <functional>
 #include <memory>
 namespace gpu {
 diff -up chromium-61.0.3163.79/v8/src/objects/hash-table.h.gcc7 chromium-61.0.3163.79/v8/src/objects/hash-table.h
--- a/chromium-61.0.3163.79-gtk2fix.patch
+++ b/chromium-61.0.3163.79-gtk2fix.patch
@ -1,23 +0,0 @@
 diff -up chromium-61.0.3163.79/chrome/browser/ui/libgtkui/gtk_ui.cc.gtk2fix chromium-61.0.3163.79/chrome/browser/ui/libgtkui/gtk_ui.cc
 --- chromium-61.0.3163.79/chrome/browser/ui/libgtkui/gtk_ui.cc.gtk2fix	2017-09-07 15:40:40.904966476 -0400
 +++ chromium-61.0.3163.79/chrome/browser/ui/libgtkui/gtk_ui.cc	2017-09-07 15:42:23.829987464 -0400
@@ -1052,11 +1052,19 @@ float GtkUi::GetRawDeviceScaleFactor() {
   if (display::Display::HasForceDeviceScaleFactor())
     return display::Display::GetForcedDeviceScaleFactor();
 +#if GTK_MAJOR_VERSION == 2
 +  GtkSettings* gtk_settings = gtk_settings_get_default();
 +  gint gtk_dpi = -1;
 +  g_object_get(gtk_settings, "gtk-xft-dpi", &gtk_dpi, nullptr);
 +  const float scale_factor = gtk_dpi / (1024 * kDefaultDPI);
 +#else
   GdkScreen* screen = gdk_screen_get_default();
   gint scale = gtk_widget_get_scale_factor(fake_window_);
   gdouble resolution = gdk_screen_get_resolution(screen);
   const float scale_factor =
       resolution <= 0 ? scale : resolution * scale / kDefaultDPI;
 +#endif
 +
   // Blacklist scaling factors <120% (crbug.com/484400) and round
   // to 1 decimal to prevent rendering problems (crbug.com/485183).
   return scale_factor < 1.2f ? 1.0f : roundf(scale_factor * 10) / 10;
--- a/chromium-61.0.3163.79-kmaxskip-constexpr.patch
+++ b/chromium-61.0.3163.79-kmaxskip-constexpr.patch
@ -1,12 +0,0 @@
 diff -up chromium-61.0.3163.79/cc/paint/paint_op_buffer.cc.kmaxskip chromium-61.0.3163.79/cc/paint/paint_op_buffer.cc
 --- chromium-61.0.3163.79/cc/paint/paint_op_buffer.cc.kmaxskip	2017-09-14 09:28:18.594875170 -0400
 +++ chromium-61.0.3163.79/cc/paint/paint_op_buffer.cc	2017-09-14 09:29:37.266072373 -0400
@@ -207,7 +207,7 @@ TYPES(M);
 #undef TYPES
 SkRect PaintOp::kUnsetRect = {SK_ScalarInfinity, 0, 0, 0};
 -const size_t PaintOp::kMaxSkip;
 +constexpr size_t PaintOp::kMaxSkip;
 std::string PaintOpTypeToString(PaintOpType type) {
   switch (type) {
--- a/chromium-61.0.3163.79-rvalue-fix.patch
+++ b/chromium-61.0.3163.79-rvalue-fix.patch
@ -1,36 +0,0 @@
 diff -up chromium-61.0.3163.100/chrome/browser/ui/webui/settings/on_startup_handler.cc.another-rvalue-fix chromium-61.0.3163.100/chrome/browser/ui/webui/settings/on_startup_handler.cc
 --- chromium-61.0.3163.100/chrome/browser/ui/webui/settings/on_startup_handler.cc.another-rvalue-fix	2017-09-22 17:50:14.247727636 -0400
 +++ chromium-61.0.3163.100/chrome/browser/ui/webui/settings/on_startup_handler.cc	2017-09-22 17:50:25.626492965 -0400
@@ -77,7 +77,7 @@ std::unique_ptr<base::Value> OnStartupHa
                    !extensions::ExtensionSystem::Get(profile_)
                         ->management_policy()
                         ->MustRemainEnabled(ntp_extension, nullptr));
 -  return dict;
 +  return std::move(dict);
 }
 void OnStartupHandler::HandleGetNtpExtension(const base::ListValue* args) {
 diff -up chromium-61.0.3163.100/ui/message_center/views/notification_header_view.cc.another-rvalue-fix chromium-61.0.3163.100/ui/message_center/views/notification_header_view.cc
 --- chromium-61.0.3163.100/ui/message_center/views/notification_header_view.cc.another-rvalue-fix	2017-09-21 18:05:24.000000000 -0400
 +++ chromium-61.0.3163.100/ui/message_center/views/notification_header_view.cc	2017-09-22 10:14:15.680987910 -0400
@@ -321,7 +321,7 @@ std::unique_ptr<views::InkDrop> Notifica
   ink_drop->SetAutoHighlightMode(
       views::InkDropImpl::AutoHighlightMode::SHOW_ON_RIPPLE);
   ink_drop->SetShowHighlightOnHover(false);
 -  return ink_drop;
 +  return std::move(ink_drop);
 }
 std::unique_ptr<views::InkDropRipple>
 diff -up chromium-61.0.3163.100/ui/views/controls/button/checkbox.cc.another-rvalue-fix chromium-61.0.3163.100/ui/views/controls/button/checkbox.cc
 --- chromium-61.0.3163.100/ui/views/controls/button/checkbox.cc.another-rvalue-fix	2017-09-22 14:46:36.109955800 -0400
 +++ chromium-61.0.3163.100/ui/views/controls/button/checkbox.cc	2017-09-22 14:46:48.736698401 -0400
@@ -195,7 +195,7 @@ std::unique_ptr<InkDrop> Checkbox::Creat
   std::unique_ptr<InkDropImpl> ink_drop = CreateDefaultInkDropImpl();
   ink_drop->SetShowHighlightOnHover(false);
   ink_drop->SetAutoHighlightMode(InkDropImpl::AutoHighlightMode::NONE);
 -  return ink_drop;
 +  return std::move(ink_drop);
 }
 std::unique_ptr<InkDropRipple> Checkbox::CreateInkDropRipple() const {
--- a/chromium-61.0.3163.79-uglyhack.patch
+++ b/chromium-61.0.3163.79-uglyhack.patch
@ -1,12 +0,0 @@
 diff -up chromium-61.0.3163.79/mojo/public/cpp/bindings/struct_ptr.h.uglyhack chromium-61.0.3163.79/mojo/public/cpp/bindings/struct_ptr.h
 --- chromium-61.0.3163.79/mojo/public/cpp/bindings/struct_ptr.h.uglyhack	2017-09-14 14:01:32.168409717 -0400
 +++ chromium-61.0.3163.79/mojo/public/cpp/bindings/struct_ptr.h	2017-09-14 14:01:40.478219060 -0400
@@ -107,7 +107,7 @@ class StructPtr {
   std::unique_ptr<Struct> ptr_;
 -  DISALLOW_COPY_AND_ASSIGN(StructPtr);
 +  // DISALLOW_COPY_AND_ASSIGN(StructPtr);
 };
 template <typename T>
--- a/chromium-63.0.3289.84-enable-mp3.patch
+++ b/chromium-63.0.3289.84-enable-mp3.patch
@ -1,22 +1,33 @@
-diff -up chromium-61.0.3163.79/components/neterror/resources/sounds/button-press.mp3 chromium-61.0.3163.79/components/neterror/resources/sounds/button-press
+diff -up chromium-63.0.3239.84/components/neterror/resources/sounds/button-press.mp3 chromium-63.0.3239.84/components/neterror/resources/sounds/button-press
-diff -up chromium-61.0.3163.79/components/neterror/resources/sounds/hit.mp3 chromium-61.0.3163.79/components/neterror/resources/sounds/hit
+diff -up chromium-63.0.3239.84/components/neterror/resources/sounds/hit.mp3 chromium-63.0.3239.84/components/neterror/resources/sounds/hit
-diff -up chromium-61.0.3163.79/components/neterror/resources/sounds/score-reached.mp3 chromium-61.0.3163.79/components/neterror/resources/sounds/score-reached
+diff -up chromium-63.0.3239.84/components/neterror/resources/sounds/score-reached.mp3 chromium-63.0.3239.84/components/neterror/resources/sounds/score-reached
-diff -up chromium-61.0.3163.79/media/base/mime_util_internal.cc.mp3 chromium-61.0.3163.79/media/base/mime_util_internal.cc
+diff -up chromium-63.0.3239.84/media/base/mime_util_internal.cc.mp3 chromium-63.0.3239.84/media/base/mime_util_internal.cc
--- chromium-61.0.3163.79/media/base/mime_util_internal.cc.mp3	2017-09-05 15:05:21.000000000 -0400
+--- chromium-63.0.3239.84/media/base/mime_util_internal.cc.mp3	2017-12-06 15:05:29.000000000 -0500
-+++ chromium-61.0.3163.79/media/base/mime_util_internal.cc	2017-09-06 14:11:44.426683599 -0400
+++ chromium-63.0.3239.84/media/base/mime_util_internal.cc	2017-12-07 10:52:02.472510232 -0500
-@@ -278,10 +278,10 @@ void MimeUtil::AddSupportedMediaFormats(
+@@ -266,15 +266,19 @@ void MimeUtil::AddSupportedMediaFormats(
   CodecSet webm_codecs(webm_audio_codecs);
   webm_codecs.insert(webm_video_codecs.begin(), webm_video_codecs.end());
 -#if BUILDFLAG(USE_PROPRIETARY_CODECS)
-   CodecSet mp3_codecs;
+   const CodecSet mp3_codecs{MP3};
-   mp3_codecs.insert(MP3);
+#if BUILDFLAG(USE_PROPRIETARY_CODECS)
   const CodecSet aac{MPEG2_AAC, MPEG4_AAC};
 +#else
 +  const CodecSet aac{};
 +#endif
 +  CodecSet mp4_audio_codecs(aac);
 +  mp4_audio_codecs.emplace(MP3);
 +#if BUILDFLAG(USE_PROPRIETARY_CODECS)
-   CodecSet aac;
+   CodecSet avc_and_aac(aac);
-   aac.insert(MPEG2_AAC);
+   avc_and_aac.emplace(H264);
-   aac.insert(MPEG4_AAC);
+ 
-@@ -325,10 +325,10 @@ void MimeUtil::AddSupportedMediaFormats(
+-  CodecSet mp4_audio_codecs(aac);
 -  mp4_audio_codecs.emplace(MP3);
   mp4_audio_codecs.emplace(FLAC);
 #if BUILDFLAG(ENABLE_AC3_EAC3_AUDIO_DEMUXING)
   mp4_audio_codecs.emplace(AC3);
@@ -311,10 +315,10 @@ void MimeUtil::AddSupportedMediaFormats(
   AddContainerWithCodecs("application/ogg", ogg_codecs, false);
   AddContainerWithCodecs("audio/flac", implicit_codec, false);
@ -28,7 +39,7 @@ diff -up chromium-61.0.3163.79/media/base/mime_util_internal.cc.mp3 chromium-61.
   AddContainerWithCodecs("audio/aac", implicit_codec, true);  // AAC / ADTS.
   AddContainerWithCodecs("audio/mp4", mp4_audio_codecs, true);
   DCHECK(!mp4_video_codecs.empty());
-@@ -933,7 +933,6 @@ bool MimeUtil::IsCodecProprietary(Codec
+@@ -935,7 +939,6 @@ bool MimeUtil::IsCodecProprietary(Codec
     case INVALID_CODEC:
     case AC3:
     case EAC3:
@ -36,7 +47,7 @@ diff -up chromium-61.0.3163.79/media/base/mime_util_internal.cc.mp3 chromium-61.
     case MPEG2_AAC:
     case MPEG4_AAC:
     case H264:
-@@ -941,6 +940,7 @@ bool MimeUtil::IsCodecProprietary(Codec
+@@ -943,6 +946,7 @@ bool MimeUtil::IsCodecProprietary(Codec
     case DOLBY_VISION:
       return true;
@ -44,10 +55,10 @@ diff -up chromium-61.0.3163.79/media/base/mime_util_internal.cc.mp3 chromium-61.
     case PCM:
     case VORBIS:
     case OPUS:
-diff -up chromium-61.0.3163.79/media/formats/BUILD.gn.mp3 chromium-61.0.3163.79/media/formats/BUILD.gn
+diff -up chromium-63.0.3239.84/media/formats/BUILD.gn.mp3 chromium-63.0.3239.84/media/formats/BUILD.gn
--- chromium-61.0.3163.79/media/formats/BUILD.gn.mp3	2017-09-05 15:05:21.000000000 -0400
+--- chromium-63.0.3239.84/media/formats/BUILD.gn.mp3	2017-12-06 15:05:29.000000000 -0500
-+++ chromium-61.0.3163.79/media/formats/BUILD.gn	2017-09-06 14:11:44.427683579 -0400
+++ chromium-63.0.3239.84/media/formats/BUILD.gn	2017-12-07 10:52:02.473510212 -0500
-@@ -12,6 +12,14 @@ source_set("formats") {
+@@ -20,6 +20,14 @@ source_set("formats") {
     "ac3/ac3_util.h",
     "common/offset_byte_queue.cc",
     "common/offset_byte_queue.h",
@ -62,7 +73,7 @@ diff -up chromium-61.0.3163.79/media/formats/BUILD.gn.mp3 chromium-61.0.3163.79/
     "webm/webm_audio_client.cc",
     "webm/webm_audio_client.h",
     "webm/webm_cluster_parser.cc",
-@@ -76,14 +84,6 @@ source_set("formats") {
+@@ -81,14 +89,6 @@ source_set("formats") {
       "mp4/sample_to_group_iterator.h",
       "mp4/track_run_iterator.cc",
       "mp4/track_run_iterator.h",
@ -77,20 +88,20 @@ diff -up chromium-61.0.3163.79/media/formats/BUILD.gn.mp3 chromium-61.0.3163.79/
     ]
   }
-diff -up chromium-61.0.3163.79/third_party/catapult/third_party/gsutil/gslib/tests/test_data/test.mp3 chromium-61.0.3163.79/third_party/catapult/third_party/gsutil/gslib/tests/test_data/test
+diff -up chromium-63.0.3239.84/third_party/catapult/third_party/gsutil/gslib/tests/test_data/test.mp3 chromium-63.0.3239.84/third_party/catapult/third_party/gsutil/gslib/tests/test_data/test
-diff -up chromium-61.0.3163.79/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/config.h.mp3 chromium-61.0.3163.79/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/config.h
+diff -up chromium-63.0.3239.84/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/config.h.mp3 chromium-63.0.3239.84/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/config.h
--- chromium-61.0.3163.79/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/config.h.mp3	2017-09-06 10:13:19.000000000 -0400
+--- chromium-63.0.3239.84/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/config.h.mp3	2017-12-07 09:51:37.000000000 -0500
-+++ chromium-61.0.3163.79/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/config.h	2017-09-06 14:16:00.576744161 -0400
+++ chromium-63.0.3239.84/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/config.h	2017-12-07 11:08:41.116117073 -0500
@@ -1,7 +1,7 @@
 /* Automatically generated by configure - do not modify! */
 #ifndef FFMPEG_CONFIG_H
 #define FFMPEG_CONFIG_H
-#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-nvenc --disable-cuda --disable-cuvid --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/ssd/chrome/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-cross-compile --cross-prefix=/usr/bin/aarch64-linux-gnu- --target-os=linux --arch=aarch64 --enable-armv8 --extra-cflags='-march=armv8-a' --enable-pic"
+-#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/ssd/blink3/src/third_party/opus/src/include --disable-linux-perf --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-cross-compile --cross-prefix=/usr/bin/aarch64-linux-gnu- --target-os=linux --arch=aarch64 --enable-armv8 --extra-cflags='-march=armv8-a' --enable-pic"
-+#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-nvenc --disable-cuda --disable-cuvid --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/ssd/chrome/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-cross-compile --cross-prefix=/usr/bin/aarch64-linux-gnu- --target-os=linux --arch=aarch64 --enable-armv8 --extra-cflags='-march=armv8-a' --enable-pic --enable-decoder='mp3' --enable-demuxer='mp3' --enable-parser='mpegaudio'"
+#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/ssd/blink3/src/third_party/opus/src/include --disable-linux-perf --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-cross-compile --cross-prefix=/usr/bin/aarch64-linux-gnu- --target-os=linux --arch=aarch64 --enable-armv8 --extra-cflags='-march=armv8-a' --enable-pic --enable-decoder='mp3' --enable-demuxer='mp3' --enable-parser='mpegaudio'"
 #define FFMPEG_LICENSE "LGPL version 2.1 or later"
 #define CONFIG_THIS_YEAR 2017
 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
-@@ -542,7 +542,7 @@
+@@ -547,7 +547,7 @@
 #define CONFIG_FFPROBE 0
 #define CONFIG_FFSERVER 0
 #define CONFIG_FFMPEG 0
@ -99,7 +110,7 @@ diff -up chromium-61.0.3163.79/third_party/ffmpeg/chromium/config/Chromium/linux
 #define CONFIG_DWT 0
 #define CONFIG_ERROR_RESILIENCE 0
 #define CONFIG_FAAN 1
-@@ -620,9 +620,9 @@
+@@ -626,9 +626,9 @@
 #define CONFIG_LZF 0
 #define CONFIG_ME_CMP 0
 #define CONFIG_MPEG_ER 0
@ -112,7 +123,7 @@ diff -up chromium-61.0.3163.79/third_party/ffmpeg/chromium/config/Chromium/linux
 #define CONFIG_MPEGVIDEO 0
 #define CONFIG_MPEGVIDEOENC 0
 #define CONFIG_MSS34DSP 0
-@@ -968,7 +968,7 @@
+@@ -979,7 +979,7 @@
 #define CONFIG_MP1FLOAT_DECODER 0
 #define CONFIG_MP2_DECODER 0
 #define CONFIG_MP2FLOAT_DECODER 0
@ -121,7 +132,7 @@ diff -up chromium-61.0.3163.79/third_party/ffmpeg/chromium/config/Chromium/linux
 #define CONFIG_MP3FLOAT_DECODER 0
 #define CONFIG_MP3ADU_DECODER 0
 #define CONFIG_MP3ADUFLOAT_DECODER 0
-@@ -1275,7 +1275,7 @@
+@@ -1292,7 +1292,7 @@
 #define CONFIG_MM_DEMUXER 0
 #define CONFIG_MMF_DEMUXER 0
 #define CONFIG_MOV_DEMUXER 0
@ -130,7 +141,7 @@ diff -up chromium-61.0.3163.79/third_party/ffmpeg/chromium/config/Chromium/linux
 #define CONFIG_MPC_DEMUXER 0
 #define CONFIG_MPC8_DEMUXER 0
 #define CONFIG_MPEGPS_DEMUXER 0
-@@ -2217,7 +2217,7 @@
+@@ -2267,7 +2267,7 @@
 #define CONFIG_MJPEG_PARSER 0
 #define CONFIG_MLP_PARSER 0
 #define CONFIG_MPEG4VIDEO_PARSER 0
@ -139,19 +150,19 @@ diff -up chromium-61.0.3163.79/third_party/ffmpeg/chromium/config/Chromium/linux
 #define CONFIG_MPEGVIDEO_PARSER 0
 #define CONFIG_OPUS_PARSER 1
 #define CONFIG_PNG_PARSER 0
-diff -up chromium-61.0.3163.79/third_party/ffmpeg/chromium/config/Chromium/linux/arm/config.h.mp3 chromium-61.0.3163.79/third_party/ffmpeg/chromium/config/Chromium/linux/arm/config.h
+diff -up chromium-63.0.3239.84/third_party/ffmpeg/chromium/config/Chromium/linux/arm/config.h.mp3 chromium-63.0.3239.84/third_party/ffmpeg/chromium/config/Chromium/linux/arm/config.h
--- chromium-61.0.3163.79/third_party/ffmpeg/chromium/config/Chromium/linux/arm/config.h.mp3	2017-09-06 10:13:19.000000000 -0400
+--- chromium-63.0.3239.84/third_party/ffmpeg/chromium/config/Chromium/linux/arm/config.h.mp3	2017-12-07 09:51:37.000000000 -0500
-+++ chromium-61.0.3163.79/third_party/ffmpeg/chromium/config/Chromium/linux/arm/config.h	2017-09-06 14:17:14.964310036 -0400
+++ chromium-63.0.3239.84/third_party/ffmpeg/chromium/config/Chromium/linux/arm/config.h	2017-12-07 11:09:23.602291820 -0500
@@ -1,7 +1,7 @@
 /* Automatically generated by configure - do not modify! */
 #ifndef FFMPEG_CONFIG_H
 #define FFMPEG_CONFIG_H
-#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-nvenc --disable-cuda --disable-cuvid --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/home/jrummell/chrome_root/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=arm --enable-armv6 --enable-armv6t2 --enable-vfp --enable-thumb --extra-cflags='-march=armv7-a' --enable-cross-compile --target-os=linux --cross-prefix=armv7a-cros-linux-gnueabi- --extra-cflags='-mtune=cortex-a8' --extra-cflags='-mfloat-abi=hard' --disable-neon --extra-cflags='-mfpu=vfpv3-d16' --enable-pic"
+-#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/home/chcunningham/chrome_root/src/third_party/opus/src/include --disable-linux-perf --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=arm --enable-armv6 --enable-armv6t2 --enable-vfp --enable-thumb --extra-cflags='-march=armv7-a' --enable-cross-compile --target-os=linux --cross-prefix=armv7a-cros-linux-gnueabi- --extra-cflags='-mtune=cortex-a8' --extra-cflags='-mfloat-abi=hard' --disable-neon --extra-cflags='-mfpu=vfpv3-d16' --enable-pic"
-+#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-nvenc --disable-cuda --disable-cuvid --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/home/jrummell/chrome_root/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=arm --enable-armv6 --enable-armv6t2 --enable-vfp --enable-thumb --extra-cflags='-march=armv7-a' --enable-cross-compile --target-os=linux --cross-prefix=armv7a-cros-linux-gnueabi- --extra-cflags='-mtune=cortex-a8' --extra-cflags='-mfloat-abi=hard' --disable-neon --extra-cflags='-mfpu=vfpv3-d16' --enable-pic --enable-decoder='mp3' --enable-demuxer='mp3' --enable-parser='mpegaudio'"
+#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/home/chcunningham/chrome_root/src/third_party/opus/src/include --disable-linux-perf --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=arm --enable-armv6 --enable-armv6t2 --enable-vfp --enable-thumb --extra-cflags='-march=armv7-a' --enable-cross-compile --target-os=linux --cross-prefix=armv7a-cros-linux-gnueabi- --extra-cflags='-mtune=cortex-a8' --extra-cflags='-mfloat-abi=hard' --disable-neon --extra-cflags='-mfpu=vfpv3-d16' --enable-pic --enable-decoder='mp3' --enable-demuxer='mp3' --enable-parser='mpegaudio'"
 #define FFMPEG_LICENSE "LGPL version 2.1 or later"
 #define CONFIG_THIS_YEAR 2017
 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
-@@ -542,7 +542,7 @@
+@@ -547,7 +547,7 @@
 #define CONFIG_FFPROBE 0
 #define CONFIG_FFSERVER 0
 #define CONFIG_FFMPEG 0
@ -160,7 +171,7 @@ diff -up chromium-61.0.3163.79/third_party/ffmpeg/chromium/config/Chromium/linux
 #define CONFIG_DWT 0
 #define CONFIG_ERROR_RESILIENCE 0
 #define CONFIG_FAAN 1
-@@ -620,9 +620,9 @@
+@@ -626,9 +626,9 @@
 #define CONFIG_LZF 0
 #define CONFIG_ME_CMP 0
 #define CONFIG_MPEG_ER 0
@ -173,7 +184,7 @@ diff -up chromium-61.0.3163.79/third_party/ffmpeg/chromium/config/Chromium/linux
 #define CONFIG_MPEGVIDEO 0
 #define CONFIG_MPEGVIDEOENC 0
 #define CONFIG_MSS34DSP 0
-@@ -968,7 +968,7 @@
+@@ -979,7 +979,7 @@
 #define CONFIG_MP1FLOAT_DECODER 0
 #define CONFIG_MP2_DECODER 0
 #define CONFIG_MP2FLOAT_DECODER 0
@ -182,7 +193,7 @@ diff -up chromium-61.0.3163.79/third_party/ffmpeg/chromium/config/Chromium/linux
 #define CONFIG_MP3FLOAT_DECODER 0
 #define CONFIG_MP3ADU_DECODER 0
 #define CONFIG_MP3ADUFLOAT_DECODER 0
-@@ -1275,7 +1275,7 @@
+@@ -1292,7 +1292,7 @@
 #define CONFIG_MM_DEMUXER 0
 #define CONFIG_MMF_DEMUXER 0
 #define CONFIG_MOV_DEMUXER 0
@ -191,7 +202,7 @@ diff -up chromium-61.0.3163.79/third_party/ffmpeg/chromium/config/Chromium/linux
 #define CONFIG_MPC_DEMUXER 0
 #define CONFIG_MPC8_DEMUXER 0
 #define CONFIG_MPEGPS_DEMUXER 0
-@@ -2217,7 +2217,7 @@
+@@ -2267,7 +2267,7 @@
 #define CONFIG_MJPEG_PARSER 0
 #define CONFIG_MLP_PARSER 0
 #define CONFIG_MPEG4VIDEO_PARSER 0
@ -200,19 +211,19 @@ diff -up chromium-61.0.3163.79/third_party/ffmpeg/chromium/config/Chromium/linux
 #define CONFIG_MPEGVIDEO_PARSER 0
 #define CONFIG_OPUS_PARSER 1
 #define CONFIG_PNG_PARSER 0
-diff -up chromium-61.0.3163.79/third_party/ffmpeg/chromium/config/Chromium/linux/arm-neon/config.h.mp3 chromium-61.0.3163.79/third_party/ffmpeg/chromium/config/Chromium/linux/arm-neon/config.h
+diff -up chromium-63.0.3239.84/third_party/ffmpeg/chromium/config/Chromium/linux/arm-neon/config.h.mp3 chromium-63.0.3239.84/third_party/ffmpeg/chromium/config/Chromium/linux/arm-neon/config.h
--- chromium-61.0.3163.79/third_party/ffmpeg/chromium/config/Chromium/linux/arm-neon/config.h.mp3	2017-09-06 10:13:19.000000000 -0400
+--- chromium-63.0.3239.84/third_party/ffmpeg/chromium/config/Chromium/linux/arm-neon/config.h.mp3	2017-12-07 09:51:37.000000000 -0500
-+++ chromium-61.0.3163.79/third_party/ffmpeg/chromium/config/Chromium/linux/arm-neon/config.h	2017-09-06 14:17:45.634718576 -0400
+++ chromium-63.0.3239.84/third_party/ffmpeg/chromium/config/Chromium/linux/arm-neon/config.h	2017-12-07 11:09:49.945779754 -0500
@@ -1,7 +1,7 @@
 /* Automatically generated by configure - do not modify! */
 #ifndef FFMPEG_CONFIG_H
 #define FFMPEG_CONFIG_H
-#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-nvenc --disable-cuda --disable-cuvid --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/home/jrummell/chrome_root/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=arm --enable-armv6 --enable-armv6t2 --enable-vfp --enable-thumb --extra-cflags='-march=armv7-a' --enable-cross-compile --target-os=linux --cross-prefix=armv7a-cros-linux-gnueabi- --extra-cflags='-mtune=cortex-a8' --extra-cflags='-mfloat-abi=hard' --enable-neon --extra-cflags='-mfpu=neon' --enable-pic"
+-#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/home/chcunningham/chrome_root/src/third_party/opus/src/include --disable-linux-perf --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=arm --enable-armv6 --enable-armv6t2 --enable-vfp --enable-thumb --extra-cflags='-march=armv7-a' --enable-cross-compile --target-os=linux --cross-prefix=armv7a-cros-linux-gnueabi- --extra-cflags='-mtune=cortex-a8' --extra-cflags='-mfloat-abi=hard' --enable-neon --extra-cflags='-mfpu=neon' --enable-pic"
-+#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-nvenc --disable-cuda --disable-cuvid --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/home/jrummell/chrome_root/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=arm --enable-armv6 --enable-armv6t2 --enable-vfp --enable-thumb --extra-cflags='-march=armv7-a' --enable-cross-compile --target-os=linux --cross-prefix=armv7a-cros-linux-gnueabi- --extra-cflags='-mtune=cortex-a8' --extra-cflags='-mfloat-abi=hard' --enable-neon --extra-cflags='-mfpu=neon' --enable-pic --enable-decoder='mp3' --enable-demuxer='mp3' --enable-parser='mpegaudio'"
+#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/home/chcunningham/chrome_root/src/third_party/opus/src/include --disable-linux-perf --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=arm --enable-armv6 --enable-armv6t2 --enable-vfp --enable-thumb --extra-cflags='-march=armv7-a' --enable-cross-compile --target-os=linux --cross-prefix=armv7a-cros-linux-gnueabi- --extra-cflags='-mtune=cortex-a8' --extra-cflags='-mfloat-abi=hard' --enable-neon --extra-cflags='-mfpu=neon' --enable-pic --enable-decoder='mp3' --enable-demuxer='mp3' --enable-parser='mpegaudio'"
 #define FFMPEG_LICENSE "LGPL version 2.1 or later"
 #define CONFIG_THIS_YEAR 2017
 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
-@@ -542,7 +542,7 @@
+@@ -547,7 +547,7 @@
 #define CONFIG_FFPROBE 0
 #define CONFIG_FFSERVER 0
 #define CONFIG_FFMPEG 0
@ -221,7 +232,7 @@ diff -up chromium-61.0.3163.79/third_party/ffmpeg/chromium/config/Chromium/linux
 #define CONFIG_DWT 0
 #define CONFIG_ERROR_RESILIENCE 0
 #define CONFIG_FAAN 1
-@@ -620,9 +620,9 @@
+@@ -626,9 +626,9 @@
 #define CONFIG_LZF 0
 #define CONFIG_ME_CMP 0
 #define CONFIG_MPEG_ER 0
@ -234,7 +245,7 @@ diff -up chromium-61.0.3163.79/third_party/ffmpeg/chromium/config/Chromium/linux
 #define CONFIG_MPEGVIDEO 0
 #define CONFIG_MPEGVIDEOENC 0
 #define CONFIG_MSS34DSP 0
-@@ -968,7 +968,7 @@
+@@ -979,7 +979,7 @@
 #define CONFIG_MP1FLOAT_DECODER 0
 #define CONFIG_MP2_DECODER 0
 #define CONFIG_MP2FLOAT_DECODER 0
@ -243,7 +254,7 @@ diff -up chromium-61.0.3163.79/third_party/ffmpeg/chromium/config/Chromium/linux
 #define CONFIG_MP3FLOAT_DECODER 0
 #define CONFIG_MP3ADU_DECODER 0
 #define CONFIG_MP3ADUFLOAT_DECODER 0
-@@ -1275,7 +1275,7 @@
+@@ -1292,7 +1292,7 @@
 #define CONFIG_MM_DEMUXER 0
 #define CONFIG_MMF_DEMUXER 0
 #define CONFIG_MOV_DEMUXER 0
@ -252,7 +263,7 @@ diff -up chromium-61.0.3163.79/third_party/ffmpeg/chromium/config/Chromium/linux
 #define CONFIG_MPC_DEMUXER 0
 #define CONFIG_MPC8_DEMUXER 0
 #define CONFIG_MPEGPS_DEMUXER 0
-@@ -2217,7 +2217,7 @@
+@@ -2267,7 +2267,7 @@
 #define CONFIG_MJPEG_PARSER 0
 #define CONFIG_MLP_PARSER 0
 #define CONFIG_MPEG4VIDEO_PARSER 0
@ -261,19 +272,19 @@ diff -up chromium-61.0.3163.79/third_party/ffmpeg/chromium/config/Chromium/linux
 #define CONFIG_MPEGVIDEO_PARSER 0
 #define CONFIG_OPUS_PARSER 1
 #define CONFIG_PNG_PARSER 0
-diff -up chromium-61.0.3163.79/third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h.mp3 chromium-61.0.3163.79/third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h
+diff -up chromium-63.0.3239.84/third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h.mp3 chromium-63.0.3239.84/third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h
--- chromium-61.0.3163.79/third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h.mp3	2017-09-06 10:13:19.000000000 -0400
+--- chromium-63.0.3239.84/third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h.mp3	2017-12-07 09:51:37.000000000 -0500
-+++ chromium-61.0.3163.79/third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h	2017-09-06 14:18:10.890232136 -0400
+++ chromium-63.0.3239.84/third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h	2017-12-07 11:10:25.513089579 -0500
@@ -1,7 +1,7 @@
 /* Automatically generated by configure - do not modify! */
 #ifndef FFMPEG_CONFIG_H
 #define FFMPEG_CONFIG_H
-#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-nvenc --disable-cuda --disable-cuvid --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/ssd/chrome/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=i686 --extra-cflags='\"-m32\"' --extra-ldflags='\"-m32\"' --enable-yasm --enable-pic"
+-#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/ssd/blink3/src/third_party/opus/src/include --disable-linux-perf --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=i686 --extra-cflags='\"-m32\"' --extra-ldflags='\"-m32\"' --enable-yasm --enable-pic"
-+#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-nvenc --disable-cuda --disable-cuvid --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/ssd/chrome/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=i686 --extra-cflags='\"-m32\"' --extra-ldflags='\"-m32\"' --enable-yasm --enable-pic --enable-decoder='mp3' --enable-demuxer='mp3' --enable-parser='mpegaudio'"
+#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/ssd/blink3/src/third_party/opus/src/include --disable-linux-perf --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=i686 --extra-cflags='\"-m32\"' --extra-ldflags='\"-m32\"' --enable-yasm --enable-pic --enable-decoder='mp3' --enable-demuxer='mp3' --enable-parser='mpegaudio'"
 #define FFMPEG_LICENSE "LGPL version 2.1 or later"
 #define CONFIG_THIS_YEAR 2017
 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
-@@ -542,7 +542,7 @@
+@@ -547,7 +547,7 @@
 #define CONFIG_FFPROBE 0
 #define CONFIG_FFSERVER 0
 #define CONFIG_FFMPEG 0
@ -282,7 +293,7 @@ diff -up chromium-61.0.3163.79/third_party/ffmpeg/chromium/config/Chromium/linux
 #define CONFIG_DWT 0
 #define CONFIG_ERROR_RESILIENCE 0
 #define CONFIG_FAAN 1
-@@ -620,9 +620,9 @@
+@@ -626,9 +626,9 @@
 #define CONFIG_LZF 0
 #define CONFIG_ME_CMP 0
 #define CONFIG_MPEG_ER 0
@ -295,7 +306,7 @@ diff -up chromium-61.0.3163.79/third_party/ffmpeg/chromium/config/Chromium/linux
 #define CONFIG_MPEGVIDEO 0
 #define CONFIG_MPEGVIDEOENC 0
 #define CONFIG_MSS34DSP 0
-@@ -968,7 +968,7 @@
+@@ -979,7 +979,7 @@
 #define CONFIG_MP1FLOAT_DECODER 0
 #define CONFIG_MP2_DECODER 0
 #define CONFIG_MP2FLOAT_DECODER 0
@ -304,7 +315,7 @@ diff -up chromium-61.0.3163.79/third_party/ffmpeg/chromium/config/Chromium/linux
 #define CONFIG_MP3FLOAT_DECODER 0
 #define CONFIG_MP3ADU_DECODER 0
 #define CONFIG_MP3ADUFLOAT_DECODER 0
-@@ -1275,7 +1275,7 @@
+@@ -1292,7 +1292,7 @@
 #define CONFIG_MM_DEMUXER 0
 #define CONFIG_MMF_DEMUXER 0
 #define CONFIG_MOV_DEMUXER 0
@ -313,7 +324,7 @@ diff -up chromium-61.0.3163.79/third_party/ffmpeg/chromium/config/Chromium/linux
 #define CONFIG_MPC_DEMUXER 0
 #define CONFIG_MPC8_DEMUXER 0
 #define CONFIG_MPEGPS_DEMUXER 0
-@@ -2217,7 +2217,7 @@
+@@ -2267,7 +2267,7 @@
 #define CONFIG_MJPEG_PARSER 0
 #define CONFIG_MLP_PARSER 0
 #define CONFIG_MPEG4VIDEO_PARSER 0
@ -322,19 +333,19 @@ diff -up chromium-61.0.3163.79/third_party/ffmpeg/chromium/config/Chromium/linux
 #define CONFIG_MPEGVIDEO_PARSER 0
 #define CONFIG_OPUS_PARSER 1
 #define CONFIG_PNG_PARSER 0
-diff -up chromium-61.0.3163.79/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.h.mp3 chromium-61.0.3163.79/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.h
+diff -up chromium-63.0.3239.84/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.h.mp3 chromium-63.0.3239.84/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.h
--- chromium-61.0.3163.79/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.h.mp3	2017-09-06 10:13:19.000000000 -0400
+--- chromium-63.0.3239.84/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.h.mp3	2017-12-07 09:51:37.000000000 -0500
-+++ chromium-61.0.3163.79/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.h	2017-09-06 14:18:34.578774933 -0400
+++ chromium-63.0.3239.84/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.h	2017-12-07 11:10:50.721599547 -0500
@@ -1,7 +1,7 @@
 /* Automatically generated by configure - do not modify! */
 #ifndef FFMPEG_CONFIG_H
 #define FFMPEG_CONFIG_H
-#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-nvenc --disable-cuda --disable-cuvid --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/ssd/chrome/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-lto --enable-pic"
+-#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/ssd/blink3/src/third_party/opus/src/include --disable-linux-perf --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-lto --enable-pic"
-+#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-nvenc --disable-cuda --disable-cuvid --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/ssd/chrome/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-lto --enable-pic --enable-decoder='mp3' --enable-demuxer='mp3' --enable-parser='mpegaudio'"
+#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/ssd/blink3/src/third_party/opus/src/include --disable-linux-perf --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-lto --enable-pic --enable-decoder='mp3' --enable-demuxer='mp3' --enable-parser='mpegaudio'"
 #define FFMPEG_LICENSE "LGPL version 2.1 or later"
 #define CONFIG_THIS_YEAR 2017
 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
-@@ -542,7 +542,7 @@
+@@ -547,7 +547,7 @@
 #define CONFIG_FFPROBE 0
 #define CONFIG_FFSERVER 0
 #define CONFIG_FFMPEG 0
@ -343,7 +354,7 @@ diff -up chromium-61.0.3163.79/third_party/ffmpeg/chromium/config/Chromium/linux
 #define CONFIG_DWT 0
 #define CONFIG_ERROR_RESILIENCE 0
 #define CONFIG_FAAN 1
-@@ -620,9 +620,9 @@
+@@ -626,9 +626,9 @@
 #define CONFIG_LZF 0
 #define CONFIG_ME_CMP 0
 #define CONFIG_MPEG_ER 0
@ -356,7 +367,7 @@ diff -up chromium-61.0.3163.79/third_party/ffmpeg/chromium/config/Chromium/linux
 #define CONFIG_MPEGVIDEO 0
 #define CONFIG_MPEGVIDEOENC 0
 #define CONFIG_MSS34DSP 0
-@@ -968,7 +968,7 @@
+@@ -979,7 +979,7 @@
 #define CONFIG_MP1FLOAT_DECODER 0
 #define CONFIG_MP2_DECODER 0
 #define CONFIG_MP2FLOAT_DECODER 0
@ -365,7 +376,7 @@ diff -up chromium-61.0.3163.79/third_party/ffmpeg/chromium/config/Chromium/linux
 #define CONFIG_MP3FLOAT_DECODER 0
 #define CONFIG_MP3ADU_DECODER 0
 #define CONFIG_MP3ADUFLOAT_DECODER 0
-@@ -1275,7 +1275,7 @@
+@@ -1292,7 +1292,7 @@
 #define CONFIG_MM_DEMUXER 0
 #define CONFIG_MMF_DEMUXER 0
 #define CONFIG_MOV_DEMUXER 0
@ -374,7 +385,7 @@ diff -up chromium-61.0.3163.79/third_party/ffmpeg/chromium/config/Chromium/linux
 #define CONFIG_MPC_DEMUXER 0
 #define CONFIG_MPC8_DEMUXER 0
 #define CONFIG_MPEGPS_DEMUXER 0
-@@ -2217,7 +2217,7 @@
+@@ -2267,7 +2267,7 @@
 #define CONFIG_MJPEG_PARSER 0
 #define CONFIG_MLP_PARSER 0
 #define CONFIG_MPEG4VIDEO_PARSER 0
@ -383,15 +394,15 @@ diff -up chromium-61.0.3163.79/third_party/ffmpeg/chromium/config/Chromium/linux
 #define CONFIG_MPEGVIDEO_PARSER 0
 #define CONFIG_OPUS_PARSER 1
 #define CONFIG_PNG_PARSER 0
-diff -up chromium-61.0.3163.79/third_party/ffmpeg/ffmpeg_generated.gni.mp3 chromium-61.0.3163.79/third_party/ffmpeg/ffmpeg_generated.gni
+diff -up chromium-63.0.3239.84/third_party/ffmpeg/ffmpeg_generated.gni.mp3 chromium-63.0.3239.84/third_party/ffmpeg/ffmpeg_generated.gni
--- chromium-61.0.3163.79/third_party/ffmpeg/ffmpeg_generated.gni.mp3	2017-09-06 10:13:18.000000000 -0400
+--- chromium-63.0.3239.84/third_party/ffmpeg/ffmpeg_generated.gni.mp3	2017-12-07 09:51:36.000000000 -0500
-+++ chromium-61.0.3163.79/third_party/ffmpeg/ffmpeg_generated.gni	2017-09-06 14:29:27.051194188 -0400
+++ chromium-63.0.3239.84/third_party/ffmpeg/ffmpeg_generated.gni	2017-12-07 11:16:58.728447124 -0500
-@@ -182,17 +182,9 @@ if ((is_mac) || (is_win) || (use_linux_c
+@@ -183,17 +183,9 @@ if ((is_mac) || (is_win) || (use_linux_c
   ]
 }
 -if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_win && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "x86" && ffmpeg_branding == "ChromeOS")) {
-+if ((current_cpu == "x64") || (is_android && current_cpu == "arm" && arm_use_neon) || (is_android && current_cpu == "arm64") || (is_android && current_cpu == "mips64el") || (is_android && current_cpu == "mipsel") || (is_android && current_cpu == "x86") || (is_win) || (use_linux_config && current_cpu == "arm" && arm_use_neon) || (use_linux_config && current_cpu == "arm" && arm_use_neon) || (use_linux_config && current_cpu == "arm") || (use_linux_config && current_cpu == "arm") || (use_linux_config && current_cpu == "arm64") || (use_linux_config && current_cpu == "mipsel") || (use_linux_config && current_cpu == "x64") || (use_linux_config && current_cpu == "x86")) {
+if ((current_cpu == "x64") || (is_android && current_cpu == "arm" && arm_use_neon) || (is_android && current_cpu == "arm64") || (is_android && current_cpu == "mips64el") || (is_android && current_cpu == "mipsel") || (is_android && current_cpu == "x86") || (is_win) || (use_linux_config && current_cpu == "arm" && arm_use_neon) || (use_linux_config && current_cpu == "arm") || (use_linux_config && current_cpu == "arm64") || (use_linux_config && current_cpu == "mipsel") || (use_linux_config && current_cpu == "x64") || (use_linux_config && current_cpu == "x86")) {
   ffmpeg_c_sources += [
 -    "libavcodec/aac_ac3_parser.c",
 -    "libavcodec/aac_parser.c",
@ -402,10 +413,10 @@ diff -up chromium-61.0.3163.79/third_party/ffmpeg/ffmpeg_generated.gni.mp3 chrom
 -    "libavcodec/aactab.c",
     "libavcodec/ac3tab.c",
 -    "libavcodec/autorename_libavcodec_aacdec.c",
     "libavcodec/autorename_libavcodec_mdct15.c",
     "libavcodec/autorename_libavcodec_mpegaudiodsp.c",
     "libavcodec/autorename_libavcodec_sbrdsp.c",
-     "libavcodec/cbrt_data.c",
+@@ -211,7 +203,6 @@ if ((current_cpu == "x64" && ffmpeg_bran
@@ -210,7 +202,6 @@ if ((current_cpu == "x64" && ffmpeg_bran
     "libavcodec/mpegaudiodsp_float.c",
     "libavcodec/sinewin.c",
     "libavcodec/sinewin_fixed.c",
@ -413,7 +424,7 @@ diff -up chromium-61.0.3163.79/third_party/ffmpeg/ffmpeg_generated.gni.mp3 chrom
     "libavformat/apetag.c",
     "libavformat/img2.c",
     "libavformat/mov.c",
-@@ -219,6 +210,20 @@ if ((current_cpu == "x64" && ffmpeg_bran
+@@ -220,6 +211,20 @@ if ((current_cpu == "x64" && ffmpeg_bran
   ]
 }
@ -434,7 +445,7 @@ diff -up chromium-61.0.3163.79/third_party/ffmpeg/ffmpeg_generated.gni.mp3 chrom
 if ((is_android && current_cpu == "x64") || (is_android && current_cpu == "x86") || (is_mac) || (is_win) || (use_linux_config && current_cpu == "x64") || (use_linux_config && current_cpu == "x86")) {
   ffmpeg_c_sources += [
     "libavcodec/x86/autorename_libavcodec_x86_vorbisdsp_init.c",
-@@ -322,15 +327,19 @@ if ((is_mac) || (is_win) || (use_linux_c
+@@ -323,16 +328,20 @@ if ((is_mac) || (is_win) || (use_linux_c
 if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_win && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "x86" && ffmpeg_branding == "ChromeOS")) {
   ffmpeg_c_sources += [
     "libavcodec/x86/aacpsdsp_init.c",
@ -447,6 +458,7 @@ diff -up chromium-61.0.3163.79/third_party/ffmpeg/ffmpeg_generated.gni.mp3 chrom
 +if ((current_cpu == "x64") || (is_android && current_cpu == "x86") || (use_linux_config && current_cpu == "x64") || (use_linux_config && current_cpu == "x86") || (is_win)) {
 +  ffmpeg_c_sources += [
     "libavcodec/x86/dct_init.c",
     "libavcodec/x86/mdct15_init.c",
     "libavcodec/x86/mpegaudiodsp.c",
     "libavcodec/x86/sbrdsp_init.c",
   ]
@ -457,10 +469,10 @@ diff -up chromium-61.0.3163.79/third_party/ffmpeg/ffmpeg_generated.gni.mp3 chrom
 -    "libavcodec/x86/aacpsdsp.asm",
     "libavcodec/x86/dct32.asm",
     "libavcodec/x86/imdct36.asm",
-     "libavcodec/x86/sbrdsp.asm",
+     "libavcodec/x86/mdct15.asm",
-diff -up chromium-61.0.3163.79/third_party/ffmpeg/libavcodec/sbrdsp.c.mp3 chromium-61.0.3163.79/third_party/ffmpeg/libavcodec/sbrdsp.c
+diff -up chromium-63.0.3239.84/third_party/ffmpeg/libavcodec/sbrdsp.c.mp3 chromium-63.0.3239.84/third_party/ffmpeg/libavcodec/sbrdsp.c
--- chromium-61.0.3163.79/third_party/ffmpeg/libavcodec/sbrdsp.c.mp3	2017-09-06 10:13:19.000000000 -0400
+--- chromium-63.0.3239.84/third_party/ffmpeg/libavcodec/sbrdsp.c.mp3	2017-12-07 09:51:37.000000000 -0500
-+++ chromium-61.0.3163.79/third_party/ffmpeg/libavcodec/sbrdsp.c	2017-09-06 14:11:44.495682217 -0400
+++ chromium-63.0.3239.84/third_party/ffmpeg/libavcodec/sbrdsp.c	2017-12-07 10:52:02.484509992 -0500
@@ -23,6 +23,7 @@
 #define USE_FIXED 0
@ -469,5 +481,5 @@ diff -up chromium-61.0.3163.79/third_party/ffmpeg/libavcodec/sbrdsp.c.mp3 chromi
 #include "config.h"
 #include "libavutil/attributes.h"
 #include "libavutil/intfloat.h"
-diff -up chromium-61.0.3163.79/third_party/webrtc/examples/objc/AppRTCMobile/ios/resources/mozart.mp3 chromium-61.0.3163.79/third_party/webrtc/examples/objc/AppRTCMobile/ios/resources/mozart
+diff -up chromium-63.0.3239.84/third_party/webrtc/examples/objc/AppRTCMobile/ios/resources/mozart.mp3 chromium-63.0.3239.84/third_party/webrtc/examples/objc/AppRTCMobile/ios/resources/mozart
-diff -up chromium-61.0.3163.79/tools/android/audio_focus_grabber/java/res/raw/ping.mp3 chromium-61.0.3163.79/tools/android/audio_focus_grabber/java/res/raw/ping
+diff -up chromium-63.0.3239.84/tools/android/audio_focus_grabber/java/res/raw/ping.mp3 chromium-63.0.3239.84/tools/android/audio_focus_grabber/java/res/raw/ping
--- a/chromium-63.0.3289.84-fix-ffmpeg-aarch64.patch
+++ b/chromium-63.0.3289.84-fix-ffmpeg-aarch64.patch
@ -0,0 +1,12 @@
 diff -up chromium-63.0.3239.84/third_party/ffmpeg/ffmpeg_generated.gni.aarch64 chromium-63.0.3239.84/third_party/ffmpeg/ffmpeg_generated.gni
 --- chromium-63.0.3239.84/third_party/ffmpeg/ffmpeg_generated.gni.aarch64	2017-12-07 11:23:07.077290535 -0500
 +++ chromium-63.0.3239.84/third_party/ffmpeg/ffmpeg_generated.gni	2017-12-07 11:27:30.354175021 -0500
@@ -541,7 +541,7 @@ if (use_linux_config && current_cpu == "
   ]
 }
 -if ((is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS")) {
 +if ((is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm64")) {
   ffmpeg_c_sources += [
     "libavcodec/aarch64/aacpsdsp_init_aarch64.c",
     "libavcodec/aarch64/mpegaudiodsp_init.c",
--- a/chromium-63.0.3289.84-fix-ft-hb-unbundle.patch
+++ b/chromium-63.0.3289.84-fix-ft-hb-unbundle.patch
@ -0,0 +1,36 @@
 diff -up chromium-63.0.3239.84/build/linux/unbundle/freetype.gn.fixunbundle chromium-63.0.3239.84/build/linux/unbundle/freetype.gn
 --- chromium-63.0.3239.84/build/linux/unbundle/freetype.gn.fixunbundle	2017-12-07 12:07:48.652161826 -0500
 +++ chromium-63.0.3239.84/build/linux/unbundle/freetype.gn	2017-12-07 12:08:52.514919585 -0500
@@ -117,6 +117,14 @@ source_set("freetype") {
   public_configs = [ ":freetype_config" ]
 }
 +source_set("freetype_source") {
 +  visibility = [ "//third_party:freetype_harfbuzz" ]
 +  deps = [
 +    ":freetype_shim",
 +  ]
 +  public_configs = [ ":freetype_config" ]
 +}
 +
 source_set("bootstrap_freetype_for_harfbuzz") {
   deps = [
     ":freetype_shim",
 diff -up chromium-63.0.3239.84/build/linux/unbundle/harfbuzz-ng.gn.fixunbundle chromium-63.0.3239.84/build/linux/unbundle/harfbuzz-ng.gn
 --- chromium-63.0.3239.84/build/linux/unbundle/harfbuzz-ng.gn.fixunbundle	2017-12-07 12:09:57.057661738 -0500
 +++ chromium-63.0.3239.84/build/linux/unbundle/harfbuzz-ng.gn	2017-12-07 12:10:03.225541404 -0500
@@ -24,6 +24,14 @@ group("harfbuzz-ng") {
   ]
 }
 +source_set("harfbuzz_source") {
 +  visibility = [ "//third_party:freetype_harfbuzz" ]
 +  deps = [
 +    ":harfbuzz_shim",
 +  ]
 +  public_configs = [ ":system_harfbuzz" ]
 +}
 +
 source_set("harfbuzz-ng-ft") {
   deps = [
     ":harfbuzz_shim",
--- a/chromium-63.0.3289.84-gcc-round-fix.patch
+++ b/chromium-63.0.3289.84-gcc-round-fix.patch
@ -0,0 +1,11 @@
 diff -up chromium-63.0.3239.84/third_party/webrtc/p2p/base/port.cc.gcc-round-fix chromium-63.0.3239.84/third_party/webrtc/p2p/base/port.cc
 --- chromium-63.0.3239.84/third_party/webrtc/p2p/base/port.cc.gcc-round-fix	2017-12-07 16:20:01.521717091 -0500
 +++ chromium-63.0.3239.84/third_party/webrtc/p2p/base/port.cc	2017-12-07 16:20:13.025491739 -0500
@@ -11,6 +11,7 @@
 #include "p2p/base/port.h"
 #include <algorithm>
 +#include <cmath>
 #include <vector>
 #include "p2p/base/common.h"
--- a/chromium-63.0.3289.84-gcc5-r3.patch
+++ b/chromium-63.0.3289.84-gcc5-r3.patch
@ -0,0 +1,104 @@
 diff -up chromium-63.0.3239.84/gpu/ipc/common/mailbox_struct_traits.h.gcc5-r3 chromium-63.0.3239.84/gpu/ipc/common/mailbox_struct_traits.h
 --- chromium-63.0.3239.84/gpu/ipc/common/mailbox_struct_traits.h.gcc5-r3	2017-12-06 15:05:28.000000000 -0500
 +++ chromium-63.0.3239.84/gpu/ipc/common/mailbox_struct_traits.h	2017-12-07 11:32:15.416636125 -0500
@@ -15,7 +15,7 @@ namespace mojo {
 template <>
 struct StructTraits<gpu::mojom::MailboxDataView, gpu::Mailbox> {
   static base::span<const int8_t> name(const gpu::Mailbox& mailbox) {
 -    return mailbox.name;
 +    return base::make_span(mailbox.name);
   }
   static bool Read(gpu::mojom::MailboxDataView data, gpu::Mailbox* out);
 };
 diff -up chromium-63.0.3239.84/services/viz/public/cpp/compositing/filter_operation_struct_traits.h.gcc5-r3 chromium-63.0.3239.84/services/viz/public/cpp/compositing/filter_operation_struct_traits.h
 --- chromium-63.0.3239.84/services/viz/public/cpp/compositing/filter_operation_struct_traits.h.gcc5-r3	2017-12-06 15:05:31.000000000 -0500
 +++ chromium-63.0.3239.84/services/viz/public/cpp/compositing/filter_operation_struct_traits.h	2017-12-07 11:32:15.422636011 -0500
@@ -134,7 +134,7 @@ struct StructTraits<viz::mojom::FilterOp
   static base::span<const float> matrix(const cc::FilterOperation& operation) {
     if (operation.type() != cc::FilterOperation::COLOR_MATRIX)
       return base::span<const float>();
 -    return operation.matrix();
 +    return base::make_span(operation.matrix());
   }
   static base::span<const gfx::Rect> shape(
 diff -up chromium-63.0.3239.84/services/viz/public/cpp/compositing/quads_struct_traits.h.gcc5-r3 chromium-63.0.3239.84/services/viz/public/cpp/compositing/quads_struct_traits.h
 --- chromium-63.0.3239.84/services/viz/public/cpp/compositing/quads_struct_traits.h.gcc5-r3	2017-12-07 11:32:15.429635877 -0500
 +++ chromium-63.0.3239.84/services/viz/public/cpp/compositing/quads_struct_traits.h	2017-12-07 11:34:00.081601880 -0500
@@ -309,7 +309,7 @@ struct StructTraits<viz::mojom::TextureQ
   static base::span<const float> vertex_opacity(const viz::DrawQuad& input) {
     const viz::TextureDrawQuad* quad =
         viz::TextureDrawQuad::MaterialCast(&input);
 -    return quad->vertex_opacity;
 +    return base::make_span(quad->vertex_opacity);
   }
   static bool y_flipped(const viz::DrawQuad& input) {
 diff -up chromium-63.0.3239.84/third_party/WebKit/Source/platform/exported/WebCORS.cpp.gcc5-r3 chromium-63.0.3239.84/third_party/WebKit/Source/platform/exported/WebCORS.cpp
 --- chromium-63.0.3239.84/third_party/WebKit/Source/platform/exported/WebCORS.cpp.gcc5-r3	2017-12-06 15:05:46.000000000 -0500
 +++ chromium-63.0.3239.84/third_party/WebKit/Source/platform/exported/WebCORS.cpp	2017-12-07 11:32:15.430635859 -0500
@@ -480,7 +480,7 @@ WebString AccessControlErrorString(
     }
     default:
       NOTREACHED();
 -      return "";
 +      return WebString();
   }
 }
@@ -512,7 +512,7 @@ WebString PreflightErrorString(const Pre
     }
     default:
       NOTREACHED();
 -      return "";
 +      return WebString();
   }
 }
@@ -533,7 +533,7 @@ WebString RedirectErrorString(const Redi
     }
     default:
       NOTREACHED();
 -      return "";
 +      return WebString();
   }
 }
 diff -up chromium-63.0.3239.84/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h.gcc5-r3 chromium-63.0.3239.84/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h
 --- chromium-63.0.3239.84/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h.gcc5-r3	2017-12-06 15:05:46.000000000 -0500
 +++ chromium-63.0.3239.84/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h	2017-12-07 11:32:15.408636277 -0500
@@ -63,7 +63,7 @@ class WTF_EXPORT ArrayBufferContents {
           allocation_length_(0),
           data_(data),
           data_length_(0),
 -          kind_(AllocationKind::kNormal),
 +          kind_(WTF::ArrayBufferContents::AllocationKind::kNormal),
           deleter_(deleter) {}
     DataHandle(void* allocation_base,
                size_t allocation_length,
@@ -94,11 +94,11 @@ class WTF_EXPORT ArrayBufferContents {
              reinterpret_cast<uintptr_t>(allocation_base_) +
                  allocation_length_);
       switch (kind_) {
 -        case AllocationKind::kNormal:
 +        case WTF::ArrayBufferContents::AllocationKind::kNormal:
           DCHECK(deleter_);
           deleter_(data_);
           return;
 -        case AllocationKind::kReservation:
 +        case WTF::ArrayBufferContents::AllocationKind::kReservation:
           ReleaseReservedMemory(allocation_base_, allocation_length_);
           return;
       }
 diff -up chromium-63.0.3239.84/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.gcc5-r3 chromium-63.0.3239.84/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc
 --- chromium-63.0.3239.84/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.gcc5-r3	2017-12-07 11:32:15.409636258 -0500
 +++ chromium-63.0.3239.84/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc	2017-12-07 11:33:10.714561105 -0500
@@ -10,7 +10,7 @@
 #include "modules/audio_processing/aec3/aec_state.h"
 -#include <math.h>
 +#include <cmath>
 #include <numeric>
 #include <vector>
--- a/chromium-63.0.3289.84-nolibc++.patch
+++ b/chromium-63.0.3289.84-nolibc++.patch
@ -0,0 +1,15 @@
 diff -up chromium-63.0.3239.84/remoting/host/linux/BUILD.gn.nolibc++ chromium-63.0.3239.84/remoting/host/linux/BUILD.gn
 --- chromium-63.0.3239.84/remoting/host/linux/BUILD.gn.nolibc++	2017-12-07 11:55:43.173273434 -0500
 +++ chromium-63.0.3239.84/remoting/host/linux/BUILD.gn	2017-12-07 11:55:53.244077772 -0500
@@ -62,11 +62,9 @@ if (enable_me2me_host) {
     if (is_component_build) {
       sources += [
         "$root_build_dir/libbase.so",
 -        "$root_build_dir/libc++.so",
       ]
       deps += [
         "//base:base",
 -        "//buildtools/third_party/libc++:libc++",
       ]
     }
   }
--- a/chromium-63.0.3289.84-nullfix.patch
+++ b/chromium-63.0.3289.84-nullfix.patch
@ -0,0 +1,43 @@
 diff -up chromium-63.0.3239.84/build/toolchain/linux/BUILD.gn.nullfix chromium-63.0.3239.84/build/toolchain/linux/BUILD.gn
 --- chromium-63.0.3239.84/build/toolchain/linux/BUILD.gn.nullfix	2017-12-06 15:05:21.000000000 -0500
 +++ chromium-63.0.3239.84/build/toolchain/linux/BUILD.gn	2017-12-07 10:44:34.507207080 -0500
@@ -31,6 +31,7 @@ gcc_toolchain("arm64") {
   ld = cxx
   readelf = "${toolprefix}readelf"
   nm = "${toolprefix}nm"
 +  extra_cppflags = "-fno-delete-null-pointer-checks"
   toolchain_args = {
     current_cpu = "arm64"
@@ -49,6 +50,7 @@ gcc_toolchain("arm") {
   ld = cxx
   readelf = "${toolprefix}readelf"
   nm = "${toolprefix}nm"
 +  extra_cppflags = "-fno-delete-null-pointer-checks"
   toolchain_args = {
     current_cpu = "arm"
@@ -99,6 +101,7 @@ gcc_toolchain("x86") {
   nm = "nm"
   ar = "ar"
   ld = cxx
 +  extra_cppflags = "-fno-delete-null-pointer-checks"
   # Output linker map files for binary size analysis.
   enable_linker_map = true
@@ -152,6 +155,7 @@ gcc_toolchain("x64") {
   nm = "nm"
   ar = "ar"
   ld = cxx
 +  extra_cppflags = "-fno-delete-null-pointer-checks"
   # Output linker map files for binary size analysis.
   enable_linker_map = true
@@ -186,6 +190,7 @@ gcc_toolchain("mipsel") {
   ld = cxx
   readelf = "${toolprefix}readelf"
   nm = "${toolprefix}nm"
 +  extra_cppflags = "-fno-delete-null-pointer-checks"
   toolchain_args = {
     cc_wrapper = ""
--- a/chromium-63.0.3289.84-setopaque.patch
+++ b/chromium-63.0.3289.84-setopaque.patch
@ -0,0 +1,12 @@
 diff -up chromium-63.0.3239.84/cc/blink/web_layer_impl.h.setopaque chromium-63.0.3239.84/cc/blink/web_layer_impl.h
 --- chromium-63.0.3239.84/cc/blink/web_layer_impl.h.setopaque	2017-12-07 10:47:48.262446682 -0500
 +++ chromium-63.0.3239.84/cc/blink/web_layer_impl.h	2017-12-07 10:48:47.437298948 -0500
@@ -67,7 +67,7 @@ class CC_BLINK_EXPORT WebLayerImpl : pub
   void SetIsRootForIsolatedGroup(bool root) override;
   bool IsRootForIsolatedGroup() override;
   void SetHitTestableWithoutDrawsContent(bool should_hit_test) override;
 -  void SetOpaque(bool opaque) override;
 +  CC_BLINK_EXPORT void SetOpaque(bool opaque) override;
   bool Opaque() const override;
   void SetPosition(const blink::WebFloatPoint& position) override;
   blink::WebFloatPoint GetPosition() const override;
--- a/chromium-browser.appdata.xml
+++ b/chromium-browser.appdata.xml
@ -1,38 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2016 Richard Hughes <richard@hughsie.com> -->
 <component type="desktop">
  <id>chromium-browser.desktop</id>
  <update_contact>richard@hughsie.com</update_contact>
  <metadata_license>CC0-1.0</metadata_license>
  <project_license>BSD-3-Clause and LGPL-2.1+ and Apache-2.0 and IJG and MIT and GPL-2.0+ and ISC and OpenSSL and (MPL-1.1 or GPL-2.0 or LGPL-2.0)</project_license>
  <name>Chromium</name>
  <summary>Web Browser</summary>
  <description>
   <p>
    Chromium is an open-source browser that aims to build a safer, faster, and
    more stable way to experience the web.
    We invite you to join us in our effort to build a powerful platform for
    developing a new generation of web applications.
   </p>
   <p>
    Chromium does not include the non-free AAC, H.264, MP3 or Adobe Flash code
    that is found in Chrome, although it does support Vorbis, Theora, WebM and
    HTML5 audio and video standards.
   </p>
  </description>
  <url type="homepage">https://www.chromium.org/Home</url>
  <screenshots>
    <screenshot type="default">
      <image>https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/chromium-browser/a.png</image>
      <caption/>
    </screenshot>
    <screenshot>
      <image>https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/chromium-browser/b.png</image>
      <caption/>
    </screenshot>
  </screenshots>
  <translation>chromium-browser</translation>
  <developer_name>Google</developer_name>
  <url type="bugtracker">https://www.chromium.org/for-testers/bug-reporting-guidelines</url>
  <url type="help">https://chromium.googlesource.com/chromium/src/+/master/docs/linux_debugging.md</url>
 </component>
--- a/chromium.spec
+++ b/chromium.spec
@ -17,20 +17,18 @@
 # %%{nil} for Stable; -beta for Beta; -dev for Devel
 # dash in -beta and -dev is intentional !
 %global chromium_channel %{nil}
 %global chromium_menu_name Chromium
 %global chromium_browser_channel chromium-browser%{chromium_channel}
 %global chromium_path %{_libdir}/chromium-browser%{chromium_channel}
 %global crd_path %{_libdir}/chrome-remote-desktop
 %global tests 0
 # We don't want any libs in these directories to generate Provides
 # Requires is trickier. 
 %global __provides_exclude_from %{chromium_path}/.*\\.so|%{chromium_path}/lib/.*\\.so
-%global privlibs libEGL|libGLESv2|libVkLayer_core_validation|libVkLayer_object_tracker|libVkLayer_parameter_validation|libVkLayer_swapchain|libVkLayer_threading|libVkLayer_unique_objects|libaccessibility|libanimation|libaura|libaura_extra|libbase|libbase_i18n|libbindings|libblink_android_mojo_bindings_shared|libblink_common|libblink_controller|libblink_core|libblink_modules|libblink_mojo_bindings_shared|libblink_offscreen_canvas_mojo_bindings_shared|libblink_platform|libbluetooth|libboringssl|libbrowser_ui_views|libcaptive_portal|libcapture_base|libcapture_lib|libcc|libcc_animation|libcc_base|libcc_blink|libcc_debug|libcc_ipc|libcc_paint|libcdm_manager|libchromium_sqlite3|libclearkeycdm|libcloud_policy_proto_generated_compile|libcodec|libcolor_space|libcommon|libcompositor|libcontent|libcontent_common_mojo_bindings_shared|libcontent_public_common_mojo_bindings_shared|libcrcrypto|libdbus|libdevice_base|libdevice_event_log|libdevice_gamepad|libdevice_vr_mojo_bindings|libdevice_vr_mojo_bindings_blink|libdevice_vr_mojo_bindings_shared|libdevices|libdiscardable_memory_client|libdiscardable_memory_common|libdiscardable_memory_service|libdisplay|libdisplay_types|libdisplay_util|libdomain_reliability|libembedder|libevents|libevents_base|libevents_devices_x11|libevents_ozone_layout|libevents_x|libfingerprint|libffmpeg|libgcm|libgeolocation|libgeometry|libgeometry_skia|libgesture_detection|libgfx|libgfx_ipc|libgfx_ipc_color|libgfx_ipc_geometry|libgfx_ipc_skia|libgfx_switches|libgfx_x11|libgin|libgl_in_process_context|libgl_init|libgl_wrapper|libgles2_c_lib|libgles2_implementation|libgles2_utils|libgpu|libgtk3ui|libheadless|libhost|libicui18n|libicuuc|libinterfaces_shared|libipc|libipc_mojom|libipc_mojom_shared|libjs|libkeyboard|libkeyboard_with_content|libkeycodes_x11|libkeyed_service_content|libkeyed_service_core|libmanager|libmedia|libmedia_blink|libmedia_gpu|libmedia_mojo_services|libmessage_center|libmetrics_cpp|libmidi|libmirclient.9|libmojo_common_lib|libmojo_ime_lib|libmojo_public_system|libmojo_public_system_cpp|libmojo_system_impl|libnative_theme|libnet|libnet_with_v8|libonc|libplatform|libpolicy_component|libpolicy_proto|libppapi_host|libppapi_proxy|libppapi_shared|libprefs|libprinting|libprotobuf_lite|libproxy_config|librange|libresource_coordinator_cpp|libresource_coordinator_public_interfaces_internal_shared|libsandbox_services|libseccomp_bpf|libsensors|libservice|libservice_manager_cpp|libservice_manager_cpp_types|libservice_manager_mojom|libservice_manager_mojom_blink|libservice_manager_mojom_constants|libservice_manager_mojom_constants_blink|libservice_manager_mojom_constants_shared|libservice_manager_mojom_shared|libsessions|libshared_memory_support|libshell_dialogs|libskia|libsnapshot|libsql|libstartup_tracing|libstorage_browser|libstorage_common|libstub_window|libsuid_sandbox_client|libsurface|libtracing|libui_base|libui_base_ime|libui_base_x|libui_data_pack|libui_devtools|libui_touch_selection|libui_views_mus_lib|liburl|liburl_ipc|liburl_matcher|libuser_manager|libuser_prefs|libv8|libv8_libbase|libv8_libplatform|libviews|libviz_common|libviz_resource_format|libweb_dialogs|libwebdata_common|libwebview|libwidevinecdm|libwidevinecdmadapter|libwm|libwm_public|libwtf|libx11_events_platform|libx11_window
+%global privlibs libaccessibility|libanimation|libaura_extra|libaura|libbase_i18n|libbase|libbindings|libblink_android_mojo_bindings_shared|libblink_common|libblink_controller|libblink_core|libblink_modules|libblink_mojo_bindings_shared|libblink_offscreen_canvas_mojo_bindings_shared|libblink_platform|libbluetooth|libboringssl|libbrowser_ui_views|libcaptive_portal|libcapture_base|libcapture_lib|libcc_animation|libcc_base|libcc_blink|libcc_debug|libcc_ipc|libcc_paint|libcc|libcdm_manager|libchromium_sqlite3|libclearkeycdm|libclient|libcloud_policy_proto_generated_compile|libcodec|libcolor_space|libcommon|libcompositor|libcontent_common_mojo_bindings_shared|libcontent_public_common_mojo_bindings_shared|libcontent|libcpp|libcrcrypto|libdbus|libdevice_base|libdevice_event_log|libdevice_gamepad|libdevices|libdevice_vr_mojo_bindings_blink|libdevice_vr_mojo_bindings_shared|libdevice_vr_mojo_bindings|libdiscardable_memory_client|libdiscardable_memory_common|libdiscardable_memory_service|libdisplay|libdisplay_types|libdisplay_util|libdomain_reliability|libEGL|libembedder|libembedder_switches|libevents_base|libevents_devices_x11|libevents_ozone_layout|libevents|libevents_x|libffmpeg|libfingerprint|libfreetype_harfbuzz|libgcm|libgeolocation|libgeometry_skia|libgeometry|libgesture_detection|libgfx_ipc_color|libgfx_ipc_geometry|libgfx_ipc_skia|libgfx_ipc|libgfx|libgfx_switches|libgfx_x11|libgin|libgles2_c_lib|libgles2_implementation|libgles2_utils|libGLESv2|libgl_init|libgl_in_process_context|libgl_wrapper|libgpu|libgtk3ui|libheadless|libhost|libicui18n|libicuuc|libinterfaces_shared|libipc_mojom_shared|libipc_mojom|libipc|libjs|libkeyboard|libkeyboard_with_content|libkeycodes_x11|libkeyed_service_content|libkeyed_service_core|libmanager|libmedia_blink|libmedia_gpu|libmedia_mojo_services|libmedia|libmessage_center|libmessage_support|libmetrics_cpp|libmidi|libmojo_common_lib|libmojo_ime_lib|libmojo_public_system_cpp|libmojo_public_system|libmojo_system_impl|libnative_theme|libnet|libnet_with_v8|libonc|libplatform|libpolicy_component|libpolicy_proto|libppapi_host|libppapi_proxy|libppapi_shared|libprefs|libprinting|libprotobuf_lite|libproxy_config|librange|libresource_coordinator_cpp|libresource_coordinator_public_interfaces_internal_shared|libsandbox_services|libsandbox|libseccomp_bpf|libsensors|libservice_manager_cpp|libservice_manager_cpp_types|libservice_manager_mojom_blink|libservice_manager_mojom_constants_blink|libservice_manager_mojom_constants_shared|libservice_manager_mojom_constants|libservice_manager_mojom_shared|libservice_manager_mojom|libservice|libsessions|libshared_memory_support|libshell_dialogs|libskia|libsnapshot|libsql|libstartup_tracing|libstorage_browser|libstorage_common|libstub_window|libsuid_sandbox_client|libsurface|libtracing|libui_base_ime|libui_base|libui_base_x|libui_data_pack|libui_devtools|libui_touch_selection|libui_views_mus_lib|liburl_ipc|liburl_matcher|liburl|libuser_manager|libuser_prefs|libv8_libbase|libv8_libplatform|libv8|libviews|libviz_common|libviz_resource_format|libVkLayer_core_validation|libVkLayer_object_tracker|libVkLayer_parameter_validation|libVkLayer_swapchain|libVkLayer_threading|libVkLayer_unique_objects|libwebdata_common|libweb_dialogs|libwebview|libwidevinecdmadapter|libwidevinecdm|libwm_public|libwm|libwtf|libx11_events_platform|libx11_window
 %global __requires_exclude ^(%{privlibs})\\.so
 # Try to not use the Xvfb as it is slow..
 %global tests_force_display 0
 # If we build with shared on, then chrome-remote-desktop depends on chromium libs.
 # If we build with shared off, then users cannot swap out libffmpeg (and i686 gets a lot harder to build)
 %global shared 1
@ -94,9 +92,9 @@ BuildRequires:  libicu-devel >= 5.4
 %global bundlelibpng 0
 %endif
-# Needs at least harfbuzz 1.4.2 now.
+# Needs at least harfbuzz 1.5.0 now.
 # 2017-06-12
-%if 0%{?fedora} < 26
+%if 0%{?fedora} < 28
 %global bundleharfbuzz 1
 %else
 %global bundleharfbuzz 0
@ -111,14 +109,14 @@ BuildRequires:  libicu-devel >= 5.4
 %global default_client_secret miEreAep8nuvTdvLums6qyLK
 %global chromoting_client_id 449907151817-8vnlfih032ni8c4jjps9int9t86k546t.apps.googleusercontent.com 
-%global majorversion 62
+%global majorversion 63
 %if %{freeworld}
 Name:		chromium%{chromium_channel}%{?freeworld:-freeworld}
 %else
 Name:		chromium%{chromium_channel}
 %endif
-Version:	%{majorversion}.0.3202.89
+Version:	%{majorversion}.0.3239.84
 Release:	1%{?dist}
 Summary:	A WebKit (Blink) powered web browser
 Url:		http://www.chromium.org/Home
@ -145,8 +143,6 @@ Patch9:		chromium-48.0.2564.116-libusb_interrupt_event_handler.patch
 Patch12:	chromium-55.0.2883.75-cups22.patch
 # Use PIE in the Linux sandbox (from openSUSE via Russian Fedora)
 Patch15:	chromium-55.0.2883.75-sandbox-pie.patch
 # Enable ARM CPU detection for webrtc (from archlinux via Russian Fedora)
 Patch16:	chromium-52.0.2743.82-arm-webrtc.patch
 # Use /etc/chromium for master_prefs
 Patch18:	chromium-52.0.2743.82-master-prefs-path.patch
 # Disable MADV_FREE (if set by glibc)
@ -160,21 +156,21 @@ Patch21:	chromium-60.0.3112.78-last-commit-position.patch
 # Fix issue where timespec is not defined when sys/stat.h is included.
 Patch22:	chromium-53.0.2785.92-boringssl-time-fix.patch
 # I wouldn't have to do this if there was a standard way to append extra compiler flags
-Patch24:	chromium-59.0.3071.86-nullfix.patch
+Patch24:	chromium-63.0.3289.84-nullfix.patch
 # Add explicit includedir for jpeglib.h
 Patch25:	chromium-54.0.2840.59-jpeg-include-dir.patch
 # On i686, pass --no-keep-memory --reduce-memory-overheads to ld.
 Patch26:	chromium-59.0.3071.86-i686-ld-memory-tricks.patch
 # obj/content/renderer/renderer/child_frame_compositing_helper.o: In function `content::ChildFrameCompositingHelper::OnSetSurface(cc::SurfaceId const&, gfx::Size const&, float, cc::SurfaceSequence const&)':
 # /builddir/build/BUILD/chromium-54.0.2840.90/out/Release/../../content/renderer/child_frame_compositing_helper.cc:214: undefined reference to `cc_blink::WebLayerImpl::setOpaque(bool)'
-Patch27:	chromium-61.0.3163.79-setopaque.patch
+Patch27:	chromium-63.0.3289.84-setopaque.patch
 # Use -fpermissive to build WebKit
 Patch31:	chromium-56.0.2924.87-fpermissive.patch
 # Fix issue with compilation on gcc7
 # Thanks to Ben Noordhuis
 Patch33: 	chromium-62.0.3202.62-gcc7.patch
 # Enable mp3 support
-Patch34:	chromium-62.0.3202.62-enable-mp3.patch
+Patch34:	chromium-63.0.3289.84-enable-mp3.patch
 # Revert https://chromium.googlesource.com/chromium/src/+/b794998819088f76b4cf44c8db6940240c563cf4%5E%21/#F0
 # https://bugs.chromium.org/p/chromium/issues/detail?id=712737
 # https://bugzilla.redhat.com/show_bug.cgi?id=1446851
@ -183,9 +179,6 @@ Patch36:	chromium-58.0.3029.96-revert-b794998819088f76b4cf44c8db6940240c563cf4.p
 Patch37:	chromium-59.0.3071.86-ffmpeg-stdatomic.patch
 # Nacl can't die soon enough
 Patch39:	chromium-59.0.3071.86-system-clang.patch
 # Change struct ucontext to ucontext_t in breakpad
 # https://patchwork.openembedded.org/patch/141358/
 Patch40:	chromium-59.0.3071.115-ucontext-fix.patch
 # Do not prefix libpng functions
 Patch42:	chromium-60.0.3112.78-no-libpng-prefix.patch
 # Do not mangle libjpeg
@ -196,7 +189,7 @@ Patch45:	chromium-60.0.3112.78-no-zlib-mangle.patch
 Patch46:	chromium-62.0.3202.62-kmaxskip-constexpr.patch
 Patch47:	chromium-60.0.3112.90-vulkan-force-c99.patch
 # Fix mp3 for aarch64
-Patch49:	chromium-61.0.3163.79-fix-ffmpeg-aarch64.patch
+Patch49:	chromium-63.0.3289.84-fix-ffmpeg-aarch64.patch
 # Fix libavutil include pathing to find arch specific timer.h
 # For some reason, this only fails on aarch64. No idea why.
 Patch50:	chromium-60.0.3112.113-libavutil-timer-include-path-fix.patch
@ -212,14 +205,13 @@ Patch60:	chromium-62.0.3202.62-epel7-no-nullptr-assignment-on-StructPtr.patch
 # Another gcc 4.8 goods..
 Patch61:	chromium-62.0.3202.62-rvalue-fix.patch
 # From gentoo
-Patch62:	chromium-gcc5-r3.patch
+Patch62:	chromium-63.0.3289.84-gcc5-r3.patch
-Patch63:	chromium-gn-bootstrap-r17.patch
+# Do not try to use libc++ in the remoting stack
-# Fix _cplusplus conditional
+Patch63:	chromium-63.0.3289.84-nolibc++.patch
-Patch64:	chromium-62.0.3202.62-correct-cplusplus-check.patch
+# Fix freetype and harfbuzz-ng unbundle
-
+Patch64:	chromium-63.0.3289.84-fix-ft-hb-unbundle.patch
-### Chromium Tests Patches ###
+# To use round with gcc, you need to #include <cmath>
-Patch100:	chromium-46.0.2490.86-use_system_opus.patch
+Patch65:	chromium-63.0.3289.84-gcc-round-fix.patch
 Patch101:	chromium-58.0.3029.81-use_system_harfbuzz.patch
 # Use chromium-latest.py to generate clean tarball from released build tarballs, found here:
 # http://build.chromium.org/buildbot/official/
@ -231,9 +223,6 @@ Source0:	https://commondatastorage.googleapis.com/chromium-browser-official/chro
 %else
 Source0:	chromium-%{version}-clean.tar.xz
 %endif
 %if 0%{tests}
 Source1:	https://commondatastorage.googleapis.com/chromium-browser-official/chromium-%{version}-testdata.tar.xz
 %endif
 # https://chromium.googlesource.com/chromium/tools/depot_tools.git/+archive/7e7a454f9afdddacf63e10be48f0eab603be654e.tar.gz
 Source2:	depot_tools.git-master.tar.gz
 Source3:	chromium-browser.sh
@ -281,17 +270,9 @@ BuildRequires:	libXScrnSaver-devel
 BuildRequires:	libXtst-devel
 BuildRequires:	minizip-devel
 BuildRequires:	nodejs
-BuildRequires:	nss-devel
+BuildRequires:	nss-devel >= 3.26
 BuildRequires:	pciutils-devel
 BuildRequires:	pulseaudio-libs-devel
 %if 0%{?tests}
 BuildRequires:	pam-devel
 # Tests needs X
 BuildRequires:	Xvfb
 BuildRequires:	liberation-sans-fonts
 # For sandbox initialization
 BuildRequires:	sudo
 %endif
 # for /usr/bin/appstream-util
 BuildRequires: libappstream-glib
@ -400,10 +381,8 @@ BuildRequires:	ninja-build
 BuildRequires: devtoolset-7-toolchain, devtoolset-7-libatomic-devel
 %endif
-# We pick up an automatic requires on the library, but we need the version check
+# There is a hardcoded check for nss 3.26 in the chromium code (crypto/nss_util.cc)
-# because the nss shared library is unversioned.
+Requires:	nss%{_isa} >= 3.26
 # This is to prevent someone from hitting http://code.google.com/p/chromium/issues/detail?id=26448
 Requires:	nss%{_isa} >= 3.12.3
 Requires:	nss-mdns%{_isa}
 # GTK modules it expects to find for some reason.
@ -621,11 +600,7 @@ udev.
 %prep
 %setup -q -T -c -n depot_tools -a 2
 %if 0%{tests}
 %setup -q -n chromium-%{version} -b 1
 %else
 %setup -q -n chromium-%{version}
 %endif
 ### Chromium Fedora Patches ###
 %patch0 -p1 -b .gcc5
@ -637,7 +612,6 @@ udev.
 %patch9 -p1 -b .modern-libusbx
 %patch12 -p1 -b .cups22
 %patch15 -p1 -b .sandboxpie
 %patch16 -p1 -b .armwebrtc
 %patch18 -p1 -b .etc
 # %%patch19 -p1 -b .madv_free
 %patch20 -p1 -b .gnsystem
@ -658,7 +632,6 @@ udev.
 %patch36 -p1 -b .revert
 %patch37 -p1 -b .ffmpeg-stdatomic
 %patch39 -p1 -b .system-clang
 %patch40 -p1 -b .ucontextfix
 %patch42 -p1 -b .noprefix
 %patch43 -p1 -b .nomangle
 %patch45 -p1 -b .nozmangle
@ -676,12 +649,9 @@ udev.
 %patch57 -p1 -b .aarch64glibc
 %endif
 %patch62 -p1 -b .gcc5-r3
-%patch63 -p1 -b .gn-boostrap-r17
+%patch63 -p1 -b .nolibc++
-%patch64 -p1 -b .fix-cplusplus-conditional
+%patch64 -p1 -b .fixunbundle
-
+%patch65 -p1 -b .gcc-round-fix
 ### Chromium Tests Patches ###
 %patch100 -p1 -b .use_system_opus
 %patch101 -p1 -b .use_system_harfbuzz
 %if 0%{?asan}
 export CC="clang"
@ -844,10 +814,8 @@ ln -s %{_bindir}/node third_party/node/linux/node-linux-x64/bin/node
 # Remove most of the bundled libraries. Libraries specified below (taken from
 # Gentoo's Chromium ebuild) are the libraries that needs to be preserved.
 build/linux/unbundle/remove_bundled_libraries.py \
 %if 0%{?asan}
 	'buildtools/third_party/libc++' \
 	'buildtools/third_party/libc++abi' \
 %endif
 	'base/third_party/dmg_fp' \
 	'base/third_party/dynamic_annotations' \
 	'base/third_party/icu' \
@ -858,7 +826,6 @@ build/linux/unbundle/remove_bundled_libraries.py \
 	'base/third_party/valgrind' \
 	'base/third_party/xdg_mime' \
 	'base/third_party/xdg_user_dirs' \
 	'breakpad/src/third_party/curl' \
 	'chrome/third_party/mozilla_security_manager' \
 	'courgette/third_party' \
 	'net/third_party/mozilla_security_manager' \
@ -867,25 +834,28 @@ build/linux/unbundle/remove_bundled_libraries.py \
 	'third_party/adobe' \
 	'third_party/analytics' \
 	'third_party/angle' \
 	'third_party/angle/src/common/third_party/murmurhash' \
 	'third_party/angle/src/common/third_party/base' \
 	'third_party/angle/src/common/third_party/smhasher' \
 	'third_party/angle/src/third_party/compiler' \
 	'third_party/angle/src/third_party/libXNVCtrl' \
 	'third_party/angle/src/third_party/trace_event' \
 	'third_party/blanketjs' \
 	'third_party/blink' \
 	'third_party/boringssl' \
 	'third_party/breakpad' \
 	'third_party/breakpad/breakpad/src/third_party/curl' \
 	'third_party/brotli' \
 	'third_party/cacheinvalidation' \
 	'third_party/catapult' \
-        'third_party/catapult/third_party/polymer' \
+	'third_party/catapult/common/py_vulcanize/third_party/rcssmin' \
-        'third_party/catapult/third_party/py_vulcanize' \
+	'third_party/catapult/common/py_vulcanize/third_party/rjsmin' \
-        'third_party/catapult/third_party/py_vulcanize/third_party/rcssmin' \
+	'third_party/catapult/third_party/polymer' \
        'third_party/catapult/third_party/py_vulcanize/third_party/rjsmin' \
 	'third_party/catapult/tracing/third_party/d3' \
 	'third_party/catapult/tracing/third_party/gl-matrix' \
 	'third_party/catapult/tracing/third_party/jszip' \
 	'third_party/catapult/tracing/third_party/mannwhitneyu' \
 	'third_party/catapult/tracing/third_party/oboe' \
 	'third_party/catapult/tracing/third_party/pako' \
        'third_party/ced' \
 	'third_party/cld_2' \
 	'third_party/cld_3' \
@ -1103,83 +1073,14 @@ sed -i.orig -e 's/getenv("CHROME_VERSION_EXTRA")/"Fedora Project"/' $FILE
 . /opt/rh/devtoolset-7/enable
 %endif
 %if %{?tests}
 # Tests targets taken from testing/buildbot/chromium.linux.json and obtained with
 # get_linux_tests_name.py PATH_TO_UNPACKED_CHROMIUM_SOURCES --spec
 # You can also check if you have to update the tests in SPEC file by running
 # get_linux_tests_name.py PATH_TO_UNPACKED_CHROMIUM_SOURCES --check PATH_TO_SPEC_FILE
 export CHROMIUM_BROWSER_UNIT_TESTS="\
 	accessibility_unittests \
 	app_list_unittests \
 	app_shell_unittests \
 	aura_unittests \
 	base_unittests \
 	browser_tests \
 	cacheinvalidation_unittests \
 	cast_unittests \
 	cc_unittests \
 	chromedriver_unittests \
 	components_browsertests \
 	components_unittests \
 	compositor_unittests \
 	content_browsertests \
 	content_unittests \
 	crypto_unittests \
 	dbus_unittests \
 	device_unittests \
 	display_unittests \
 	events_unittests \
 	extensions_browsertests \
 	extensions_unittests \
 	gcm_unit_tests \
 	gfx_unittests \
 	gl_unittests \
 	gn_unittests \
 	google_apis_unittests \
 	gpu_unittests \
 	interactive_ui_tests \
 	ipc_mojo_unittests \
 	ipc_tests \
 	jingle_unittests \
 	media_unittests \
 	midi_unittests \
 	mojo_common_unittests \
 	mojo_public_bindings_unittests \
 	mojo_public_environment_unittests \
 	mojo_public_system_unittests \
 	mojo_public_utility_unittests \
 	mojo_system_unittests \
 %if 0%{?nacl}
 	nacl_loader_unittests \
 %endif
 	net_unittests \
 	ppapi_unittests \
 	printing_unittests \
 	remoting_unittests \
 	sandbox_linux_unittests \
 	skia_unittests \
 	sql_unittests \
 	sync_integration_tests \
 	sync_unit_tests \
 	ui_base_unittests \
 	ui_touch_selection_unittests \
 	unit_tests \
 	url_unittests \
 	views_unittests \
 	wm_unittests \
 	"
 %else
 export CHROMIUM_BROWSER_UNIT_TESTS=
 %endif
 # Now do the full browser
 %if 0%{freeworld}
-../depot_tools/ninja -C %{target} -vvv media $CHROMIUM_BROWSER_UNIT_TESTS
+../depot_tools/ninja -C %{target} -vvv media
 %else
 # Do headless first.  
 ../depot_tools/ninja -C %{headlesstarget} -vvv headless_shell
-../depot_tools/ninja -C %{target} -vvv chrome chrome_sandbox chromedriver widevinecdmadapter clearkeycdm policy_templates $CHROMIUM_BROWSER_UNIT_TESTS
+../depot_tools/ninja -C %{target} -vvv chrome chrome_sandbox chromedriver widevinecdmadapter clearkeycdm policy_templates
 # remote client
 pushd remoting
@ -1244,7 +1145,9 @@ chmod -x %{buildroot}%{chromium_path}/nacl_helper_bootstrap* *.nexe
 cp -a protoc pyproto %{buildroot}%{chromium_path}
 cp -a chrome %{buildroot}%{chromium_path}/%{chromium_browser_channel}
 cp -a chrome_sandbox %{buildroot}%{chromium_path}/chrome-sandbox
-cp -a chrome.1 %{buildroot}%{_mandir}/man1/%{chromium_browser_channel}.1
+cp -a ../../chrome/app/resources/manpage.1.in %{buildroot}%{_mandir}/man1/%{chromium_browser_channel}.1
 sed -i "s|@@PACKAGE@@|%{chromium_browser_channel}|g" %{buildroot}%{_mandir}/man1/%{chromium_browser_channel}.1
 sed -i "s|@@MENUNAME@@|%{chromium_menu_name}|g" %{buildroot}%{_mandir}/man1/%{chromium_browser_channel}.1
 # V8 initial snapshots
 # https://code.google.com/p/chromium/issues/detail?id=421063
 cp -a natives_blob.bin %{buildroot}%{chromium_path}
@ -1361,310 +1264,6 @@ mkdir -p %{buildroot}%{chromium_path}/PepperFlash
 # freeworld conditional
 %endif
 %check
 %if 0%{tests}
 %if 0%{?tests_force_display}
 	export DISPLAY=:0
 %else
 	Xvfb :9 -screen 0 1024x768x24 &
 	export XVFB_PID=$!
 	export DISPLAY=:9
 %endif
 	export LC_ALL="en_US.utf8"
 	sleep 5
 	# Run tests and disable the failed ones
 	pushd %{target}
 	(
 	cp -f chrome_sandbox chrome-sandbox
 	echo "Test sandbox needs to be owned by root and have the suid set"
 	if [ "$(id -u)" != "0" ]; then
 		sudo chown root:root chrome-sandbox && sudo chmod 4755 chrome-sandbox
 	else
 		chown root:root chrome-sandbox && chmod 4755 chrome-sandbox
 	fi
 	# Example of failed or timed-out test annotation
 	# ./browser_tests \
 	#	--gtest_filter=-"\
 	#		`#failed`\
 	#		SandboxStatusUITest.testBPFSandboxEnabled:`#failed - not using BPF sandbox`\
 	#		:\
 	#		`#timed-out`\
 	#		CalculatorBrowserTest.Model:\
 	#		WebRtcBrowserTest.RunsAudioVideoWebRTCCallInTwoTabs\
 	#	" \
 	./accessibility_unittests && \
 	./app_list_unittests && \
 	./app_shell_unittests && \
 	./aura_unittests && \
 	./base_unittests \
 		--gtest_filter=-"\
 			`#failed`\
 			ICUStringConversionsTest.ConvertToUtf8AndNormalize\
 		" \
 	&& \
 	./browser_tests \
 		--gtest_filter=-"\
 			`#failed`\
 			DevToolsSanityTest.TestNetworkRawHeadersText:\
 			DevToolsSanityTest.TestNetworkSize:\
 			DevToolsSanityTest.TestNetworkSyncSize:\
 			ExtensionWebstoreGetWebGLStatusTest.Allowed:\
 			InlineLoginUISafeIframeBrowserTest.Basic:\
 			InlineLoginUISafeIframeBrowserTest.ConfirmationRequiredForNonsecureSignin:\
 			InlineLoginUISafeIframeBrowserTest.NoWebUIInIframe:\
 			InlineLoginUISafeIframeBrowserTest.TopFrameNavigationDisallowed:\
 			OutOfProcessPPAPITest.Graphics3D:\
 			PolicyTest.Disable3DAPIs:\
 			WebRtcWebcamBrowserTests/WebRtcWebcamBrowserTest.TestAcquiringAndReacquiringWebcam/0:\
 			:\
 			`#timed-out`\
 			CalculatorBrowserTest.Model:\
 			ImageFetcherImplBrowserTest.MultipleFetch:\
 			ProfileManagerBrowserTest.DeletePasswords:\
 			TabCaptureApiPixelTest.EndToEndThroughWebRTC:\
 			WebRtcBrowserTest.RunsAudioVideoWebRTCCallInTwoTabs:\
 			WebRtcSimulcastBrowserTest.TestVgaReturnsTwoSimulcastStreams\
 		" \
 	&& \
 	./cacheinvalidation_unittests && \
 	./cast_unittests && \
 	./cc_unittests && \
 	./chromedriver_unittests && \
 	./components_unittests \
 		--gtest_filter=-"\
 			`#failed`\
 			AutocompleteMatchTest.Duplicates:\
 			BookmarkIndexTest.GetBookmarksMatchingWithURLs:\
 			BookmarkIndexTest.MatchPositionsURLs:\
 			InMemoryURLIndexTypesTest.StaticFunctions:\
 			ScoredHistoryMatchTest.GetTopicalityScore:\
 			ScoredHistoryMatchTest.Inlining:\
 			ScoredHistoryMatchTest.ScoringTLD:\
 			UrlFormatterTest.FormatUrlWithOffsets:\
 			UrlFormatterTest.IDNToUnicodeFast:\
 			UrlFormatterTest.IDNToUnicodeSlow\
 		" \
 	&& \
 	./components_browsertests \
 		--gtest_filter=-"\
 			`#failed`\
 			AutofillRiskFingerprintTest.GetFingerprint\
 		" \
 	&& \
 	./compositor_unittests && \
 	./content_browsertests \
 		--gtest_filter=-"\
 			`#failed`\
 			BrowserGpuChannelHostFactoryTest.:\
 			BrowserGpuChannelHostFactoryTest.AlreadyEstablished:\
 			BrowserGpuChannelHostFactoryTest.Basic:\
 			ImageTransportFactoryBrowserTest.TestLostContext:\
 			ImageTransportFactoryTearDownBrowserTest.LoseOnTearDown:\
 			RenderViewImplTest.GetCompositionCharacterBoundsTest:\
 			SignalTest.BasicSignalQueryTest:\
 			SignalTest.BasicSignalSyncPointTest:\
 			SignalTest.InvalidSignalQueryUnboundTest:\
 			SignalTest.InvalidSignalSyncPointTest:\
 			SignalTest.SignalQueryUnboundTest:\
 			WebRtcBrowserTest.*:\
 			:\
 			`#timed-out`\
 			WebRtcAecDumpBrowserTest.CallWithAecDump:\
 			WebRtcAecDumpBrowserTest.CallWithAecDumpEnabledThenDisabled\
 		" \
 	&& \
 	./content_unittests && \
 	./crypto_unittests && \
 	./dbus_unittests \
 		--gtest_filter=-"\
 			`#crashed`\
 			EndToEndAsyncTest.InvalidObjectPath:\
 			EndToEndAsyncTest.InvalidServiceName:\
 			EndToEndSyncTest.InvalidObjectPath:\
 			EndToEndSyncTest.InvalidServiceName:\
 			MessageTest.SetInvalidHeaders\
 		" \
 	&& \
 	./device_unittests && \
 	./display_unittests && \
 	./events_unittests && \
 	./extensions_browsertests && \
 	./extensions_unittests && \
 	./gcm_unit_tests && \
 	./gfx_unittests \
 		--gtest_filter=-"\
 			`#failed - missing Microsoft TrueType fonts`\
 			FontListTest.Fonts_GetHeight_GetBaseline:\
 			FontRenderParamsTest.Default:\
 			FontRenderParamsTest.MissingFamily:\
 			FontRenderParamsTest.Size:\
 			FontRenderParamsTest.Style:\
 			FontRenderParamsTest.SubstituteFamily:\
 			FontRenderParamsTest.UseBitmaps:\
 			FontTest.GetActualFontNameForTesting:\
 			FontTest.LoadArial:\
 			FontTest.LoadArialBold:\
 			PlatformFontLinuxTest.DefaultFont:\
 			RenderTextTest.HarfBuzz_FontListFallback:\
 			RenderTextTest.SetFontList:\
 			RenderTextTest.StringSizeRespectsFontListMetrics\
 			:\
 			`#crashed`\
 			FontRenderParamsTest.Default:\
 			FontRenderParamsTest.ForceFullHintingWhenAntialiasingIsDisabled:\
 			FontRenderParamsTest.MissingFamily:\
 			FontRenderParamsTest.NoFontconfigMatch:\
 			FontRenderParamsTest.OnlySetConfiguredValues:\
 			FontRenderParamsTest.Scalable:\
 			FontRenderParamsTest.Size:\
 			FontRenderParamsTest.Style:\
 			FontRenderParamsTest.SubstituteFamily:\
 			FontRenderParamsTest.UseBitmaps:\
 			PlatformFontLinuxTest.DefaultFont\
 		" \
 	&& \
 	./gl_unittests && \
 	./gn_unittests \
 		--gtest_filter=-"\
 			`#failed`\
 			Format.004:\
 			Format.007:\
 			Format.012:\
 			Format.013:\
 			Format.014:\
 			Format.015:\
 			Format.017:\
 			Format.019:\
 			Format.020:\
 			Format.021:\
 			Format.023:\
 			Format.031:\
 			Format.033:\
 			Format.038:\
 			Format.043:\
 			Format.046:\
 			Format.048:\
 			Format.056:\
 			Format.057:\
 			Format.062:\
 			ParseTree.SortRangeExtraction:\
 			Parser.CommentsAtEndOfBlock:\
 			Parser.CommentsConnectedInList:\
 			Parser.CommentsEndOfBlockSingleLine:\
 			Parser.CommentsLineAttached:\
 			Parser.CommentsSuffix:\
 			Parser.CommentsSuffixDifferentLine:\
 			Parser.CommentsSuffixMultiple\
 		" \
 	&& \
 	./google_apis_unittests && \
 	./gpu_unittests && \
 	./interactive_ui_tests \
 		--gtest_filter=-"\
 			`#failed`\
 			AshNativeCursorManagerTest.CursorChangeOnEnterNotify:\
 			BookmarkBarViewTest5.DND:\
 			OmniboxViewViewsTest.DeactivateTouchEditingOnExecuteCommand:\
 			OmniboxViewViewsTest.SelectAllOnTap:\
 			StartupBrowserCreatorTest.LastUsedProfileActivated:\
 			X11TopmostWindowFinderTest.Basic:\
 			X11TopmostWindowFinderTest.Menu:\
 			:\
 			`#timed-out`\
 			BookmarkBarViewTest9.ScrollButtonScrolls:\
 			DockedPanelBrowserTest.CloseSqueezedPanels:\
 			DockedPanelBrowserTest.MinimizeSqueezedActive:\
 			GlobalCommandsApiTest.GlobalCommand\
 		" \
 	&& \
 	./ipc_mojo_unittests && \
 	./ipc_tests && \
 	./jingle_unittests && \
 	./midi_unittests && \
 	./media_unittests && \
 	./mojo_common_unittests && \
 	./mojo_public_bindings_unittests && \
 	./mojo_public_environment_unittests && \
 	./mojo_public_system_unittests && \
 	./mojo_public_utility_unittests && \
 	./mojo_system_unittests && \
 %if 0%{?nacl}
 	./nacl_loader_unittests && \
 %endif
 	./net_unittests \
 		--gtest_filter=-"\
 			`#failed`\
 			CertVerifyProcTest.TestKnownRoot\
 		" \
 	&& \
 	./ppapi_unittests && \
 	./printing_unittests && \
 	./remoting_unittests && \
 	./sandbox_linux_unittests && \
 	./skia_unittests && \
 	./sql_unittests && \
 	./ui_base_unittests && \
 	./ui_touch_selection_unittests && \
 	./sync_unit_tests && \
 	./unit_tests \
 		--gtest_filter=-"\
 			`#failed - some need https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries/+/master`\
 			BookmarkProviderTest.StripHttpAndAdjustOffsets:\
 			HQPOrderingTest.TEAMatch:\
 			HistoryQuickProviderTest.ContentsClass:\
 			LimitedInMemoryURLIndexTest.Initialization:\
 			MultilingualSpellCheckTest.MultilingualSpellCheckParagraph:\
 			MultilingualSpellCheckTest.MultilingualSpellCheckSuggestions:\
 			MultilingualSpellCheckTest.MultilingualSpellCheckWord:\
 			MultilingualSpellCheckTest.MultilingualSpellCheckWordEnglishSpanish:\
 			SpellCheckTest.CreateTextCheckingResultsKeepsMarkers:\
 			SpellCheckTest.DictionaryFiles:\
 			SpellCheckTest.EnglishWords:\
 			SpellCheckTest.GetAutoCorrectionWord_EN_US:\
 			SpellCheckTest.LogicalSuggestions:\
 			SpellCheckTest.MisspelledWords:\
 			SpellCheckTest.NoSuggest:\
 			SpellCheckTest.SpellCheckParagraphLongSentenceMultipleMisspellings:\
 			SpellCheckTest.SpellCheckParagraphMultipleMisspellings:\
 			SpellCheckTest.SpellCheckParagraphSingleMisspellings:\
 			SpellCheckTest.SpellCheckStrings_EN_US:\
 			SpellCheckTest.SpellCheckSuggestions_EN_US:\
 			SpellCheckTest.SpellingEngine_CheckSpelling:\
 			SpellcheckWordIteratorTest.FindSkippableWordsKhmer:\
 			:\
 			`#crashed`\
 			ListChangesTaskTest.UnderTrackedFolder:\
 			ListChangesTaskTest.UnrelatedChange:\
 			SpellCheckTest.RequestSpellCheckWithMisspellings:\
 			SpellCheckTest.RequestSpellCheckWithMultipleRequests:\
 			SpellCheckTest.RequestSpellCheckWithSingleMisspelling\
 		" \
 	&& \
 	./url_unittests && \
 	./views_unittests \
 		--gtest_filter=-"\
 			`#failed`\
 			DesktopWindowTreeHostX11HighDPITest.LocatedEventDispatchWithCapture:\
 			LabelTest.FontPropertySymbol:\
 			WidgetTest.WindowMouseModalityTest\
 		" \
 	&& \
 	./wm_unittests \
 	)
 	popd
 	if [ -n "$XVFB_PID" ]; then
 		kill $XVFB_PID
 		unset XVFB_PID
 		unset DISPLAY
 	fi
 %endif
 %post
 # Set SELinux labels - semanage itself will adjust the lib directory naming
 # But only do it when selinux is enabled, otherwise, it gets noisy.
@ -1763,7 +1362,7 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
 %doc chrome_policy_list.html *.json
 %license LICENSE
 %config %{_sysconfdir}/%{name}/
-# %%dir %{_sysconfdir}/%{name}/native-messaging-hosts
+# %%dir %%{_sysconfdir}/%%{name}/native-messaging-hosts
 # This is chrome-remote-desktop stuff
 %exclude %{_sysconfdir}/%{name}/native-messaging-hosts/*
 %{_bindir}/%{chromium_browser_channel}
@ -1800,59 +1399,59 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
 %{chromium_path}/pyproto/
 %{chromium_path}/resources/
 %dir %{chromium_path}/locales/
-%lang(am) %{chromium_path}/locales/am.pak
+%lang(am) %{chromium_path}/locales/am.pak*
-%lang(ar) %{chromium_path}/locales/ar.pak
+%lang(ar) %{chromium_path}/locales/ar.pak*
-%lang(bg) %{chromium_path}/locales/bg.pak
+%lang(bg) %{chromium_path}/locales/bg.pak*
-%lang(bn) %{chromium_path}/locales/bn.pak
+%lang(bn) %{chromium_path}/locales/bn.pak*
-%lang(ca) %{chromium_path}/locales/ca.pak
+%lang(ca) %{chromium_path}/locales/ca.pak*
-%lang(cs) %{chromium_path}/locales/cs.pak
+%lang(cs) %{chromium_path}/locales/cs.pak*
-%lang(da) %{chromium_path}/locales/da.pak
+%lang(da) %{chromium_path}/locales/da.pak*
-%lang(de) %{chromium_path}/locales/de.pak
+%lang(de) %{chromium_path}/locales/de.pak*
-%lang(el) %{chromium_path}/locales/el.pak
+%lang(el) %{chromium_path}/locales/el.pak*
-%lang(en_GB) %{chromium_path}/locales/en-GB.pak
+%lang(en_GB) %{chromium_path}/locales/en-GB.pak*
-%lang(en_US) %{chromium_path}/locales/en-US.pak
+%lang(en_US) %{chromium_path}/locales/en-US.pak*
-%lang(es) %{chromium_path}/locales/es.pak
+%lang(es) %{chromium_path}/locales/es.pak*
-%lang(es) %{chromium_path}/locales/es-419.pak
+%lang(es) %{chromium_path}/locales/es-419.pak*
-%lang(et) %{chromium_path}/locales/et.pak
+%lang(et) %{chromium_path}/locales/et.pak*
-%lang(fa) %{chromium_path}/locales/fa.pak
+%lang(fa) %{chromium_path}/locales/fa.pak*
-%lang(fi) %{chromium_path}/locales/fi.pak
+%lang(fi) %{chromium_path}/locales/fi.pak*
-%lang(fil) %{chromium_path}/locales/fil.pak
+%lang(fil) %{chromium_path}/locales/fil.pak*
-%lang(fr) %{chromium_path}/locales/fr.pak
+%lang(fr) %{chromium_path}/locales/fr.pak*
-%lang(gu) %{chromium_path}/locales/gu.pak
+%lang(gu) %{chromium_path}/locales/gu.pak*
-%lang(he) %{chromium_path}/locales/he.pak
+%lang(he) %{chromium_path}/locales/he.pak*
-%lang(hi) %{chromium_path}/locales/hi.pak
+%lang(hi) %{chromium_path}/locales/hi.pak*
-%lang(hr) %{chromium_path}/locales/hr.pak
+%lang(hr) %{chromium_path}/locales/hr.pak*
-%lang(hu) %{chromium_path}/locales/hu.pak
+%lang(hu) %{chromium_path}/locales/hu.pak*
-%lang(id) %{chromium_path}/locales/id.pak
+%lang(id) %{chromium_path}/locales/id.pak*
-%lang(it) %{chromium_path}/locales/it.pak
+%lang(it) %{chromium_path}/locales/it.pak*
-%lang(ja) %{chromium_path}/locales/ja.pak
+%lang(ja) %{chromium_path}/locales/ja.pak*
-%lang(kn) %{chromium_path}/locales/kn.pak
+%lang(kn) %{chromium_path}/locales/kn.pak*
-%lang(ko) %{chromium_path}/locales/ko.pak
+%lang(ko) %{chromium_path}/locales/ko.pak*
-%lang(lt) %{chromium_path}/locales/lt.pak
+%lang(lt) %{chromium_path}/locales/lt.pak*
-%lang(lv) %{chromium_path}/locales/lv.pak
+%lang(lv) %{chromium_path}/locales/lv.pak*
-%lang(ml) %{chromium_path}/locales/ml.pak
+%lang(ml) %{chromium_path}/locales/ml.pak*
-%lang(mr) %{chromium_path}/locales/mr.pak
+%lang(mr) %{chromium_path}/locales/mr.pak*
-%lang(ms) %{chromium_path}/locales/ms.pak
+%lang(ms) %{chromium_path}/locales/ms.pak*
-%lang(nb) %{chromium_path}/locales/nb.pak
+%lang(nb) %{chromium_path}/locales/nb.pak*
-%lang(nl) %{chromium_path}/locales/nl.pak
+%lang(nl) %{chromium_path}/locales/nl.pak*
-%lang(pl) %{chromium_path}/locales/pl.pak
+%lang(pl) %{chromium_path}/locales/pl.pak*
-%lang(pt_BR) %{chromium_path}/locales/pt-BR.pak
+%lang(pt_BR) %{chromium_path}/locales/pt-BR.pak*
-%lang(pt_PT) %{chromium_path}/locales/pt-PT.pak
+%lang(pt_PT) %{chromium_path}/locales/pt-PT.pak*
-%lang(ro) %{chromium_path}/locales/ro.pak
+%lang(ro) %{chromium_path}/locales/ro.pak*
-%lang(ru) %{chromium_path}/locales/ru.pak
+%lang(ru) %{chromium_path}/locales/ru.pak*
-%lang(sk) %{chromium_path}/locales/sk.pak
+%lang(sk) %{chromium_path}/locales/sk.pak*
-%lang(sl) %{chromium_path}/locales/sl.pak
+%lang(sl) %{chromium_path}/locales/sl.pak*
-%lang(sr) %{chromium_path}/locales/sr.pak
+%lang(sr) %{chromium_path}/locales/sr.pak*
-%lang(sv) %{chromium_path}/locales/sv.pak
+%lang(sv) %{chromium_path}/locales/sv.pak*
-%lang(sw) %{chromium_path}/locales/sw.pak
+%lang(sw) %{chromium_path}/locales/sw.pak*
-%lang(ta) %{chromium_path}/locales/ta.pak
+%lang(ta) %{chromium_path}/locales/ta.pak*
-%lang(te) %{chromium_path}/locales/te.pak
+%lang(te) %{chromium_path}/locales/te.pak*
-%lang(th) %{chromium_path}/locales/th.pak
+%lang(th) %{chromium_path}/locales/th.pak*
-%lang(tr) %{chromium_path}/locales/tr.pak
+%lang(tr) %{chromium_path}/locales/tr.pak*
-%lang(uk) %{chromium_path}/locales/uk.pak
+%lang(uk) %{chromium_path}/locales/uk.pak*
-%lang(vi) %{chromium_path}/locales/vi.pak
+%lang(vi) %{chromium_path}/locales/vi.pak*
-%lang(zh_CN) %{chromium_path}/locales/zh-CN.pak
+%lang(zh_CN) %{chromium_path}/locales/zh-CN.pak*
-%lang(zh_TW) %{chromium_path}/locales/zh-TW.pak
+%lang(zh_TW) %{chromium_path}/locales/zh-TW.pak*
 %files headless
 %{chromium_path}/headless_shell
@ -1909,6 +1508,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
 %changelog
 * Thu Dec  7 2017 Tom Callaway <spot@fedoraproject.org> 63.0.3239.84-1
 - update to 63.0.3239.84
 * Wed Nov  8 2017 Tom Callaway <spot@fedoraproject.org> 62.0.3202.89-1
 - update to 62.0.3202.89
--- a/clean_ffmpeg.sh
+++ b/clean_ffmpeg.sh
@ -197,10 +197,13 @@ manual_files="	libavcodec/aarch64/fft_neon.S \
 		libavcodec/aarch64/mdct_neon.S \
 		libavcodec/aarch64/vorbisdsp_neon.S \
 		libavcodec/x86/hpeldsp_rnd_template.c \
 		libavcodec/x86/mdct15.asm \
 		libavcodec/x86/mdct15_init.c \
 		libavcodec/x86/rnd_template.c \
 		libavcodec/x86/videodsp.asm \
 		libavcodec/x86/videodsp_init.c \
 		libavcodec/x86/vorbisdsp_init.c \
 		libavcodec/autorename_libavcodec_mdct15.c \
 		libavcodec/bit_depth_template.c \
 		libavcodec/fft_template.c \
 		libavcodec/flacdec.c \
@ -210,6 +213,7 @@ manual_files="	libavcodec/aarch64/fft_neon.S \
 		libavcodec/h264pred_template.c \
 		libavcodec/hpel_template.c \
 		libavcodec/hpeldsp.c \
 		libavcodec/mdct15.c \
 		libavcodec/mdct_template.c \
 		libavcodec/pel_template.c \
 		libavcodec/utils.c \
--- a/2
+++ b/2
@ -1,2 +1,2 @@
 SHA512 (depot_tools.git-master.tar.gz) = d3d6a1873b2b0296a8cd99e0d8d2e629a17b1808934b4972556168f8b4ccea60577ebaeab4445baf15afb1b04080808db59a832a5b61d247bd48da14fa6acf03
-SHA512 (chromium-62.0.3202.89-clean.tar.xz) = b1a8720ea61c5c71a0ff15a278f20e7d0d3218814f883ce2d5f6e949fb9dd61ac6d4cc6b4c517eb13b11b308593e648bde2f3de48ece390d5647670725b8f5d9
+SHA512 (chromium-63.0.3239.84-clean.tar.xz) = 1b2551b8dcaf8eecd0a5fb69a458034f30a73bb22f8c7521cbac14d9c2621c9468a7b7f6cb17b2715adee491d10510958bf08f8aa6277d8829e149906903b7be
`@ -1,2 +1,2 @@`
	`SHA512 (depot_tools.git-master.tar.gz) = d3d6a1873b2b0296a8cd99e0d8d2e629a17b1808934b4972556168f8b4ccea60577ebaeab4445baf15afb1b04080808db59a832a5b61d247bd48da14fa6acf03`	`SHA512 (depot_tools.git-master.tar.gz) = d3d6a1873b2b0296a8cd99e0d8d2e629a17b1808934b4972556168f8b4ccea60577ebaeab4445baf15afb1b04080808db59a832a5b61d247bd48da14fa6acf03`
	`SHA512 (chromium-62.0.3202.89-clean.tar.xz) = b1a8720ea61c5c71a0ff15a278f20e7d0d3218814f883ce2d5f6e949fb9dd61ac6d4cc6b4c517eb13b11b308593e648bde2f3de48ece390d5647670725b8f5d9`	`SHA512 (chromium-63.0.3239.84-clean.tar.xz) = 1b2551b8dcaf8eecd0a5fb69a458034f30a73bb22f8c7521cbac14d9c2621c9468a7b7f6cb17b2715adee491d10510958bf08f8aa6277d8829e149906903b7be`