Make EWK buildable again for Tizen Mobile

Fix some code guarded by OS_TIZEN_MOBILE of
various small bugs: incomplete include patch,
extensions of EWK_REFACTOR, etc.

Change-Id: I90dbcda1404272b7208b833f83829892efe33ee7

diff --git a/tizen_src/ewk/efl_integration/command_line_efl.cc b/tizen_src/ewk/efl_integration/command_line_efl.cc
index fe7124f..c190601 100644 (file)
--- a/tizen_src/ewk/efl_integration/command_line_efl.cc
+++ b/tizen_src/ewk/efl_integration/command_line_efl.cc
@@ -82,7 +82,9 @@ content::MainFunctionParams CommandLineEfl::GetDefaultPortParams() {
   p_command_line->AppendSwitch(switches::kEnablePinch);
   p_command_line->AppendSwitch(switches::kUseMobileUserAgent);
   p_command_line->AppendSwitch(switches::kEnableViewportMeta);
+#if defined(EWK_REFACTOR)
   p_command_line->AppendSwitch(cc::switches::kEnableParallelCanvasMode);
+#endif
   p_command_line->AppendSwitchASCII(
       switches::kAcceleratedCanvas2dMSAASampleCount, "4");
 #endif

diff --git a/tizen_src/ewk/efl_integration/content_browser_client_efl.cc b/tizen_src/ewk/efl_integration/content_browser_client_efl.cc
index 60e2e62..ff88132 100644 (file)
--- a/tizen_src/ewk/efl_integration/content_browser_client_efl.cc
+++ b/tizen_src/ewk/efl_integration/content_browser_client_efl.cc
@@ -31,7 +31,7 @@
 #endif
 
 #if defined(OS_TIZEN_MOBILE)
-#include "browser/speech/tts_message_filter_efl.h"
+#include "content/browser/speech/tts_message_filter_efl.h"
 #endif
 
 #include "browser/notification/notification_controller_efl.h"

diff --git a/tizen_src/ewk/efl_integration/eweb_view.cc b/tizen_src/ewk/efl_integration/eweb_view.cc
index 4908d15..378f7e5 100644 (file)
--- a/tizen_src/ewk/efl_integration/eweb_view.cc
+++ b/tizen_src/ewk/efl_integration/eweb_view.cc
@@ -418,11 +418,11 @@ void EWebView::Initialize() {
   } else {
     evas_event_handler_->UnbindMotionEventHandlers();
   }
-#endif
   //evas_object_smart_callback_call(evas_object(), "motion,enable", (void*)&enable);
   wkext_motion_tilt_enable_set(evas_object_, static_cast<int>(enable),
       g_default_tilt_motion_sensitivity);
 #endif
+#endif
 
   CommandLine *cmdline = CommandLine::ForCurrentProcess();
   if (cmdline->HasSwitch(switches::kTouchEvents))

diff --git a/tizen_src/ewk/efl_integration/renderer/content_renderer_client_efl.cc b/tizen_src/ewk/efl_integration/renderer/content_renderer_client_efl.cc
index 2c1f0d9..9283526 100644 (file)
--- a/tizen_src/ewk/efl_integration/renderer/content_renderer_client_efl.cc
+++ b/tizen_src/ewk/efl_integration/renderer/content_renderer_client_efl.cc
@@ -28,8 +28,8 @@
 #include "third_party/WebKit/public/web/WebView.h"
 
 #if defined(OS_TIZEN_MOBILE)
-#include "common/tts_messages_efl.h"
-#include "renderer/tts_dispatcher_efl.h"
+#include "content/common/tts_messages_efl.h"
+#include "content/renderer/tts_dispatcher_efl.h"
 #endif
 
 #ifdef TIZEN_AUTOFILL_SUPPORT