Merge Chromium at r66597: Initial merge by git.

Change-Id: I9639f8a997f90ec219573aa22a49f5dbde78cc7b

5 files changed, 52 insertions, 25 deletions

diff --git a/build/all.gyp b/build/all.gyp
index 87fe78f..19fd005 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -43,6 +43,7 @@
         '../third_party/modp_b64/modp_b64.gyp:*',
         '../third_party/npapi/npapi.gyp:*',
         '../third_party/ots/ots.gyp:*',
+        '../third_party/qcms/qcms.gyp:*',
         '../third_party/sqlite/sqlite.gyp:*',
         '../third_party/WebKit/WebKit/chromium/WebKit.gyp:*',
         '../third_party/zlib/zlib.gyp:*',
diff --git a/build/build_config.h b/build/build_config.h
index 1e9745f..9597eb4 100644
--- a/build/build_config.h
+++ b/build/build_config.h
@@ -17,6 +17,8 @@
 // A set of macros to use for platform detection.
 #if defined(__APPLE__)
 #define OS_MACOSX 1
+#elif defined(__native_client__)
+#define OS_NACL 1
 #elif defined(__linux__)
 #define OS_LINUX 1
 // Use TOOLKIT_GTK on linux if TOOLKIT_VIEWS isn't defined.
@@ -66,7 +68,11 @@
 // For access to standard POSIXish features, use OS_POSIX instead of a
 // more specific macro.
 #if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_FREEBSD) || \
+<<<<<<< HEAD
     defined(OS_OPENBSD) || defined(OS_SOLARIS) || defined(ANDROID)
+=======
+    defined(OS_OPENBSD) || defined(OS_SOLARIS) || defined(OS_NACL)
+>>>>>>> chromium.org at r66597
 #define OS_POSIX 1
 // Use base::DataPack for name/value pairs.
 #define USE_BASE_DATA_PACK 1
diff --git a/build/common.gypi b/build/common.gypi
index 97863a9..abfe14c 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -314,6 +314,9 @@
     # whether to compile in the sources for the GPU plugin / process.
     'enable_gpu%': 1,
 
+    # Use GConf, the GNOME configuration system.
+    'use_gconf%': 1,
+
     # Use OpenSSL instead of NSS. Currently in development.
     'use_openssl%': 0,
 
@@ -612,31 +615,31 @@
         ],
         'conditions': [
           ['OS!="win"', {
-            'sources/': [ ['exclude', '_win(_unittest)?\\.cc$'],
-                          ['exclude', '/win/'],
-                          ['exclude', '/win_[^/]*\\.cc$'] ],
+            'sources/': [ ['exclude', '_win(_unittest)?\\.(h|cc)$'],
+                          ['exclude', '(^|/)win/'],
+                          ['exclude', '(^|/)win_[^/]*\\.(h|cc)$'] ],
           }],
           ['OS!="mac"', {
-            'sources/': [ ['exclude', '_(cocoa|mac)(_unittest)?\\.cc$'],
-                          ['exclude', '/(cocoa|mac)/'],
-                          ['exclude', '\.mm?$' ] ],
+            'sources/': [ ['exclude', '_(cocoa|mac)(_unittest)?\\.(h|cc)$'],
+                          ['exclude', '(^|/)(cocoa|mac)/'],
+                          ['exclude', '\\.mm?$' ] ],
           }],
           ['OS!="linux" and OS!="freebsd" and OS!="openbsd"', {
             'sources/': [
-              ['exclude', '_(chromeos|gtk|x|x11|xdg)(_unittest)?\\.cc$'],
-              ['exclude', '/gtk/'],
-              ['exclude', '/(gtk|x11)_[^/]*\\.cc$'],
+              ['exclude', '_(chromeos|gtk|x|x11|xdg)(_unittest)?\\.(h|cc)$'],
+              ['exclude', '(^|/)gtk/'],
+              ['exclude', '(^|/)(gtk|x11)_[^/]*\\.(h|cc)$'],
             ],
           }],
           ['OS!="linux"', {
             'sources/': [
-              ['exclude', '_linux(_unittest)?\\.cc$'],
-              ['exclude', '/linux/'],
+              ['exclude', '_linux(_unittest)?\\.(h|cc)$'],
+              ['exclude', '(^|/)linux/'],
             ],
           }],
           # We use "POSIX" to refer to all non-Windows operating systems.
           ['OS=="win"', {
-            'sources/': [ ['exclude', '_posix\\.cc$'] ],
+            'sources/': [ ['exclude', '_posix\\.(h|cc)$'] ],
             # turn on warnings for signed/unsigned mismatch on chromium code.
             'msvs_settings': {
               'VCCLCompilerTool': {
@@ -645,10 +648,10 @@
             },
           }],
           ['chromeos!=1', {
-            'sources/': [ ['exclude', '_chromeos\\.cc$'] ]
+            'sources/': [ ['exclude', '_chromeos\\.(h|cc)$'] ]
           }],
           ['toolkit_views==0', {
-            'sources/': [ ['exclude', '_views\\.cc$'] ]
+            'sources/': [ ['exclude', '_views\\.(h|cc)$'] ]
           }],
         ],
       }],
@@ -1165,9 +1168,6 @@
               # http://code.google.com/p/googletest/source/detail?r=446 .
               # TODO(thakis): Use -isystem instead (http://crbug.com/58751 ).
               '-Wno-unnamed-type-template-args',
-              # The integrated assembler chokes on one ffmpeg file.
-              # http://crbug.com/61931
-              '-no-integrated-as',
             ],
             'cflags!': [
               # Clang doesn't seem to know know this flag.
diff --git a/build/linux/pkg-config-wrapper b/build/linux/pkg-config-wrapper
index fa76c2e..d94b997 100755
--- a/build/linux/pkg-config-wrapper
+++ b/build/linux/pkg-config-wrapper
@@ -11,4 +11,6 @@ rewrite=`dirname $0`/rewrite_dirs.py
 
 shift
 config_path=$root/usr/lib/pkgconfig:$root/usr/share/pkgconfig
-PKG_CONFIG_PATH=$config_path pkg-config --define-variable=prefix=/usr "$@" | $rewrite $root
+set -e
+result=`PKG_CONFIG_PATH=$config_path pkg-config --define-variable=prefix=/usr "$@"`
+echo "$result"| $rewrite $root
diff --git a/build/linux/system.gyp b/build/linux/system.gyp
index ed88a0a..59cf486 100644
--- a/build/linux/system.gyp
+++ b/build/linux/system.gyp
@@ -188,11 +188,14 @@
       'target_name': 'gconf',
       'type': 'settings',
       'conditions': [
-        ['_toolset=="target"', {
+        ['use_gconf==1 and _toolset=="target"', {
           'direct_dependent_settings': {
             'cflags': [
               '<!@(<(pkg-config) --cflags gconf-2.0)',
             ],
+            'defines': [
+              'USE_GCONF',
+            ],
           },
           'link_settings': {
             'ldflags': [
@@ -222,7 +225,25 @@
               '<!@(<(pkg-config) --libs-only-l x11)',
             ],
           },
-      }]]
+      }],
+      # When XInput2 is available (i.e. inputproto version is 2.0), the
+      # pkg-config command will succeed, so the output will be empty.
+      ['"<!@(<(pkg-config) --atleast-version=2.0 inputproto || echo $?)"==""', {
+        'direct_dependent_settings': {
+          'defines': [
+            'HAVE_XINPUT2',
+          ],
+        },
+        'link_settings': {
+          'ldflags': [
+            '<!@(<(pkg-config) --libs-only-L --libs-only-other xi)',
+          ],
+          'libraries': [
+            '<!@(<(pkg-config) --libs-only-l xi)',
+          ],
+        }
+      }],
+      ],
     },
     {
       'target_name': 'xext',
@@ -328,11 +349,8 @@
         ['use_openssl==1', {
           'direct_dependent_settings': {
             'defines': [
-              # OpenSSL support is in development.
-              # eventually USE_OPENSSL and USE_NSS will be mutually exclusive.
-              # During the transitional period, a use_openssl=1 build still
-              # needs to define USE_NSS, so it is necessary to test the
-              # USE_OPENSSL macro before testing USE_NSS.
+              # OpenSSL support is incomplete: http://crbug.com/62803.
+              # Defining USE_OPENSSL disables USE_NSS.
               'USE_OPENSSL',
             ],
             'include_dirs': [