summaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
authorJocelyn Turcotte <jocelyn.turcotte@digia.com>2014-01-15 19:06:17 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-01-22 08:45:14 +0100
commit3fcd31f5bd86cb568b1ca4f4f5c7c12c6675dceb (patch)
tree174654f0843830a86f80c3a379442708003e4f7e /patches
parent6d760436bc0d7081d5bdb50e4141171b6ba940ee (diff)
Add a stub message system to communicate with the blink WebView
This follows the model used by the Android WebView's AwRenderViewExt class. QtRenderViewObserverHost is attached to the WebContents and QtRenderViewObserver is attached to the RenderView in the render process. Both can exchange messages together and allow async commands to be carried from WebContentsAdapter and the result sent back through WebContentsAdapterClient. This patch also adds a renderer subdirectory to start matching the directory structure of Chromium. Change-Id: I724ca2fe2a597dcd2a15e8e1a23c4eeba1190703 Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Diffstat (limited to 'patches')
-rw-r--r--patches/0001-Declare-a-Qt-IPC-message-class.patch28
-rwxr-xr-xpatches/patch-chromium.sh1
2 files changed, 29 insertions, 0 deletions
diff --git a/patches/0001-Declare-a-Qt-IPC-message-class.patch b/patches/0001-Declare-a-Qt-IPC-message-class.patch
new file mode 100644
index 000000000..b86968800
--- /dev/null
+++ b/patches/0001-Declare-a-Qt-IPC-message-class.patch
@@ -0,0 +1,28 @@
+From de3f8ee976ac7e438616bc28dac2cb418781b103 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
+
+This allows Qt-specific IPC messages to be declared in QtWebEngine.
+
+Change-Id: Id6af79becf14c8c621df6752c6183ff550524859
+Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
+---
+ ipc/ipc_message_start.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/ipc/ipc_message_start.h b/ipc/ipc_message_start.h
+index a8cca53..314ed0e 100644
+--- a/ipc/ipc_message_start.h
++++ b/ipc/ipc_message_start.h
+@@ -10,6 +10,7 @@
+ // code to figure out the message class from its ID.
+ enum IPCMessageStart {
+ AutomationMsgStart = 0,
++ QtMsgStart,
+ ViewMsgStart,
+ InputMsgStart,
+ PluginMsgStart,
+--
+1.8.4.2
+
diff --git a/patches/patch-chromium.sh b/patches/patch-chromium.sh
index a048d2e7d..7dd0f153e 100755
--- a/patches/patch-chromium.sh
+++ b/patches/patch-chromium.sh
@@ -69,6 +69,7 @@ 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"