From f9590fc60a0bb20515ed454ca68b293e9aa311ee Mon Sep 17 00:00:00 2001
From: Piotr Tworek <p.tworek@samsung.com>
Date: Thu, 9 Apr 2015 17:19:25 +0200
Subject: [PATCH] Fix Tizen 3.0 chromium-ewk build after upversion to M42

Mostly mising patches in src and include path changes. Unfortunately
there is also one bigger feature that needs to be disabled.
GpuMemoryBufferImplEfl will need some love to work with m42. This patch
disables it with ewk_bringup macros.

Change-Id: I2616c057852956949eff3ba6a8a7c72e0d0f0c9c
Signed-off-by: Piotr Tworek <p.tworek@samsung.com>
---
 tizen_src/build/system.gyp                                          | 2 +-
 .../content/common/gpu/client/gpu_memory_buffer_impl_efl_pixmap.cc  | 2 +-
 tizen_src/chromium_impl/content/content_efl.gypi                    | 3 ++-
 tizen_src/chromium_impl/gpu/config/gpu_info_collector_efl.cc        | 2 +-
 tizen_src/chromium_impl/ui/gl/gl_image_efl_pixmap.cc                | 2 +-
 .../ewk/efl_integration/browser/web_view_browser_message_filter.cc  | 2 +-
 tizen_src/ewk/efl_integration/eweb_view.cc                          | 5 +++++
 tizen_src/ewk/efl_integration/renderer/render_frame_observer_efl.cc | 6 ++++++
 tizen_src/packaging/chromium-efl.spec                               | 2 +-
 9 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/tizen_src/build/system.gyp b/tizen_src/build/system.gyp
index 8568fb7..d8d5ff8 100644
--- a/tizen_src/build/system.gyp
+++ b/tizen_src/build/system.gyp
@@ -178,7 +178,7 @@
       'target_name': 'ui-gadget',
       'type': 'none',
       'conditions': [
-        ['building_for_tizen_mobile==1', {
+        ['building_for_tizen==1', {
           'direct_dependent_settings': {
             'cflags': [
               '<!@(<(pkg-config) --cflags ui-gadget-1)',
diff --git a/tizen_src/chromium_impl/content/common/gpu/client/gpu_memory_buffer_impl_efl_pixmap.cc b/tizen_src/chromium_impl/content/common/gpu/client/gpu_memory_buffer_impl_efl_pixmap.cc
index 6db6d46..a75b82f 100644
--- a/tizen_src/chromium_impl/content/common/gpu/client/gpu_memory_buffer_impl_efl_pixmap.cc
+++ b/tizen_src/chromium_impl/content/common/gpu/client/gpu_memory_buffer_impl_efl_pixmap.cc
@@ -6,7 +6,7 @@
 
 #include "base/atomic_sequence_num.h"
 #include "base/bind.h"
-#include "base/debug/trace_event.h"
+#include "base/trace_event/trace_event.h"
 #include "base/logging.h"
 #include "base/numerics/safe_math.h"
 #include "content/common/gpu/client/gpu_memory_buffer_factory_host.h"
diff --git a/tizen_src/chromium_impl/content/content_efl.gypi b/tizen_src/chromium_impl/content/content_efl.gypi
index 4e449ef..3fd163d 100644
--- a/tizen_src/chromium_impl/content/content_efl.gypi
+++ b/tizen_src/chromium_impl/content/content_efl.gypi
@@ -70,7 +70,8 @@
               'common/tts_utterance_request_efl.h',
             ],
           }], # building_for_tizen_mobile==1
-          ['building_for_tizen==1', {
+          # TODO: Get gpu_memory_buffer_impl_efl working with M42
+          ['building_for_tizen==1 and ewk_bringup!=1', {
             'sources': [
               'common/gpu/client/gpu_memory_buffer_impl_efl.cc',
               'common/gpu/client/gpu_memory_buffer_impl_efl_pixmap.cc',
diff --git a/tizen_src/chromium_impl/gpu/config/gpu_info_collector_efl.cc b/tizen_src/chromium_impl/gpu/config/gpu_info_collector_efl.cc
index 55787bc..8956ab4 100644
--- a/tizen_src/chromium_impl/gpu/config/gpu_info_collector_efl.cc
+++ b/tizen_src/chromium_impl/gpu/config/gpu_info_collector_efl.cc
@@ -5,7 +5,7 @@
 #include "gpu/config/gpu_info_collector.h"
 
 #include "base/command_line.h"
-#include "base/debug/trace_event.h"
+#include "base/trace_event/trace_event.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
diff --git a/tizen_src/chromium_impl/ui/gl/gl_image_efl_pixmap.cc b/tizen_src/chromium_impl/ui/gl/gl_image_efl_pixmap.cc
index 6935b7a..e9c0342 100644
--- a/tizen_src/chromium_impl/ui/gl/gl_image_efl_pixmap.cc
+++ b/tizen_src/chromium_impl/ui/gl/gl_image_efl_pixmap.cc
@@ -4,7 +4,7 @@
 
 #include "ui/gl/gl_image_efl_pixmap.h"
 
-#include "base/debug/trace_event.h"
+#include "base/trace_event/trace_event.h"
 #include "base/process/process_handle.h"
 #include "ui/gl/efl_pixmap.h"
 #include "ui/gl/egl_util.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 d08d58c..4d7fd10 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
@@ -224,7 +224,7 @@ bool WebViewBrowserMessageFilter::OnMessageReceived(
         WebViewBrowserMessageFilterPrivate::OnDidChangeScrollOffset)
     IPC_MESSAGE_FORWARD(ViewHostMsg_StartContentIntent, private_,
         WebViewBrowserMessageFilterPrivate::OnStartContentIntent)
-#if defined(OS_TIZEN)
+#if defined(OS_TIZEN) && !defined(EWK_BRINGUP)
     IPC_MESSAGE_FORWARD(ViewHostMsg_SnapshotDataReceived, private_,
         WebViewBrowserMessageFilterPrivate::OnSnapshot)
 #endif
diff --git a/tizen_src/ewk/efl_integration/eweb_view.cc b/tizen_src/ewk/efl_integration/eweb_view.cc
index df028fa..41b6b4b 100644
--- a/tizen_src/ewk/efl_integration/eweb_view.cc
+++ b/tizen_src/ewk/efl_integration/eweb_view.cc
@@ -137,6 +137,7 @@ class WebViewAsyncRequestHitTestDataCallback
       , y_(y)
       , mode_(mode) {
   }
+  virtual ~WebViewAsyncRequestHitTestDataCallback() {};
 
   virtual void Run(tizen_webview::Hit_Test *hit_test, EWebView* web_view) = 0;
 
@@ -1180,8 +1181,10 @@ void EWebView::FormNavigate(bool direction) {
     SetFormIsNavigating(true);
 
   listClosed(popupPicker_, 0, 0, 0);
+#if !defined(EWK_BRINGUP)
   render_frame_host->MoveSelectElement(direction);
 #endif
+#endif
 }
 
 Eina_Bool EWebView::DidSelectPopupMenuItem(int selectedIndex) {
@@ -1255,8 +1258,10 @@ Eina_Bool EWebView::PopupMenuClose() {
   if (!render_frame_host)
     return false;
 
+#if !defined(EWK_BRINGUP)
   render_frame_host->DidClosePopupMenu();
 #endif
+#endif
   return true;
 }
 
diff --git a/tizen_src/ewk/efl_integration/renderer/render_frame_observer_efl.cc b/tizen_src/ewk/efl_integration/renderer/render_frame_observer_efl.cc
index 08e2408..74840dd 100644
--- a/tizen_src/ewk/efl_integration/renderer/render_frame_observer_efl.cc
+++ b/tizen_src/ewk/efl_integration/renderer/render_frame_observer_efl.cc
@@ -59,8 +59,10 @@ bool RenderFrameObserverEfl::OnMessageReceived(const IPC::Message& message) {
   IPC_BEGIN_MESSAGE_MAP(RenderFrameObserverEfl, message)
 #if defined(OS_TIZEN)
     IPC_MESSAGE_HANDLER(FrameMsg_SelectPopupMenuItems, OnSelectPopupMenuItems)
+#if !defined(EWK_BRINGUP)
     IPC_MESSAGE_HANDLER(FrameMsg_ClosePopupMenu, OnClosePopupMenu)
 #endif
+#endif
 #if !defined(EWK_BRINGUP)
     IPC_MESSAGE_HANDLER(FrameMsg_MoveToPreviousSelectElement, OnMovePreviousSelectElement)
     IPC_MESSAGE_HANDLER(FrameMsg_MoveToNextSelectElement, OnMoveNextSelectElement)
@@ -74,6 +76,7 @@ bool RenderFrameObserverEfl::OnMessageReceived(const IPC::Message& message) {
 void RenderFrameObserverEfl::OnSelectPopupMenuItems(
     bool canceled,
     const std::vector<int>& selected_indices) {
+#if !defined(EWK_BRINGUP)
   RenderFrameImpl* render_frame_impl_ = static_cast<RenderFrameImpl*>(render_frame());
   ExternalPopupMenu* external_popup_menu_ = render_frame_impl_->GetExternalPopupMenu();
   if (external_popup_menu_ == NULL)
@@ -86,15 +89,18 @@ void RenderFrameObserverEfl::OnSelectPopupMenuItems(
   external_popup_menu_->DidSelectItems(canceled, selected_indices);
   if (canceled)
     render_frame_impl_->DidHideExternalPopupMenu();
+#endif
 }
 
 void RenderFrameObserverEfl::OnClosePopupMenu() {
+#if !defined(EWK_BRINGUP)
   RenderFrameImpl* render_frame_impl_ = static_cast<RenderFrameImpl*>(render_frame());
   ExternalPopupMenu* external_popup_menu_ = render_frame_impl_->GetExternalPopupMenu();
   if (external_popup_menu_ == NULL)
     return;
   external_popup_menu_->close();
   render_frame_impl_->DidHideExternalPopupMenu();
+#endif
 }
 #endif
 
diff --git a/tizen_src/packaging/chromium-efl.spec b/tizen_src/packaging/chromium-efl.spec
index 1370e1f..68022e6 100644
--- a/tizen_src/packaging/chromium-efl.spec
+++ b/tizen_src/packaging/chromium-efl.spec
@@ -90,7 +90,7 @@ BuildRequires: pkgconfig(capi-system-device)
 BuildRequires: pkgconfig(capi-location-manager)
 BuildRequires: pkgconfig(location)
 BuildRequires: pkgconfig(gles20)
-BuildRequires: pkgconfig(libpng12)
+BuildRequires: pkgconfig(libpng)
 BuildRequires: pkgconfig(libusb-1.0)
 BuildRequires: pkgconfig(speex)
 BuildRequires: pkgconfig(flac)
-- 
2.7.4