22 files changed, 242 insertions, 202 deletions

diff --git a/patches/0002-Add-WebEngineContext-to-RunLoop-s-friends.patch b/patches/chromium/0001-Add-WebEngineContext-to-RunLoop-s-friends.patch
index fba13a90a..31e97a832 100644
--- a/patches/0002-Add-WebEngineContext-to-RunLoop-s-friends.patch
+++ b/patches/chromium/0001-Add-WebEngineContext-to-RunLoop-s-friends.patch
@@ -1,7 +1,7 @@
-From 1f686ea3aafa4d950d92a7f945cfec5b6fb02dfd Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
 Date: Tue, 11 Jun 2013 15:44:26 +0200
-Subject: [PATCH 2/2] Add WebEngineContext to RunLoop's friends.
+Subject: Add WebEngineContext to RunLoop's friends.
 
 ---
  base/run_loop.h | 3 +++
@@ -28,6 +28,3 @@ index f5ee5c3..b167907 100644
  #if defined(OS_ANDROID)
    // Android doesn't support the blocking MessageLoop::Run, so it calls
    // BeforeRun and AfterRun directly.
--- 
-1.8.4.2
-
diff --git a/patches/0001-Mac-Use-libc-instead-of-stdlibc.patch b/patches/chromium/0002-Mac-Use-libc-instead-of-stdlibc.patch
index a0e954005..279e10a95 100644
--- a/patches/0001-Mac-Use-libc-instead-of-stdlibc.patch
+++ b/patches/chromium/0002-Mac-Use-libc-instead-of-stdlibc.patch
@@ -1,7 +1,7 @@
-From ef6535b235613885abc20eb61879c4f97874cb5b Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Zeno Albisser <zeno.albisser@digia.com>
 Date: Thu, 27 Jun 2013 15:51:43 +0200
-Subject: [PATCH] Mac: Use libc++ instead of stdlibc++.
+Subject: Mac: Use libc++ instead of stdlibc++.
 
 - Add a missing include file to process_iterator_mac.cc.
 - Disable Chromium clang plugins.
@@ -157,6 +157,3 @@ index dcc0041..affcf55 100644
  #endif
  
  /* Define to 1 if you have the <dlfcn.h> header file. */
--- 
-1.8.4.2
-
diff --git a/patches/0002-Clang-libc-does-not-support-incomplete-types-in-temp.patch b/patches/chromium/0003-Clang-libc-does-not-support-incomplete-types-in-temp.patch
index 36d032cad..ce3d9bb30 100644
--- a/patches/0002-Clang-libc-does-not-support-incomplete-types-in-temp.patch
+++ b/patches/chromium/0003-Clang-libc-does-not-support-incomplete-types-in-temp.patch
@@ -1,8 +1,7 @@
-From f888ffe0c6d43b1fda162a4a33a84377c583f2d3 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Zeno Albisser <zeno.albisser@digia.com>
 Date: Thu, 27 Jun 2013 15:58:32 +0200
-Subject: [PATCH] Clang / libc++ does not support incomplete types in
- templates. See:
+Subject: Clang / libc++ does not support incomplete types in templates. See:
  http://clang.llvm.org/compatibility.html#undep_incomplete
 
 Therefore forward declarations must be removed in several places:
@@ -33,6 +32,8 @@ Therefore forward declarations must be removed in several places:
  content/common/gpu/gpu_messages.h                  |  4 ++-
  content/renderer/media/media_stream_dispatcher.cc  | 31 ---------------------
  content/renderer/media/media_stream_dispatcher.h   | 31 +++++++++++++++++++--
+ content/renderer/pepper/message_channel.cc         | 12 --------
+ content/renderer/pepper/message_channel.h          | 18 ++++++++----
  gpu/config/dx_diag_node.cc                         |  4 +++
  gpu/config/dx_diag_node.h                          |  4 +++
  media/filters/ffmpeg_audio_decoder.cc              |  6 ----
@@ -41,7 +42,7 @@ Therefore forward declarations must be removed in several places:
  net/cert/mock_cert_verifier.h                      | 20 +++++++++++++-
  net/dns/mock_host_resolver.cc                      | 31 ---------------------
  net/dns/mock_host_resolver.h                       | 32 +++++++++++++++++++++-
- 18 files changed, 155 insertions(+), 162 deletions(-)
+ 20 files changed, 168 insertions(+), 179 deletions(-)
 
 diff --git a/base/callback_forward.h b/base/callback_forward.h
 index 7983248..8538bb2 100644
@@ -365,6 +366,70 @@ index aa8f345..af25963 100644
  
    // An enumeration request is identified by pair (request_id, handler).
    // It allows multiple clients to make requests and each client could have
+diff --git a/content/renderer/pepper/message_channel.cc b/content/renderer/pepper/message_channel.cc
+index f06b787..c41be2f 100644
+--- a/content/renderer/pepper/message_channel.cc
++++ b/content/renderer/pepper/message_channel.cc
+@@ -279,18 +279,6 @@ NPClass message_channel_class = {
+ }  // namespace
+ 
+ // MessageChannel --------------------------------------------------------------
+-struct MessageChannel::VarConversionResult {
+-  VarConversionResult(const ppapi::ScopedPPVar& r, bool s)
+-      : result(r),
+-        success(s),
+-        conversion_completed(true) {}
+-  VarConversionResult()
+-      : success(false),
+-        conversion_completed(false) {}
+-  ppapi::ScopedPPVar result;
+-  bool success;
+-  bool conversion_completed;
+-};
+ 
+ MessageChannel::MessageChannelNPObject::MessageChannelNPObject() {
+ }
+diff --git a/content/renderer/pepper/message_channel.h b/content/renderer/pepper/message_channel.h
+index 9c8c28d..e4e1423 100644
+--- a/content/renderer/pepper/message_channel.h
++++ b/content/renderer/pepper/message_channel.h
+@@ -10,15 +10,12 @@
+ 
+ #include "base/memory/weak_ptr.h"
+ #include "ppapi/shared_impl/resource.h"
++#include "ppapi/shared_impl/scoped_pp_var.h"
+ #include "third_party/WebKit/public/web/WebSerializedScriptValue.h"
+ #include "third_party/npapi/bindings/npruntime.h"
+ 
+ struct PP_Var;
+ 
+-namespace ppapi {
+-class ScopedPPVar;
+-}
+-
+ namespace content {
+ 
+ class PepperPluginInstanceImpl;
+@@ -86,7 +83,18 @@ class MessageChannel {
+ 
+  private:
+   // Struct for storing the result of a NPVariant being converted to a PP_Var.
+-  struct VarConversionResult;
++  struct VarConversionResult {
++    VarConversionResult(const ppapi::ScopedPPVar& r, bool s)
++        : result(r),
++          success(s),
++          conversion_completed(true) {}
++    VarConversionResult()
++        : success(false),
++          conversion_completed(false) {}
++    ppapi::ScopedPPVar result;
++    bool success;
++    bool conversion_completed;
++  };
+ 
+   // This is called when an NPVariant is finished being converted.
+   // |result_iteartor| is an iterator into |converted_var_queue_| where the
 diff --git a/gpu/config/dx_diag_node.cc b/gpu/config/dx_diag_node.cc
 index e0902ca..c1e84ae 100644
 --- a/gpu/config/dx_diag_node.cc
@@ -586,67 +651,3 @@ index 3593fbd..f8a4240 100644
    typedef std::list<Rule> RuleList;
  
    virtual ~RuleBasedHostResolverProc();
-diff --git a/content/renderer/pepper/message_channel.cc b/content/renderer/pepper/message_channel.cc
-index f06b787..c41be2f 100644
---- a/content/renderer/pepper/message_channel.cc
-+++ b/content/renderer/pepper/message_channel.cc
-@@ -279,18 +279,6 @@ NPClass message_channel_class = {
- }  // namespace
- 
- // MessageChannel --------------------------------------------------------------
--struct MessageChannel::VarConversionResult {
--  VarConversionResult(const ppapi::ScopedPPVar& r, bool s)
--      : result(r),
--        success(s),
--        conversion_completed(true) {}
--  VarConversionResult()
--      : success(false),
--        conversion_completed(false) {}
--  ppapi::ScopedPPVar result;
--  bool success;
--  bool conversion_completed;
--};
- 
- MessageChannel::MessageChannelNPObject::MessageChannelNPObject() {
- }
-diff --git a/content/renderer/pepper/message_channel.h b/content/renderer/pepper/message_channel.h
-index 9c8c28d..1a74513 100644
---- a/content/renderer/pepper/message_channel.h
-+++ b/content/renderer/pepper/message_channel.h
-@@ -10,15 +10,12 @@
- 
- #include "base/memory/weak_ptr.h"
- #include "ppapi/shared_impl/resource.h"
-+#include "ppapi/shared_impl/scoped_pp_var.h"
- #include "third_party/WebKit/public/web/WebSerializedScriptValue.h"
- #include "third_party/npapi/bindings/npruntime.h"
- 
- struct PP_Var;
- 
--namespace ppapi {
--class ScopedPPVar;
--}
--
- namespace content {
- 
- class PepperPluginInstanceImpl;
-@@ -86,7 +86,18 @@ class MessageChannel {
- 
-  private:
-   // Struct for storing the result of a NPVariant being converted to a PP_Var.
--  struct VarConversionResult;
-+  struct VarConversionResult {
-+    VarConversionResult(const ppapi::ScopedPPVar& r, bool s)
-+        : result(r),
-+          success(s),
-+          conversion_completed(true) {}
-+    VarConversionResult()
-+        : success(false),
-+          conversion_completed(false) {}
-+    ppapi::ScopedPPVar result;
-+    bool success;
-+    bool conversion_completed;
-+  };
- 
-   // This is called when an NPVariant is finished being converted.
-   // |result_iteartor| is an iterator into |converted_var_queue_| where the
diff --git a/patches/0001-Mac-Do-not-modify-the-child-path.patch b/patches/chromium/0004-Do-not-modify-the-child-path.patch
index c4b538e6a..ee80678eb 100644
--- a/patches/0001-Mac-Do-not-modify-the-child-path.patch
+++ b/patches/chromium/0004-Do-not-modify-the-child-path.patch
@@ -1,7 +1,7 @@
-From 19d0958dc151847b994c352fdffd2844bec20b43 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Zeno Albisser <zeno.albisser@digia.com>
 Date: Sat, 29 Jun 2013 22:39:29 +0200
-Subject: [PATCH] [Mac] Do not modify the child path.
+Subject: Do not modify the child path.
 
 We currently only have a single process binary for Qt.
 Therefore we should not choose a different binary based on required privileges.
@@ -12,7 +12,7 @@ May be we should instead implement our own ChildProcessHost.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/content/common/child_process_host_impl.cc b/content/common/child_process_host_impl.cc
-index 2dfab2f..3f53266 100644
+index fb058d3..2208376 100644
 --- a/content/common/child_process_host_impl.cc
 +++ b/content/common/child_process_host_impl.cc
 @@ -106,7 +106,7 @@ base::FilePath ChildProcessHost::GetChildPath(int flags) {
@@ -24,6 +24,3 @@ index 2dfab2f..3f53266 100644
    DCHECK(!(flags & CHILD_NO_PIE && flags & CHILD_ALLOW_HEAP_EXECUTION));
  
    // If needed, choose an executable with special flags set that inform the
--- 
-1.7.12.4 (Apple Git-37)
-
diff --git a/patches/0001-Do-not-warn-for-header-hygiene.patch b/patches/chromium/0005-Do-not-warn-for-header-hygiene.patch
index c72d0f4b0..01afa7e9c 100644
--- a/patches/0001-Do-not-warn-for-header-hygiene.patch
+++ b/patches/chromium/0005-Do-not-warn-for-header-hygiene.patch
@@ -1,7 +1,7 @@
-From 5f3a19c6f12690d882f1136af4338531c04149b3 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Zeno Albisser <zeno.albisser@digia.com>
 Date: Wed, 3 Jul 2013 11:16:56 +0200
-Subject: [PATCH] Do not warn for header-hygiene.
+Subject: Do not warn for header-hygiene.
 
 QtDeclarative is consciously leaking the namespace QtQml.
 Therefore clang would warn about header hygiene.
@@ -24,6 +24,3 @@ index 9961053..ab759282 100644
                ],
              }],
              ['clang==1 and clang_use_chrome_plugins==1', {
--- 
-1.8.4.2
-
diff --git a/patches/0001-Build-files-necessary-for-touch-and-gestures.patch b/patches/chromium/0006-Build-files-necessary-for-touch-and-gestures.patch
index 8243b97dc..14b4c2239 100644
--- a/patches/0001-Build-files-necessary-for-touch-and-gestures.patch
+++ b/patches/chromium/0006-Build-files-necessary-for-touch-and-gestures.patch
@@ -1,7 +1,7 @@
-From f6f4790eba13beb53ee0a1e169fd75e04ec9eefa Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
 Date: Thu, 25 Jul 2013 17:25:47 +0200
-Subject: [PATCH] Build files necessary for touch and gestures.
+Subject: Build files necessary for touch and gestures.
 
 Also guard the use of MessagePumpAuraX11 in events_x.cc. We need to
 build it to get symbols depending on base::NativeEvent.
@@ -45,6 +45,3 @@ index 09c011c..4716f6c 100644
            'sources!': [
              'base/x/events_x.cc',
              'events/event.cc',
--- 
-1.8.4.2
-
diff --git a/patches/0001-remove-Wno-deprecated-register-from-common.gypi.patch b/patches/chromium/0007-remove-Wno-deprecated-register-from-common.gypi.patch
index 3a5bef7f8..cb980c691 100644
--- a/patches/0001-remove-Wno-deprecated-register-from-common.gypi.patch
+++ b/patches/chromium/0007-remove-Wno-deprecated-register-from-common.gypi.patch
@@ -1,7 +1,7 @@
-From 06b7d7b85c53a6c5b39eff247dd5ce869956f411 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Zeno Albisser <zeno.albisser@digia.com>
 Date: Thu, 1 Aug 2013 14:03:14 +0200
-Subject: [PATCH] remove -Wno-deprecated-register from common.gypi.
+Subject: remove -Wno-deprecated-register from common.gypi.
 
 This warning is not supported by recent clang versions
 shipping with XCode. Therefore replacing it with -Wno-deprecated.
@@ -33,6 +33,3 @@ index ab759282..cf5b196 100644
                ],
              }],
              ['use_libcpp==1', {
--- 
-1.8.4.2
-
diff --git a/patches/0001-Solve-conflicts-when-including-both-QtOpenGL-headers.patch b/patches/chromium/0008-Solve-conflicts-when-including-both-QtOpenGL-headers.patch
index 56b54dfc0..a12c9fb8e 100644
--- a/patches/0001-Solve-conflicts-when-including-both-QtOpenGL-headers.patch
+++ b/patches/chromium/0008-Solve-conflicts-when-including-both-QtOpenGL-headers.patch
@@ -1,7 +1,7 @@
-From 08012c5c84dc6f63c1c91d8035ec11b497e6e11c Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
 Date: Fri, 6 Sep 2013 17:08:45 +0200
-Subject: [PATCH] Solve conflicts when including both QtOpenGL headers and
+Subject: Solve conflicts when including both QtOpenGL headers and
  resource_provider.h
 
 If resource_provider.h is going to be used to integrate delegated frame
@@ -72,6 +72,3 @@ index fb1e5f0..928d4f9 100644
  namespace WebKit { class WebGraphicsContext3D; }
  
  namespace gfx {
--- 
-1.8.4.2
-
diff --git a/patches/0001-Do-not-forward-declare-UIResourceRequest-Identity-an.patch b/patches/chromium/0009-Do-not-forward-declare-UIResourceRequest-Identity-an.patch
index 7738e9bf9..9d24881fb 100644
--- a/patches/0001-Do-not-forward-declare-UIResourceRequest-Identity-an.patch
+++ b/patches/chromium/0009-Do-not-forward-declare-UIResourceRequest-Identity-an.patch
@@ -1,8 +1,7 @@
-From 7126d1d1fdb7b64b6bd46908154a7c8fa582ed8b Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Zeno Albisser <zeno.albisser@digia.com>
 Date: Tue, 29 Oct 2013 11:30:28 +0100
-Subject: [PATCH] Do not forward declare UIResourceRequest, Identity and
- IdentityKey.
+Subject: Do not forward declare UIResourceRequest, Identity and IdentityKey.
 
 Clang / libc++ does not support incomplete types in templates.
 See: http://clang.llvm.org/compatibility.html#undep_incomplete
@@ -132,6 +131,3 @@ index ab4e1ed..e660c73 100644
    typedef std::map<IdentityKey, Identity> IdentityMap;
  
    ~WebRTCIdentityStoreBackend();
--- 
-1.8.4.2
-
diff --git a/patches/0001-Fix-the-build-with-a-GL-ES2-configured-Qt.patch b/patches/chromium/0010-Fix-the-build-with-a-GL-ES2-configured-Qt.patch
index 03b50e1e0..02688d6ad 100644
--- a/patches/0001-Fix-the-build-with-a-GL-ES2-configured-Qt.patch
+++ b/patches/chromium/0010-Fix-the-build-with-a-GL-ES2-configured-Qt.patch
@@ -1,7 +1,7 @@
-From 65f72f14be2902840e0a478be640aba168d0f15e Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
 Date: Wed, 30 Oct 2013 14:27:28 +0100
-Subject: [PATCH] Fix the build with a GL ES2 configured Qt.
+Subject: Fix the build with a GL ES2 configured Qt.
 
 GLES/gl2.h is included through Qt public headers and the copy of
 Chromium is used since its include path comes before /usr/include.
@@ -159,6 +159,3 @@ index 2831446..be79c22 100644
            'sources': [
              # This list contains all .h and .cc in gpu except for test code.
              'context_provider_in_process.cc',
--- 
-1.8.4.2
-
diff --git a/patches/0001-Hide-the-definition-of-MessagePumpGtk-GetDefaultXDis.patch b/patches/chromium/0011-Hide-the-definition-of-MessagePumpGtk-GetDefaultXDis.patch
index 3fdf76b20..41ac2c5e1 100644
--- a/patches/0001-Hide-the-definition-of-MessagePumpGtk-GetDefaultXDis.patch
+++ b/patches/chromium/0011-Hide-the-definition-of-MessagePumpGtk-GetDefaultXDis.patch
@@ -1,7 +1,7 @@
-From 717b027460dbda87c965ea0069fd11bbe7aad59f Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
 Date: Fri, 20 Sep 2013 15:01:41 +0200
-Subject: [PATCH] Hide the definition of MessagePumpGtk::GetDefaultXDisplay.
+Subject: Hide the definition of MessagePumpGtk::GetDefaultXDisplay.
 
 ---
  base/message_loop/message_pump_gtk.cc | 4 ++++
@@ -29,6 +29,3 @@ index 86d2415..6023c11 100644
  
  void MessagePumpGtk::AddObserver(MessagePumpGdkObserver* observer) {
    observers_.AddObserver(observer);
--- 
-1.8.4.2
-
diff --git a/patches/0001-Add-accessors-for-the-Qt-delegated-renderer-integrat.patch b/patches/chromium/0012-Add-accessors-for-the-Qt-delegated-renderer-integrat.patch
index fe63dfc0f..3a9052ff2 100644
--- a/patches/0001-Add-accessors-for-the-Qt-delegated-renderer-integrat.patch
+++ b/patches/chromium/0012-Add-accessors-for-the-Qt-delegated-renderer-integrat.patch
@@ -1,7 +1,7 @@
-From e40d3482d46ff88755aa2bd76048de698ae03915 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
 Date: Fri, 20 Sep 2013 15:00:47 +0200
-Subject: [PATCH] Add accessors for the Qt delegated renderer integration.
+Subject: Add accessors for the Qt delegated renderer integration.
 
 This is needed to fetch the MessageLoop, the MailboxManager and the
 SyncPointManager of the GPU in-process host.
@@ -79,6 +79,3 @@ index ff0c925..82bb32a 100644
    DISALLOW_COPY_AND_ASSIGN(GpuChildThread);
  };
  
--- 
-1.8.4.2
-
diff --git a/patches/0001-Add-seams-to-setup-GL-contexts-sharing-with-QtQuick.patch b/patches/chromium/0013-Add-seams-to-setup-GL-contexts-sharing-with-QtQuick.patch
index 926f799f2..a304c93bc 100644
--- a/patches/0001-Add-seams-to-setup-GL-contexts-sharing-with-QtQuick.patch
+++ b/patches/chromium/0013-Add-seams-to-setup-GL-contexts-sharing-with-QtQuick.patch
@@ -1,7 +1,7 @@
-From 559c011aabd6fc9f064d2913e4fae06db2c8495b Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
 Date: Thu, 24 Oct 2013 18:26:59 +0200
-Subject: [PATCH] Add seams to setup GL contexts sharing with QtQuick.
+Subject: Add seams to setup GL contexts sharing with QtQuick.
 
 This will allow us to know right before the first GL context is
 instantiated by Chromium so that we can install those contexts to
@@ -104,6 +104,3 @@ index 1deed63..f1b0369 100644
  
    // References to GLContext are by raw pointer to avoid a reference count
    // cycle.
--- 
-1.8.4.2
-
diff --git a/patches/0001-Declare-a-Qt-IPC-message-class.patch b/patches/chromium/0014-Declare-a-Qt-IPC-message-class.patch
index b86968800..c08c09916 100644
--- a/patches/0001-Declare-a-Qt-IPC-message-class.patch
+++ b/patches/chromium/0014-Declare-a-Qt-IPC-message-class.patch
@@ -1,7 +1,7 @@
-From de3f8ee976ac7e438616bc28dac2cb418781b103 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
 Date: Wed, 15 Jan 2014 17:22:44 +0100
-Subject: [PATCH] Declare a Qt IPC message class
+Subject: Declare a Qt IPC message class
 
 This allows Qt-specific IPC messages to be declared in QtWebEngine.
 
@@ -23,6 +23,3 @@ index a8cca53..314ed0e 100644
    ViewMsgStart,
    InputMsgStart,
    PluginMsgStart,
--- 
-1.8.4.2
-
diff --git a/patches/0001-Remove-leftovers-from-WebKitSystemInterface.patch b/patches/chromium/third_party/WebKit/0001-Remove-leftovers-from-WebKitSystemInterface.patch
index 7840d8ffc..bfd00a573 100644
--- a/patches/0001-Remove-leftovers-from-WebKitSystemInterface.patch
+++ b/patches/chromium/third_party/WebKit/0001-Remove-leftovers-from-WebKitSystemInterface.patch
@@ -1,7 +1,7 @@
-From 3920838a47cac775bb9f1eebc2c144bd1bde9848 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Zeno Albisser <zeno.albisser@digia.com>
 Date: Thu, 27 Jun 2013 19:21:34 +0200
-Subject: [PATCH] Remove leftovers from WebKitSystemInterface
+Subject: Remove leftovers from WebKitSystemInterface
 
 ---
  Source/core/platform/graphics/mac/ComplexTextControllerCoreText.mm | 5 -----
@@ -26,6 +26,3 @@ index c5be0bb..5882bcd 100644
  
          line.adoptCF(CTTypesetterCreateLine(typesetter.get(), CFRangeMake(0, 0)));
      } else {
--- 
-1.8.4.2
-
diff --git a/patches/0001-Do-not-forward-declare-WebRtcVoiceChannelInfo.patch b/patches/chromium/third_party/libjingle/source/talk/0001-Do-not-forward-declare-WebRtcVoiceChannelInfo.patch
index 929312e57..5af44662d 100644
--- a/patches/0001-Do-not-forward-declare-WebRtcVoiceChannelInfo.patch
+++ b/patches/chromium/third_party/libjingle/source/talk/0001-Do-not-forward-declare-WebRtcVoiceChannelInfo.patch
@@ -1,7 +1,7 @@
-From 22f77b7305fa13a3d3987a1c4609a7fe51a603b4 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Zeno Albisser <zeno.albisser@digia.com>
 Date: Wed, 16 Oct 2013 10:17:11 +0200
-Subject: [PATCH] Do not forward declare WebRtcVoiceChannelInfo.
+Subject: Do not forward declare WebRtcVoiceChannelInfo.
 
 Clang / libc++ does not support incomplete types in
 templates. See:
@@ -61,6 +61,3 @@ index 6cb0b30..62d3bc1 100644
    typedef std::map<uint32, WebRtcVoiceChannelInfo> ChannelMap;
  
    void SetNack(int channel, bool nack_enabled);
--- 
-1.8.4.2
-
diff --git a/patches/0001-GRIT-Allow-grd-files-outside-of-chromium-source-dir.patch b/patches/chromium/tools/grit/0001-GRIT-Allow-grd-files-outside-of-chromium-source-dir.patch
index 0816daec2..9da214cc2 100644
--- a/patches/0001-GRIT-Allow-grd-files-outside-of-chromium-source-dir.patch
+++ b/patches/chromium/tools/grit/0001-GRIT-Allow-grd-files-outside-of-chromium-source-dir.patch
@@ -1,7 +1,7 @@
-From d170ae2a713d6f69dbecbf31c566f5c092896344 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Zeno Albisser <zeno.albisser@digia.com>
 Date: Wed, 24 Jul 2013 15:54:50 +0200
-Subject: [PATCH] GRIT: Allow grd files outside of chromium source dir.
+Subject: GRIT: Allow grd files outside of chromium source dir.
 
 When replacing substrings with values from a dictionary,
 the replacements should not be truncated to the length of src_root_dir.
@@ -41,6 +41,3 @@ index 734c57a..33848b2 100755
          else:
            filename = abs_filename[len(src_root_dir) + 1:]
            filename = filename.replace('\\', '/')
--- 
-1.8.4.2
-
diff --git a/patches/0001-GYP-Fix-build-with-toplevel-dir.patch b/patches/chromium/tools/gyp/0001-Fix-build-with-toplevel-dir.patch
index 6980f9558..0ab2861ee 100644
--- a/patches/0001-GYP-Fix-build-with-toplevel-dir.patch
+++ b/patches/chromium/tools/gyp/0001-Fix-build-with-toplevel-dir.patch
@@ -1,17 +1,17 @@
-From 5f2e25825375c613c3cd249f874d7a295de2fefd Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Pierre Rossi <pierre.rossi@digia.com>
 Date: Mon, 13 May 2013 16:25:46 +0200
-Subject: [GYP] Fix build with toplevel-dir
+Subject: Fix build with toplevel-dir
 
 ---
  pylib/gyp/generator/ninja.py | 8 ++++++--
  1 file changed, 6 insertions(+), 2 deletions(-)
 
 diff --git a/pylib/gyp/generator/ninja.py b/pylib/gyp/generator/ninja.py
-index 619ac39..e10038a 100644
+index 9011807..6fe07c5 100644
 --- a/pylib/gyp/generator/ninja.py
 +++ b/pylib/gyp/generator/ninja.py
-@@ -1309,9 +1309,13 @@ def CalculateVariables(default_variables, params):
+@@ -1476,9 +1476,13 @@ def CalculateVariables(default_variables, params):
      default_variables.setdefault('SHARED_LIB_SUFFIX', '.so')
      default_variables.setdefault('SHARED_LIB_DIR',
                                   os.path.join('$!PRODUCT_DIR', 'lib'))
@@ -27,6 +27,3 @@ index 619ac39..e10038a 100644
  
  def OpenOutput(path, mode='w'):
    """Open |path| for writing, creating directories if necessary."""
--- 
-1.8.2.1
-
diff --git a/patches/0001-Add-support-for-libc-to-xcode_emulation.py.patch b/patches/chromium/tools/gyp/0002-Add-support-for-libc-to-xcode_emulation.py.patch
index 68eb74500..d12bad22b 100644
--- a/patches/0001-Add-support-for-libc-to-xcode_emulation.py.patch
+++ b/patches/chromium/tools/gyp/0002-Add-support-for-libc-to-xcode_emulation.py.patch
@@ -1,7 +1,7 @@
-From 43673a67cdcced912cad207ee0fbca7321f72ecf Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Zeno Albisser <zeno.albisser@digia.com>
 Date: Thu, 27 Jun 2013 20:04:51 +0200
-Subject: [PATCH] Add support for libc++ to xcode_emulation.py
+Subject: Add support for libc++ to xcode_emulation.py
 
 ---
  pylib/gyp/xcode_emulation.py | 3 +++
@@ -21,6 +21,3 @@ index b4af0fd..fb40048 100644
      if self._Test('DEAD_CODE_STRIPPING', 'YES', default='NO'):
        ldflags.append('-Wl,-dead_strip')
  
--- 
-1.8.4.2
-
diff --git a/patches/patch-chromium.sh b/patches/patch-chromium.sh
index 7dd0f153e..c3a33aa22 100755
--- a/patches/patch-chromium.sh
+++ b/patches/patch-chromium.sh
@@ -40,9 +40,7 @@
 ##
 #############################################################################
 
-# Script used temporarily to invoke gclient and apply our patches
-
-PATCH_DIR="$( cd "$( dirname "$0" )" && pwd )"
+PATCH_DIR="$( cd "$( dirname "$0" )"/chromium && pwd )"
 
 if [ -z "$CHROMIUM_SRC_DIR" ]; then
     CHROMIUM_SRC_DIR="$( cd `git config qtwebengine.chromiumsrcdir` && pwd )"
@@ -53,40 +51,15 @@ if [ ! -d "$CHROMIUM_SRC_DIR" ]; then
     exit 1;
 fi
 
-cd $CHROMIUM_SRC_DIR
-echo "Entering $PWD"
-
-git am $PATCH_DIR/0002-Add-WebEngineContext-to-RunLoop-s-friends.patch
-git am $PATCH_DIR/0001-Mac-Use-libc-instead-of-stdlibc.patch
-git am $PATCH_DIR/0002-Clang-libc-does-not-support-incomplete-types-in-temp.patch
-git am $PATCH_DIR/0001-Mac-Do-not-modify-the-child-path.patch
-git am $PATCH_DIR/0001-Do-not-warn-for-header-hygiene.patch
-git am $PATCH_DIR/0001-Build-files-necessary-for-touch-and-gestures.patch
-git am $PATCH_DIR/0001-remove-Wno-deprecated-register-from-common.gypi.patch
-git am $PATCH_DIR/0001-Solve-conflicts-when-including-both-QtOpenGL-headers.patch
-git am $PATCH_DIR/0001-Do-not-forward-declare-UIResourceRequest-Identity-an.patch
-git am $PATCH_DIR/0001-Fix-the-build-with-a-GL-ES2-configured-Qt.patch
-git am $PATCH_DIR/0001-Hide-the-definition-of-MessagePumpGtk-GetDefaultXDis.patch
-git am $PATCH_DIR/0001-Add-accessors-for-the-Qt-delegated-renderer-integrat.patch
-git am $PATCH_DIR/0001-Add-seams-to-setup-GL-contexts-sharing-with-QtQuick.patch
-git am $PATCH_DIR/0001-Declare-a-Qt-IPC-message-class.patch
-
-cd $CHROMIUM_SRC_DIR/third_party/WebKit
-echo "Entering $PWD"
-
-git am $PATCH_DIR/0001-Remove-leftovers-from-WebKitSystemInterface.patch
-
-cd $CHROMIUM_SRC_DIR/third_party/libjingle/source/talk
-echo "Entering $PWD"
-
-git am $PATCH_DIR/0001-Do-not-forward-declare-WebRtcVoiceChannelInfo.patch
-
-cd $CHROMIUM_SRC_DIR/tools/gyp
-echo "Entering $PWD"
-
-git am $PATCH_DIR/0001-GYP-Fix-build-with-toplevel-dir.patch
-git am $PATCH_DIR/0001-Add-support-for-libc-to-xcode_emulation.py.patch
-
-cd $CHROMIUM_SRC_DIR/tools/grit
-git am $PATCH_DIR/0001-GRIT-Allow-grd-files-outside-of-chromium-source-dir.patch
-
+for MODULE in \
+    / \
+    /third_party/WebKit \
+    /third_party/libjingle/source/talk \
+    /tools/gyp \
+    /tools/grit
+do
+    cd $CHROMIUM_SRC_DIR$MODULE
+    echo "Entering $PWD"
+    git tag -f first-parent
+    git am $PATCH_DIR$MODULE/0*
+done
diff --git a/patches/update-patches.sh b/patches/update-patches.sh
new file mode 100755
index 000000000..a0e73950c
--- /dev/null
+++ b/patches/update-patches.sh
@@ -0,0 +1,68 @@
+#!/bin/sh
+#############################################################################
+##
+## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+## Contact: http://www.qt-project.org/legal
+##
+## This file is part of the QtWebEngine of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and Digia.  For licensing terms and
+## conditions see http://qt.digia.com/licensing.  For further information
+## use the contact form at http://qt.digia.com/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL included in the
+## packaging of this file.  Please review the following information to
+## ensure the GNU Lesser General Public License version 2.1 requirements
+## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## In addition, as a special exception, Digia gives you certain additional
+## rights.  These rights are described in the Digia Qt LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3.0 as published by the Free Software
+## Foundation and appearing in the file LICENSE.GPL included in the
+## packaging of this file.  Please review the following information to
+## ensure the GNU General Public License version 3.0 requirements will be
+## met: http://www.gnu.org/copyleft/gpl.html.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+THIRDPARTY_UPSTREAM_CHROMIUM_DIR="$( cd "$( dirname "$0" )"/../src/3rdparty_upstream/chromium && pwd )"
+SCRIPTS_DIR="$( cd "$( dirname "$0" )"/../tools/scripts && pwd )"
+PATCH_DIR="$( cd "$( dirname "$0" )"/chromium && pwd )"
+
+for MODULE in \
+    / \
+    /third_party/WebKit \
+    /third_party/libjingle/source/talk \
+    /tools/gyp \
+    /tools/grit
+do
+    cd $THIRDPARTY_UPSTREAM_CHROMIUM_DIR$MODULE
+    echo "Entering $PWD"
+    git rev-parse first-parent > /dev/null
+    if [ $? -ne 0 ]; then
+        echo "ERROR: Can't find the 'first-parent' git tag pointing where to start, you might have to re-run init-repository.py and re-apply your modifications."
+        exit 1
+    fi
+
+    rm $PATCH_DIR$MODULE/0*
+    git format-patch --no-signature -k -o $PATCH_DIR$MODULE first-parent
+    $SCRIPTS_DIR/clean_gitformatpatch_patchid.py $PATCH_DIR$MODULE/0*
+    cd $PATCH_DIR
+    git add --all $PATCH_DIR$MODULE
+done
+
diff --git a/tools/scripts/clean_gitformatpatch_patchid.py b/tools/scripts/clean_gitformatpatch_patchid.py
new file mode 100755
index 000000000..930e2af4e
--- /dev/null
+++ b/tools/scripts/clean_gitformatpatch_patchid.py
@@ -0,0 +1,53 @@
+#!/usr/bin/env python
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+## Contact: http://www.qt-project.org/legal
+##
+## This file is part of the QtWebEngine of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and Digia.  For licensing terms and
+## conditions see http://qt.digia.com/licensing.  For further information
+## use the contact form at http://qt.digia.com/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL included in the
+## packaging of this file.  Please review the following information to
+## ensure the GNU Lesser General Public License version 2.1 requirements
+## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## In addition, as a special exception, Digia gives you certain additional
+## rights.  These rights are described in the Digia Qt LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3.0 as published by the Free Software
+## Foundation and appearing in the file LICENSE.GPL included in the
+## packaging of this file.  Please review the following information to
+## ensure the GNU General Public License version 3.0 requirements will be
+## met: http://www.gnu.org/copyleft/gpl.html.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+import re
+import sys
+
+for fileName in sys.argv[1:]:
+    input = open(fileName)
+    # Replace the SHA1 in the from-line of the mbox with a dummy SHA1 to prevent unneeded changes to the patch file.
+    lines = [re.sub('^From \w*', 'From 0000000000000000000000000000000000000000', l) for l in input]
+    input.close()
+    output = open(fileName, 'w')
+    output.writelines(lines)
+    output.close()