diff options
author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2013-06-11 15:40:30 +0200 |
---|---|---|
committer | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2013-06-11 15:51:23 +0200 |
commit | e67c21a033121618bfe4cf62686d009d0bacd8c3 (patch) | |
tree | 74675f8f098fdcb2352770b15bb8c24194f4acd4 /patches | |
parent | e80719ed2714779cd4afac099916be069742fe77 (diff) |
Get rid of BlinqApplication.
Rename the class to WebEngineContext and keep it as a ref-counted member
of pages instead. Also:
- Change the user-agent product to QtWebEngine
- Don't pass actual command line arguments to Chromium anymore
- Allow attaching to the event loop through Before/AfterRun instead of blocking
Diffstat (limited to 'patches')
-rw-r--r-- | patches/0001-My-local-fixes.patch | 12 | ||||
-rw-r--r-- | patches/0002-Add-WebEngineContext-to-RunLoop-s-friends.patch | 33 | ||||
-rwxr-xr-x | patches/patch-chromium.sh | 2 |
3 files changed, 40 insertions, 7 deletions
diff --git a/patches/0001-My-local-fixes.patch b/patches/0001-My-local-fixes.patch index ff5e1308c..87a08aab9 100644 --- a/patches/0001-My-local-fixes.patch +++ b/patches/0001-My-local-fixes.patch @@ -1,7 +1,7 @@ -From 4ce3baa412e9799684c0b7379814384489c2ae5a Mon Sep 17 00:00:00 2001 +From 0a3b4029af83089cb313b555a47c5c510dc94cc7 Mon Sep 17 00:00:00 2001 From: Simon Hausmann <simon.hausmann@digia.com> Date: Mon, 29 Apr 2013 11:25:37 +0200 -Subject: [PATCH] My local fixes +Subject: [PATCH 1/2] My local fixes --- content/browser/zygote_host/zygote_host_impl_linux.cc | 1 + @@ -10,7 +10,7 @@ Subject: [PATCH] My local fixes 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/content/browser/zygote_host/zygote_host_impl_linux.cc b/content/browser/zygote_host/zygote_host_impl_linux.cc -index 4e28c55..ddd3513 100644 +index ba7884f8..50eacc8 100644 --- a/content/browser/zygote_host/zygote_host_impl_linux.cc +++ b/content/browser/zygote_host/zygote_host_impl_linux.cc @@ -70,6 +70,7 @@ void ZygoteHostImpl::Init(const std::string& sandbox_cmd) { @@ -43,10 +43,10 @@ index bed5ff2..992e0d0 100644 virtual ~ContentMainRunner() {} diff --git a/content/public/common/content_client.h b/content/public/common/content_client.h -index 198ecad..778fcac 100644 +index 4c1d110..ddf6a32 100644 --- a/content/public/common/content_client.h +++ b/content/public/common/content_client.h -@@ -60,7 +60,7 @@ CONTENT_EXPORT void SetContentClient(ContentClient* client); +@@ -63,7 +63,7 @@ CONTENT_EXPORT void SetContentClient(ContentClient* client); #if defined(CONTENT_IMPLEMENTATION) // Content's embedder API should only be used by content. @@ -56,5 +56,5 @@ index 198ecad..778fcac 100644 // Used for tests to override the relevant embedder interfaces. Each method -- -1.8.1.2 +1.8.3 diff --git a/patches/0002-Add-WebEngineContext-to-RunLoop-s-friends.patch b/patches/0002-Add-WebEngineContext-to-RunLoop-s-friends.patch new file mode 100644 index 000000000..c822c0162 --- /dev/null +++ b/patches/0002-Add-WebEngineContext-to-RunLoop-s-friends.patch @@ -0,0 +1,33 @@ +From 1f686ea3aafa4d950d92a7f945cfec5b6fb02dfd 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. + +--- + base/run_loop.h | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/base/run_loop.h b/base/run_loop.h +index 380c8bf..12f810a 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.h" + ++class WebEngineContext; ++ + namespace base { + #if defined(OS_ANDROID) + class MessagePumpForUI; +@@ -74,6 +76,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. +-- +1.8.3 + diff --git a/patches/patch-chromium.sh b/patches/patch-chromium.sh index cb74fecc1..5abc44203 100755 --- a/patches/patch-chromium.sh +++ b/patches/patch-chromium.sh @@ -20,7 +20,7 @@ if [ "$2" = "--update" ]; then fi echo "Applying patches..." -git am $PATCH_DIR/0001-My-local-fixes.patch +git am $PATCH_DIR/0001-My-local-fixes.patch $PATCH_DIR/0002-Add-WebEngineContext-to-RunLoop-s-friends.patch cd tools/gyp echo "Entering $PWD" |