Adapting to Chromium 47

Updating to Chromium 47 and adapting API.

Change-Id: Id465bbcd4facd7c47cb8a9f4bd4e18cbdc0d1120
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>

4 files changed, 19 insertions, 12 deletions

diff --git a/tools/buildscripts/gyp_qtwebengine b/tools/buildscripts/gyp_qtwebengine
index ce2a43328..b2ff4cbc4 100755
--- a/tools/buildscripts/gyp_qtwebengine
+++ b/tools/buildscripts/gyp_qtwebengine
@@ -122,16 +122,15 @@ if __name__ == '__main__':
       args.extend(['-D', 'host_arch=x64', '-D', 'use_libcpp=1'])
 
   # There shouldn't be a circular dependency relationship between .gyp files,
-  # but in Chromium's .gyp files, on non-Mac platforms, circular relationships
+  # but in Chromium's .gyp files, on non-iOS platforms, circular relationships
   # currently exist.  The check for circular dependencies is currently
-  # bypassed on other platforms, but is left enabled on the Mac, where a
-  # violation of the rule causes Xcode to misbehave badly.
+  # bypassed on other platforms, but is left enabled on iOS, where a violation
+  # of the rule causes Xcode to misbehave badly.
   # TODO(mark): Find and kill remaining circular dependencies, and remove this
   # option.  http://crbug.com/35878.
   # TODO(tc): Fix circular dependencies in ChromiumOS then add linux2 to the
   # list.
-  if sys.platform not in ('darwin',) or 'GYP_CROSSCOMPILE' in os.environ:
-    args.append('--no-circular-check')
+  args.append('--no-circular-check')
 
   args.extend(['-D', 'webkit_src_dir=' + chrome_src + '/third_party/WebKit'])
   # the top_level source directory is the first common ancestor of our module and the chromium source tree for the build to be sane.
diff --git a/tools/qmake/mkspecs/features/configure.prf b/tools/qmake/mkspecs/features/configure.prf
index 758cd9fde..5799d01ae 100644
--- a/tools/qmake/mkspecs/features/configure.prf
+++ b/tools/qmake/mkspecs/features/configure.prf
@@ -44,12 +44,12 @@ defineTest(runConfigure) {
         else: log("System libwebp or libwebpdemux not found. Using Chromium's copies.$${EOL}")
         packagesExist(libxml-2.0,libxslt): WEBENGINE_CONFIG += use_system_libxslt
         else: log("System libxml2 or libxslt not found. Using Chromium's copies.$${EOL}")
-        for(package, $$list("libevent flac jsoncpp opus speex")) {
+        for(package, $$list("libevent flac jsoncpp opus")) {
             packagesExist($$package): WEBENGINE_CONFIG += use_system_$$package
             else: log("System $$package not found. Using Chromium's copy.$${EOL}")
         }
-        packagesExist("\'vpx >= 1.4\'"): WEBENGINE_CONFIG += use_system_vpx
-        else: log("System vpx >= 1.4 not found. Using Chromium's copy.$${EOL}")
+        packagesExist("\'vpx >= 1.5\'"): WEBENGINE_CONFIG += use_system_vpx
+        else: log("System vpx >= 1.5 not found. Using Chromium's copy.$${EOL}")
         config_srtp: WEBENGINE_CONFIG += use_system_libsrtp
         else: log("System libsrtp not found. Using Chromium's copy.$${EOL}")
         config_snappy: WEBENGINE_CONFIG += use_system_snappy
diff --git a/tools/scripts/take_snapshot.py b/tools/scripts/take_snapshot.py
index 5f911f36f..141bd573a 100755
--- a/tools/scripts/take_snapshot.py
+++ b/tools/scripts/take_snapshot.py
@@ -103,6 +103,7 @@ def isInChromiumBlacklist(file_path):
             not 'media/desktop_streams_registry.' in file_path and
             not 'common/chrome_switches.' in file_path and
             not 'common/localized_error.' in file_path and
+            not '/spellchecker/' in file_path and
             not file_path.endswith('cf_resources.rc') and
             not file_path.endswith('version.py') and
             not file_path.endswith('.grd') and
@@ -116,15 +117,21 @@ def isInChromiumBlacklist(file_path):
             not file_path.startswith('components/device_event_log') and
             not file_path.startswith('components/devtools_') and
             not file_path.startswith('components/error_page') and
+            not file_path.startswith('components/keyed_service') and
             not file_path.startswith('components/mime_util') and
+            not file_path.startswith('components/pref_registry') and
             not file_path.startswith('components/printing') and
             not file_path.startswith('components/resources') and
             not file_path.startswith('components/scheduler') and
+            not file_path.startswith('components/security_interstitials') and
             not file_path.startswith('components/strings') and
             not file_path.startswith('components/tracing') and
+            not file_path.startswith('components/url_formatter') and
+            not file_path.startswith('components/user_prefs') and
             not file_path.startswith('components/visitedlink') and
             not file_path.startswith('components/web_cache') and
             not file_path.startswith('components/webcrypto') and
+            not file_path.endswith('.grd') and
             not file_path.endswith('.grdp') and
             not 'components_strings' in file_path)
         or file_path.startswith('content/public/android/java')
@@ -157,6 +164,7 @@ def isInChromiumBlacklist(file_path):
         or file_path.startswith('third_party/bison')
         or (file_path.startswith('third_party/cacheinvalidation') and
             not file_path.endswith('isolate'))
+        or file_path.startswith('third_party/catapult')
         or file_path.startswith('third_party/chromite')
         or file_path.startswith('third_party/cld_2')
         or file_path.startswith('third_party/codesighs')
@@ -173,7 +181,6 @@ def isInChromiumBlacklist(file_path):
         or file_path.startswith('third_party/google_appengine_cloudstorage')
         or file_path.startswith('third_party/google_toolbox_for_mac')
         or file_path.startswith('third_party/hunspell_dictionaries')
-        or file_path.startswith('third_party/hunspell')
         or file_path.startswith('third_party/instrumented_libraries')
         or file_path.startswith('third_party/jsr-305/src')
         or file_path.startswith('third_party/junit')
@@ -194,6 +201,7 @@ def isInChromiumBlacklist(file_path):
         or file_path.startswith('third_party/pdfium')
         or file_path.startswith('third_party/psyco_win32')
         or file_path.startswith('third_party/scons-2.0.1')
+        or file_path.startswith('third_party/sfntly/src/cpp/data/fonts')
         or file_path.startswith('third_party/trace-viewer')
         or file_path.startswith('third_party/undoview')
         or file_path.startswith('third_party/webgl')
diff --git a/tools/scripts/version_resolver.py b/tools/scripts/version_resolver.py
index baa4a468a..1af8cd219 100644
--- a/tools/scripts/version_resolver.py
+++ b/tools/scripts/version_resolver.py
@@ -51,9 +51,9 @@ import json
 import urllib2
 import git_submodule as GitSubmodule
 
-chromium_version = '45.0.2454.101'
-chromium_branch = '2454'
-ninja_version = 'v1.5.3'
+chromium_version = '47.0.2526.34'
+chromium_branch = '2526'
+ninja_version = 'v1.6.0'
 
 json_url = 'http://omahaproxy.appspot.com/all.json'