fixup! Merge efl-port POC code into tizen_src

Andjust tizen_src code to fixup from:
http://165.213.202.130:8080/#/c/76146/

Change-Id: Ie2d9fcc32b7edaa3b926dce8c5f6fc2616a79420
Signed-off-by: Piotr Tworek <p.tworek@samsung.com>

diff --git a/tizen_src/chromium_impl/content/content_efl.gypi b/tizen_src/chromium_impl/content/content_efl.gypi
index fd3f1da..bfe8721 100644 (file)
--- a/tizen_src/chromium_impl/content/content_efl.gypi
+++ b/tizen_src/chromium_impl/content/content_efl.gypi
@@ -175,7 +175,6 @@
       ['_target_name=="content_gpu"', {
         'sources': [
           'gpu/gpu_thread_override_efl.cc',
-          'gpu/gpu_thread_override_efl.h',
         ],
       }],
 

diff --git a/tizen_src/chromium_impl/content/gpu/gpu_thread_override_efl.cc b/tizen_src/chromium_impl/content/gpu/gpu_thread_override_efl.cc
index 92d75e0..c1365f0 100644 (file)
--- a/tizen_src/chromium_impl/content/gpu/gpu_thread_override_efl.cc
+++ b/tizen_src/chromium_impl/content/gpu/gpu_thread_override_efl.cc
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/gpu/gpu_thread_override_efl.h"
-
 #include "content/common/gpu/gpu_messages.h"
 #include "content/gpu/gpu_process.h"
 #include "ui/gl/gl_shared_context_efl.h"
@@ -20,6 +18,8 @@
 // in order to provide on startup shared context and mailbox manager
 // created form Efl shared evas gl context.
 
+namespace content {
+
 struct GpuChildThreadEfl : public content::GpuChildThread {
   explicit GpuChildThreadEfl(const std::string& channel_id)
       : GpuChildThread(channel_id) { }
@@ -61,6 +61,8 @@ struct InProcessGpuThreadEfl : public content::InProcessGpuThread {
   }
 };
 
-base::Thread* CreateInProcessGpuThreadEfl(const std::string& channel_id) {
+base::Thread* CreateInProcessGpuThread(const std::string& channel_id) {
   return new InProcessGpuThreadEfl(channel_id);
 }
+
+} // namespace content

diff --git a/tizen_src/chromium_impl/content/gpu/gpu_thread_override_efl.h b/tizen_src/chromium_impl/content/gpu/gpu_thread_override_efl.h
deleted file mode 100644 (file)
index ec5610d..0000000
--- a/tizen_src/chromium_impl/content/gpu/gpu_thread_override_efl.h
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2014 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.
-
-#ifndef GPU_GPU_THREAD_OVERRIDE_EFL_H
-#define GPU_GPU_THREAD_OVERRIDE_EFL_H
-
-#include <string>
-
-namespace base {
-class Thread;
-}
-
-base::Thread* CreateInProcessGpuThreadEfl(const std::string& channel_id);
-
-#endif // GPU_GPU_THREAD_OVERRIDE_EFL_H

diff --git a/tizen_src/ewk/efl_integration/content_main_delegate_efl.cc b/tizen_src/ewk/efl_integration/content_main_delegate_efl.cc
index 9cd09b3..86d6f9b 100644 (file)
--- a/tizen_src/ewk/efl_integration/content_main_delegate_efl.cc
+++ b/tizen_src/ewk/efl_integration/content_main_delegate_efl.cc
@@ -8,7 +8,6 @@
 #include "content/browser/gpu/gpu_process_host.h"
 #include "content/common/paths_efl.h"
 #include "content/gpu/in_process_gpu_thread.h"
-#include "content/gpu/gpu_thread_override_efl.h"
 #include "content/public/common/content_switches.h"
 #include "browser/resource_dispatcher_host_delegate_efl.h"
 #include "command_line_efl.h"
@@ -79,7 +78,7 @@ void ContentMainDelegateEfl::PreSandboxStartup() {
       switches::kBrowserSubprocessPath, base::FilePath(SubProcessPath()));
 
   // needed for gpu thread
-  GpuProcessHost::RegisterGpuMainThreadFactory(CreateInProcessGpuThreadEfl);
+  GpuProcessHost::RegisterGpuMainThreadFactory(CreateInProcessGpuThread);
 }
 
 ContentBrowserClient* ContentMainDelegateEfl::CreateContentBrowserClient() {

diff --git a/tizen_src/ewk/efl_integration/ewk_global_data.cc b/tizen_src/ewk/efl_integration/ewk_global_data.cc
index d87f5fc..eab0753 100644 (file)
--- a/tizen_src/ewk/efl_integration/ewk_global_data.cc
+++ b/tizen_src/ewk/efl_integration/ewk_global_data.cc
@@ -22,7 +22,6 @@
 #include "content/utility/in_process_utility_thread.h"
 #include "content/browser/utility_process_host_impl.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
-#include "content/gpu/gpu_thread_override_efl.h"
 #include "efl/window_factory.h"
 #include "eweb_view.h"
 #include "tizen_webview/public/tw_web_context.h"
@@ -120,7 +119,7 @@ EwkGlobalData* EwkGlobalData::GetInstance() {
     content::RenderProcessHostImpl::RegisterRendererMainThreadFactory(
         content::CreateInProcessRendererThread);
     GpuProcessHost::RegisterGpuMainThreadFactory(
-        CreateInProcessGpuThreadEfl);
+        content::CreateInProcessGpuThread);
   }
 
 #ifndef NDEBUG