BASELINE: Update chromium to 45.0.2454.40

Change-Id: Id2121d9f11a8fc633677236c65a3e41feef589e4
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>

2 files changed, 41 insertions, 1 deletions

diff --git a/chromium/third_party/libwebp/BUILD.gn b/chromium/third_party/libwebp/BUILD.gn
index 5495e6460b4..3259ec3fd0e 100644
--- a/chromium/third_party/libwebp/BUILD.gn
+++ b/chromium/third_party/libwebp/BUILD.gn
@@ -46,6 +46,9 @@ source_set("libwebp_demux") {
   all_dependent_configs = [ ":libwebp_config" ]
   configs -= [ "//build/config/compiler:chromium_code" ]
   configs += [ "//build/config/compiler:no_chromium_code" ]
+  deps = [
+    ":libwebp_utils",
+  ]
 }
 
 source_set("libwebp_dsp") {
@@ -74,7 +77,9 @@ source_set("libwebp_dsp") {
   configs += [ "//build/config/compiler:no_chromium_code" ]
 
   all_dependent_configs = [ ":libwebp_config" ]
-  deps = []
+  deps = [
+    ":libwebp_utils",
+  ]
   if (is_android) {
     deps += [ "//third_party/android_tools:cpu_features" ]
   }
@@ -151,6 +156,10 @@ source_set("libwebp_enc") {
   configs += [ "//build/config/compiler:no_chromium_code" ]
 
   all_dependent_configs = [ ":libwebp_config" ]
+
+  deps = [
+    ":libwebp_utils",
+  ]
 }
 
 source_set("libwebp_utils") {
@@ -172,6 +181,14 @@ source_set("libwebp_utils") {
   configs += [ "//build/config/compiler:no_chromium_code" ]
 
   all_dependent_configs = [ ":libwebp_config" ]
+
+  config("libwebp_utils_warnings") {
+    if (is_clang) {
+      # See https://code.google.com/p/webp/issues/detail?id=253.
+      cflags = [ "-Wno-incompatible-pointer-types" ]
+    }
+  }
+  public_configs = [ ":libwebp_utils_warnings" ]
 }
 
 group("libwebp") {
diff --git a/chromium/third_party/libwebp/libwebp.gyp b/chromium/third_party/libwebp/libwebp.gyp
index 327d9cea368..1cedb13501e 100644
--- a/chromium/third_party/libwebp/libwebp.gyp
+++ b/chromium/third_party/libwebp/libwebp.gyp
@@ -33,6 +33,9 @@
       'sources': [
         'demux/demux.c',
       ],
+      'dependencies' : [
+        'libwebp_utils',
+      ],
     },
     {
       'target_name': 'libwebp_dsp',
@@ -59,6 +62,9 @@
         'dsp/yuv_mips32.c',
         'dsp/yuv_sse2.c',
       ],
+      'dependencies' : [
+        'libwebp_utils',
+      ],
       'conditions': [
         ['OS == "android"', {
           'dependencies': [ '../../build/android/ndk.gyp:cpu_features' ],
@@ -141,6 +147,9 @@
         'enc/vp8l.c',
         'enc/webpenc.c',
       ],
+      'dependencies' : [
+        'libwebp_utils',
+      ],
     },
     {
       'target_name': 'libwebp_utils',
@@ -160,6 +169,20 @@
         'utils/thread.c',
         'utils/utils.c',
       ],
+      'variables': {
+        'clang_warning_flags': [
+          # See https://code.google.com/p/webp/issues/detail?id=253.
+          '-Wno-incompatible-pointer-types',
+        ]
+      },
+      'direct_dependent_settings': {
+        'variables': {
+          'clang_warning_flags': [
+            # See https://code.google.com/p/webp/issues/detail?id=253.
+            '-Wno-incompatible-pointer-types',
+          ]
+        },
+      },
     },
     {
       'target_name': 'libwebp',