summaryrefslogtreecommitdiffstats
path: root/patches/chromium/0001-Add-WebEngineContext-to-RunLoop-s-friends.patch
diff options
context:
space:
mode:
authorAndras Becsi <andras.becsi@digia.com>2014-05-22 20:43:17 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-06-05 00:23:00 +0200
commit4f195e3b634b2cb96e6f74d8b9d90f77a44830f5 (patch)
tree4c82d144e5b384045bdc32ca2adee82684377a9d /patches/chromium/0001-Add-WebEngineContext-to-RunLoop-s-friends.patch
parent45c0bba8a40bb87a386fad02ca51371a44f475ba (diff)
Remove separately maintained patches from repository
We maintain them on top of the Chromium snapshot. A new script tools/scripts/patch_upstream.py replaced patches/patch-chromium.sh with the recent snapshot update. The patches that we have on top of the baseline version are prepared from the chromium snapshot and applied on the upstream chromium checkout. A consequence of this is that init-repository.py -u from now on requires a snapshot checkout as well. Change-Id: I639c45904b72952804e5227ebc948a8859cf74dd Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'patches/chromium/0001-Add-WebEngineContext-to-RunLoop-s-friends.patch')
-rw-r--r--patches/chromium/0001-Add-WebEngineContext-to-RunLoop-s-friends.patch30
1 files changed, 0 insertions, 30 deletions
diff --git a/patches/chromium/0001-Add-WebEngineContext-to-RunLoop-s-friends.patch b/patches/chromium/0001-Add-WebEngineContext-to-RunLoop-s-friends.patch
deleted file mode 100644
index 7d6fadb24..000000000
--- a/patches/chromium/0001-Add-WebEngineContext-to-RunLoop-s-friends.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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: Add WebEngineContext to RunLoop's friends.
-
----
- base/run_loop.h | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/base/run_loop.h b/base/run_loop.h
-index 0dce634..055b1b8 100644
---- a/base/run_loop.h
-+++ b/base/run_loop.h
-@@ -10,6 +10,8 @@
- #include "base/memory/weak_ptr.h"
- #include "base/message_loop/message_loop.h"
-
-+class WebEngineContext;
-+
- namespace base {
- #if defined(OS_ANDROID)
- class MessagePumpForUI;
-@@ -76,6 +78,7 @@ class BASE_EXPORT RunLoop {
-
- private:
- friend class MessageLoop;
-+ friend class ::WebEngineContext;
- #if defined(OS_ANDROID)
- // Android doesn't support the blocking MessageLoop::Run, so it calls
- // BeforeRun and AfterRun directly.