PTREL-135: Fix build issues caused by using unavailable functions

The sync of code from 2.2 has included some wrong assumptions about
a few methods in elementary and webkit-efl.  This patch removes those
calls to fix the build with the expectation that once the associated
functionality has landed in elementary and webkit-efl that this patch
can be removed.

Change-Id: Ic433c5a6888eafb772d5dd317339eb00352a3646
Signed-off-by: Rusty Lynch <rusty.lynch@intel.com>

diff --git a/src/view/webkit/view_logic.cpp b/src/view/webkit/view_logic.cpp
index f1b3397..954177e 100644 (file)
--- a/src/view/webkit/view_logic.cpp
+++ b/src/view/webkit/view_logic.cpp
@@ -668,11 +668,13 @@ void ViewLogic::ewkClientInit(Evas_Object *wkView)
                                  EA_CALLBACK_MORE,
                                  eaKeyCallback,
                                  this);
+#if 0 // FIXME!!! elm_access_object_register has not landed yet
     // Always register access object even application doesn't support
     // accessibility. In case of accessibility isn't supported, efl_assist
     // shows warning message by syspopup.
     // initScreenReaderSupport is related method. (window_data.cpp)
     elm_access_object_register(wkView, m_window);
+#endif
 }
 
 void ViewLogic::ewkClientDeinit(Evas_Object *wkView)
@@ -701,7 +703,9 @@ void ViewLogic::ewkClientDeinit(Evas_Object *wkView)
         ecore_timer_del(m_orientationThresholdTimer);
         m_orientationThresholdTimer = NULL;
     }
-    elm_access_object_unregister(wkView);
+    // FIXME!!!! elm_access_object_unregister has not landed in
+    //           tizen 3.0 elementary yet
+    // elm_access_object_unregister(wkView);
 }
 
 bool ViewLogic::createEwkView(Evas* canvas)
@@ -786,6 +790,7 @@ void ViewLogic::prepareEwkView(Evas_Object *wkView)
     std::string encoding = DEFAULT_ENCODING;
     OptionalWidgetStartFileInfo fileInfo =
         W3CFileLocalization::getStartFileInfo(m_model->TizenId);
+#if 0 // FIXME!!!! ewk_settings_is_encoding_valid has not landed yet
     if (!fileInfo.IsNull()) {
             std::string file_encoding = DPL::ToUTF8String((*fileInfo).encoding);
 
@@ -796,6 +801,7 @@ void ViewLogic::prepareEwkView(Evas_Object *wkView)
             }
 
     }
+#endif
     _D("Setting encoding: %s", encoding.c_str());
     if (ewk_settings_default_encoding_set(settings,encoding.c_str())) {
         _D("Encoding set properly");
@@ -877,7 +883,8 @@ void ViewLogic::resumeWebkit(Evas_Object *wkView)
     Assert(wkView);
 
     ewk_view_resume(wkView);
-    ewk_view_foreground_set(wkView, true);
+    // FIXME!!!! ewk_view_foreground_set has not landed yet
+    // ewk_view_foreground_set(wkView, true);
 
     return;
 }
@@ -888,7 +895,9 @@ void ViewLogic::suspendWebkit(Evas_Object *wkView)
     Assert(wkView);
 
     ewk_view_suspend(wkView);
-    ewk_view_foreground_set(wkView, false);
+    // FIXME!!!! ewk_view_foreground_set has not landed in the
+    //           tizen 3.0 elementary project yet
+    // ewk_view_foreground_set(wkView, false);
 
     return;
 }
@@ -1957,12 +1966,14 @@ void ViewLogic::eaKeyCallback(void* data, Evas_Object* obj, void* eventInfo)
     std::string keyName;
     if (keyType == EA_CALLBACK_BACK) {
         Assert(obj);
+#if 0 // FIXME!!!! ewk_view_text_selection_clear has not landed yet
         // Call text selection clear API
         // In case of current state is selection mode,
         // application doesn't need to handle back key
         if (EINA_TRUE == ewk_view_text_selection_clear(obj)) {
             return;
         }
+#endif
         keyName = KeyName::BACK;
     } else if (keyType == EA_CALLBACK_MORE) {
         keyName = KeyName::MENU;

diff --git a/src/wrt-client/window_data.cpp b/src/wrt-client/window_data.cpp
index 01012ec..50f9288 100644 (file)
--- a/src/wrt-client/window_data.cpp
+++ b/src/wrt-client/window_data.cpp
@@ -307,7 +307,9 @@ Evas_Object* WindowData::createMainLayout(Evas_Object* parent)
             NULL);  // const char* item_style
     ADD_PROFILING_POINT("elm_naviframe_item_push", "stop");
     elm_naviframe_item_title_visible_set(naviIt, EINA_FALSE);
-    elm_naviframe_item_pop_cb_set(naviIt, naviframeItemPopCallback, NULL);
+    // FIXME!!!! This method has not yet landed in the tizen 3.0
+    //           elementary project
+    //elm_naviframe_item_pop_cb_set(naviIt, naviframeItemPopCallback, NULL);
     setEvasObjectData(Layer::MAIN_LAYOUT, obj);
     return obj;
 }

diff --git a/src/wrt-client/wrt-client.cpp b/src/wrt-client/wrt-client.cpp
index 3a3c3ad..829bc8f 100644 (file)
--- a/src/wrt-client/wrt-client.cpp
+++ b/src/wrt-client/wrt-client.cpp
@@ -774,7 +774,9 @@ void WrtClient::hwkeyCallback(const std::string& key)
         // windowed UX - hosted application
         if (key == KeyName::BACK) {
             if (m_isWebkitFullscreen) {
-                ewk_view_fullscreen_exit(m_widget->GetCurrentWebview());
+                // FIXME!!! This method has not yet landed in the tizen 3.0
+                //          webkit-efl source tree
+                //ewk_view_fullscreen_exit(m_widget->GetCurrentWebview());
             } else {
                 m_widget->Backward();
             }
@@ -786,7 +788,9 @@ void WrtClient::hwkeyCallback(const std::string& key)
         // packaged application
         if (key == KeyName::BACK) {
             if (m_isFullscreenByPlatform) {
-                ewk_view_fullscreen_exit(m_widget->GetCurrentWebview());
+                // FIXME!!! This method has not yet landed in the tizen 3.0
+                //          webkit-efl source tree
+                //ewk_view_fullscreen_exit(m_widget->GetCurrentWebview());
             }
         }
     }