BASELINE: Update chromium to 40.0.2214.28 and ninja to 1.5.3.

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

3 files changed, 35 insertions, 44 deletions

diff --git a/chromium/third_party/libxml/BUILD.gn b/chromium/third_party/libxml/BUILD.gn
index e3f26a16a0a..73bb3dcfb5d 100644
--- a/chromium/third_party/libxml/BUILD.gn
+++ b/chromium/third_party/libxml/BUILD.gn
@@ -142,11 +142,11 @@ static_library("libxml") {
   configs -= [ "//build/config/compiler:chromium_code" ]
   configs += [ "//build/config/compiler:no_chromium_code" ]
 
-  direct_dependent_configs = [ ":libxml_config" ]
-  forward_dependent_configs_from = [ "//third_party/icu:icuuc" ]
-
-  deps = [
+  public_configs = [ ":libxml_config" ]
+  public_deps = [
     "//third_party/icu:icuuc",
+  ]
+  deps = [
     "//third_party/zlib",
   ]
 
@@ -172,16 +172,13 @@ static_library("libxml") {
       # line, but until that's landed suppress the warning:
       "-Wno-empty-body",
 
-      # See http://crbug.com/138571#c8
+      # debugXML.c compares array 'arg' to NULL.
+      "-Wno-tautological-pointer-compare",
+
+      # threads.c attempts to forward declare a pthread_equal which doesn't
+      # match the prototype in pthreads.h
       "-Wno-ignored-attributes",
     ]
-    if (is_mac) {
-      # Mac Clang warnings.
-      cflags += [
-        # debugXML.c compares array 'arg' to NULL.
-        "-Wno-tautological-pointer-compare",
-      ]
-    }
   }
 
   include_dirs = [
diff --git a/chromium/third_party/libxml/libxml.gyp b/chromium/third_party/libxml/libxml.gyp
index c005f6a89c6..dcc75b90b81 100644
--- a/chromium/third_party/libxml/libxml.gyp
+++ b/chromium/third_party/libxml/libxml.gyp
@@ -51,7 +51,14 @@
               },
             }],
             ['OS == "ios"', {
-              'type': 'none',
+              'type': 'static_library',
+              'sources': [
+                'chromium/libxml_utils.h',
+                'chromium/libxml_utils.cc',
+              ],
+              'include_dirs': [
+                '$(SDKROOT)/usr/include/libxml2',
+              ],
               'all_dependent_settings': {
                 'defines': [
                   'USE_SYSTEM_LIBXML',
@@ -188,6 +195,21 @@
             # defines the macro FOO as 1.)
             'LIBXML_STATIC=',
           ],
+          'variables': {
+            'clang_warning_flags': [
+              # libxml passes `const unsigned char*` through `const char*`.
+              '-Wno-pointer-sign',
+              # pattern.c and uri.c both have an intentional
+              # `for (...);` / `while(...);` loop. I submitted a patch to
+              # move the `'` to its own line, but until that's landed
+              # suppress the warning:
+              '-Wno-empty-body',
+              # debugXML.c compares array 'arg' to NULL.
+              '-Wno-tautological-pointer-compare',
+              # See http://crbug.com/138571#c8
+              '-Wno-ignored-attributes',
+            ],
+          },
           'include_dirs': [
             '<(os_include)',
             '<(os_include)/include',
@@ -233,39 +255,11 @@
             }, {  # else: OS!="win"
               'product_name': 'xml2',
             }],
-            ['clang==1', {
-              'xcode_settings': {
-                'WARNING_CFLAGS': [
-                  # libxml passes `const unsigned char*` through `const char*`.
-                  '-Wno-pointer-sign',
-                  # pattern.c and uri.c both have an intentional
-                  # `for (...);` / `while(...);` loop. I submitted a patch to
-                  # move the `'` to its own line, but until that's landed
-                  # suppress the warning:
-                  '-Wno-empty-body',
-                  # debugXML.c compares array 'arg' to NULL.
-                  '-Wno-tautological-pointer-compare',
-                ],
-              },
-              'cflags': [
-                '-Wno-pointer-sign',
-                '-Wno-empty-body',
-                '-Wno-tautological-pointer-compare',
-
-                # See http://crbug.com/138571#c8
-                '-Wno-ignored-attributes',
-              ],
-              'msvs_settings': {
-                'VCCLCompilerTool': {
-                  'AdditionalOptions': [
-                    # VS2012's standard lib doesn't provide nan().
-                    '/U__STDC_VERSION__',
-                  ],
-                },
-              },
-            }],
           ],
         }],
+        ['OS == "ios"', {
+          'toolsets': ['host', 'target'],
+        }],
       ],
     },
   ],
diff --git a/chromium/third_party/libxml/src/xml2-config.in b/chromium/third_party/libxml/src/xml2-config.in
index 29893250ba6..29893250ba6 100644..100755
--- a/chromium/third_party/libxml/src/xml2-config.in
+++ b/chromium/third_party/libxml/src/xml2-config.in