Removal of Ecore_Wl_Display from ecore-wl-render-surface.cpp:SetDisplay 85/32585/1 accepted/tizen/common/20141222.090259 accepted/tizen/mobile/20141223.073050 accepted/tizen/tv/20141223.072944 accepted/tizen/wearable/20141223.073019 submit/tizen_common/20141218.164254 submit/tizen_mobile/20141223.060220 submit/tizen_tv/20141223.060220 submit/tizen_wearable/20141223.060220
authortaeyoon <taeyoon0.lee@samsung.com>
Fri, 19 Dec 2014 08:50:43 +0000 (17:50 +0900)
committertaeyoon <taeyoon0.lee@samsung.com>
Fri, 19 Dec 2014 08:52:15 +0000 (17:52 +0900)
  - Ecore_Wl_Display was removed from Ecore_Wayland.h

Change-Id: Id84820d80e7f0219558cded70ed9505ac02470a4

adaptors/wayland/ecore-wl-render-surface.cpp

index 158323e..e164ab2 100644 (file)
@@ -210,22 +210,13 @@ void RenderSurface::SetDisplay( Any display )
   if ( display.Empty() == false )
   {
     // check we have a valid type
-    DALI_ASSERT_ALWAYS( ( ( display.GetType() == typeid (Ecore_Wl_Display *)) ||
-                          ( display.GetType() == typeid (WlDisplay *) ) )
+    DALI_ASSERT_ALWAYS( ( display.GetType() == typeid (WlDisplay *) )
                         &&
                         "Display type is invalid" );
 
     mOwnDisplay = false;
 
-    // display may point to EcoreXDisplay so may need to cast
-    if( display.GetType() == typeid (Ecore_Wl_Display*) )
-    {
-      mMainDisplay = static_cast< WlDisplay* >( ecore_wl_display_get() );
-    }
-    else
-    {
-      mMainDisplay = AnyCast< WlDisplay* >( display );
-    }
+    mMainDisplay = AnyCast< WlDisplay* >( display );
   }
 }