Reuse efl initialization code from chromium_impl in ewk

AppendPortParams is supposed to contain the necesary minimum to
bootstrap working EFL version of chromium. CommandLineEfl should only
append extra flags which are supposed to activate additional, non
critical functionality. The idea is xwalk and EWK can configure chromium
differently, but they should share some base flags.

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

diff --git a/tizen_src/chromium_impl/efl/efl.gyp b/tizen_src/chromium_impl/efl/efl.gyp
index 88ef9c1..fe09510 100644 (file)
--- a/tizen_src/chromium_impl/efl/efl.gyp
+++ b/tizen_src/chromium_impl/efl/efl.gyp
@@ -30,6 +30,7 @@
         '<(DEPTH)',
       ],
       'sources': [
+        'efl_export.h',
         'init.h',
         'init.cc',
       ],

diff --git a/tizen_src/chromium_impl/efl/efl_export.h b/tizen_src/chromium_impl/efl/efl_export.h
new file mode 100644 (file)
index 0000000..ddbd7b9
--- /dev/null
+++ b/tizen_src/chromium_impl/efl/efl_export.h
@@ -0,0 +1,10 @@
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef EFL_EXPORT_H_
+#define EFL_EXPORT_H_
+
+#define EFL_EXPORT __attribute__((visibility("default")))
+
+#endif  // CONTENT_COMMON_CONTENT_EXPORT_H_

diff --git a/tizen_src/chromium_impl/efl/init.h b/tizen_src/chromium_impl/efl/init.h
index 182a1c2..8192939 100644 (file)
--- a/tizen_src/chromium_impl/efl/init.h
+++ b/tizen_src/chromium_impl/efl/init.h
@@ -6,12 +6,13 @@
 #define _EFL_PORT_IMPL_INIT_H_
 
 #include "base/command_line.h"
+#include "efl/efl_export.h"
 
 namespace efl {
 
-int Initialize(int argc, const char* argv[]);
+EFL_EXPORT int Initialize(int argc, const char* argv[]);
 
-void AppendPortParams(base::CommandLine&);
+EFL_EXPORT void AppendPortParams(base::CommandLine&);
 
 } // namespace efl
 

diff --git a/tizen_src/ewk/efl_integration/command_line_efl.cc b/tizen_src/ewk/efl_integration/command_line_efl.cc
index 0bdfa6b..b5d0c73 100644 (file)
--- a/tizen_src/ewk/efl_integration/command_line_efl.cc
+++ b/tizen_src/ewk/efl_integration/command_line_efl.cc
@@ -14,6 +14,7 @@
 #include "cc/base/switches.h"
 #include "ui/events/event_switches.h"
 #include "extensions/common/switches.h"
+#include "efl/init.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/gl/gl_switches.h"
 #include "url/gurl.h"
@@ -49,14 +50,11 @@ content::MainFunctionParams CommandLineEfl::GetDefaultPortParams() {
   }
   CommandLine* p_command_line = CommandLine::ForCurrentProcess();
 
+  efl::AppendPortParams(*p_command_line);
+
   p_command_line->AppendSwitch(switches::kNoSandbox);
   p_command_line->AppendSwitch(switches::kDisablePlugins);
-  p_command_line->AppendSwitch(switches::kInProcessGPU);
-  p_command_line->AppendSwitchASCII(switches::kUseGL, gfx::kGLImplementationEGLName);
-  p_command_line->AppendSwitch(switches::kDisableDelegatedRenderer);
 
-  // (prashant.n): New mechanism supports drawing frame to mailbox only.
-  p_command_line->AppendSwitch(cc::switches::kCompositeToMailbox);
   // Enables glFinish call
   p_command_line->AppendSwitch(switches::kWaitForFrameComplete);
 

diff --git a/tizen_src/ewk/efl_integration/efl_integration.gypi b/tizen_src/ewk/efl_integration/efl_integration.gypi
index fd7efe8..3628b17 100644 (file)
--- a/tizen_src/ewk/efl_integration/efl_integration.gypi
+++ b/tizen_src/ewk/efl_integration/efl_integration.gypi
@@ -26,6 +26,7 @@
       '<(DEPTH)/tizen_src/build/system.gyp:elementary',
       '<(DEPTH)/tizen_src/build/system.gyp:gstreamer',
       '<(DEPTH)/tizen_src/ewk/po_tizen/locale.gyp:locale_efl',
+      '<(DEPTH)/tizen_src/chromium_impl/efl/efl.gyp:efl-init',
 
       '<(DEPTH)/content/content.gyp:content',
       '<(DEPTH)/content/content.gyp:content_app_browser',