From 7b0b30ace1115b71a408cceeff9f77f13554c333 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Date: Tue, 4 Oct 2016 11:40:37 +0200
Subject: [PATCH] Update Chromium
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Change-Id: Icf960eb9347e2f2f8a41bbfdb35636154fd4a382
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
---
src/3rdparty | 2 +-
tools/scripts/take_snapshot.py | 3 +++
tools/scripts/version_resolver.py | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/3rdparty b/src/3rdparty
index b4c72f26c..7824a683f 160000
--- a/src/3rdparty
+++ b/src/3rdparty
@@ -1 +1 @@
-Subproject commit b4c72f26c1b72ae2fedf601c3f5b6708bdff22da
+Subproject commit 7824a683f0d5c93e6b8fd5dfc75d51d06167f0c4
diff --git a/tools/scripts/take_snapshot.py b/tools/scripts/take_snapshot.py
index 1c65c47ed..053746f79 100755
--- a/tools/scripts/take_snapshot.py
+++ b/tools/scripts/take_snapshot.py
@@ -91,9 +91,12 @@ def isInChromiumBlacklist(file_path):
not 'third_party/chromevox' in file_path and
not 'media/desktop_media_list.h' in file_path and
not 'media/desktop_streams_registry.' in file_path and
+ not 'common/chrome_constants.' in file_path and
+ not 'common/chrome_paths' in file_path and
not 'common/chrome_switches.' in file_path and
not 'common/content_restriction.h' in file_path and
not 'common/spellcheck_' in file_path and
+ not 'common/url_constants' in file_path and
not '/extensions/api/' in file_path and
not '/extensions/browser/api/' in file_path and
not '/extensions/permissions/' in file_path and
diff --git a/tools/scripts/version_resolver.py b/tools/scripts/version_resolver.py
index 181700d92..e481f0ed0 100644
--- a/tools/scripts/version_resolver.py
+++ b/tools/scripts/version_resolver.py
@@ -38,7 +38,7 @@ import json
import urllib2
import git_submodule as GitSubmodule
-chromium_version = '53.0.2785.117'
+chromium_version = '53.0.2785.148'
chromium_branch = '2785'
ninja_version = 'v1.7.1'
--
GitLab