From dc44c3e1bdde0becc61eea45761d79e63464d10a Mon Sep 17 00:00:00 2001
From: Piotr Tworek
Date: Wed, 22 Apr 2015 16:50:53 +0200
Subject: [PATCH] Alias EwkMsgStart to ShellMsgStart
Since no content_shell code is being used in libchromium-ewk we can
safely reuse Shell IPC message ID for EWK specific messages. The goal
here is to minimize the amount of changes to upstream code.
Change-Id: I646018f8c9050f32d1d2851eedeedc347b08be38
Signed-off-by: Piotr Tworek
---
.../ewk/efl_integration/browser/render_message_filter_efl.cc | 1 +
.../efl_integration/browser/web_view_browser_message_filter.cc | 1 +
tizen_src/ewk/efl_integration/common/render_messages_ewk.h | 1 +
tizen_src/ewk/efl_integration/ipc_message_start_ewk.h | 10 ++++++++++
tizen_src/ewk/efl_integration/wrt/wrt_widget_host.cc | 1 +
5 files changed, 14 insertions(+)
create mode 100644 tizen_src/ewk/efl_integration/ipc_message_start_ewk.h
diff --git a/tizen_src/ewk/efl_integration/browser/render_message_filter_efl.cc b/tizen_src/ewk/efl_integration/browser/render_message_filter_efl.cc
index 227e0d7..8479523 100644
--- a/tizen_src/ewk/efl_integration/browser/render_message_filter_efl.cc
+++ b/tizen_src/ewk/efl_integration/browser/render_message_filter_efl.cc
@@ -12,6 +12,7 @@
#include "content/public/browser/web_contents.h"
#include "eweb_view.h"
#include "net/url_request/url_request_context_getter.h"
+#include "ipc_message_start_ewk.h"
#if defined(TIZEN_MULTIMEDIA_SUPPORT)
#include "content/browser/media/efl/webaudio_decoder_browser_gstreamer.h"
diff --git a/tizen_src/ewk/efl_integration/browser/web_view_browser_message_filter.cc b/tizen_src/ewk/efl_integration/browser/web_view_browser_message_filter.cc
index d5b5a5a..a23c4e1 100644
--- a/tizen_src/ewk/efl_integration/browser/web_view_browser_message_filter.cc
+++ b/tizen_src/ewk/efl_integration/browser/web_view_browser_message_filter.cc
@@ -18,6 +18,7 @@
#include "content/public/browser/web_contents.h"
#include "eweb_view.h"
#include "private/ewk_hit_test_private.h"
+#include "ipc_message_start_ewk.h"
using content::BrowserThread;
using content::RenderViewHost;
diff --git a/tizen_src/ewk/efl_integration/common/render_messages_ewk.h b/tizen_src/ewk/efl_integration/common/render_messages_ewk.h
index 2cd2cbe..1be559f 100644
--- a/tizen_src/ewk/efl_integration/common/render_messages_ewk.h
+++ b/tizen_src/ewk/efl_integration/common/render_messages_ewk.h
@@ -21,6 +21,7 @@
#include "third_party/WebKit/public/web/WebNavigationPolicy.h"
#include "third_party/WebKit/public/web/WebNavigationType.h"
#include "third_party/WebKit/public/web/WebViewModeEnums.h"
+#include "ipc_message_start_ewk.h"
typedef std::map StringMap;
diff --git a/tizen_src/ewk/efl_integration/ipc_message_start_ewk.h b/tizen_src/ewk/efl_integration/ipc_message_start_ewk.h
new file mode 100644
index 0000000..14b23f6
--- /dev/null
+++ b/tizen_src/ewk/efl_integration/ipc_message_start_ewk.h
@@ -0,0 +1,10 @@
+// Copyright 2015 Samsung Electronics. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "ipc/ipc_message_start.h"
+
+// Ideally we should add our own unique ID for EWK messages. However, in order
+// to minimize chromium changes let's hijack ID used by content_shell app.
+#define EwkMsgStart ShellMsgStart
+
diff --git a/tizen_src/ewk/efl_integration/wrt/wrt_widget_host.cc b/tizen_src/ewk/efl_integration/wrt/wrt_widget_host.cc
index 517d608..72b54a5 100644
--- a/tizen_src/ewk/efl_integration/wrt/wrt_widget_host.cc
+++ b/tizen_src/ewk/efl_integration/wrt/wrt_widget_host.cc
@@ -10,6 +10,7 @@
#include "content/public/browser/render_process_host.h"
#include "content/public/browser/resource_request_info.h"
#include "ipc/ipc_message_macros.h"
+#include "ipc_message_start_ewk.h"
#include "net/url_request/url_request.h"
#include "url/gurl.h"
--
2.7.4