(Scripting) Helper method for bit-mask enum properties & moved enum-string macros...

[platform/core/uifw/dali-core.git] / dali / internal / event / common / thread-local-storage.cpp

diff --git a/dali/internal/event/common/thread-local-storage.cpp b/dali/internal/event/common/thread-local-storage.cpp
index 72cf2b7..9202734 100644 (file)
--- a/dali/internal/event/common/thread-local-storage.cpp
+++ b/dali/internal/event/common/thread-local-storage.cpp
@@ -30,15 +30,18 @@ namespace Internal
 
 namespace
 {
+#if defined(EMSCRIPTEN)
+ThreadLocalStorage* threadLocal = NULL;
+#else
 __thread ThreadLocalStorage* threadLocal = NULL;
+#endif
 }
 
 ThreadLocalStorage::ThreadLocalStorage(Core* core)
-: mCore(core)
+: mCore( core )
 {
   DALI_ASSERT_ALWAYS( threadLocal == NULL && "Cannot create more than one ThreadLocalStorage object" );
 
-  // reset is used to store a new value associated with this thread
   threadLocal = this;
 }
 
@@ -99,11 +102,6 @@ ImageFactory& ThreadLocalStorage::GetImageFactory()
   return mCore->GetImageFactory();
 }
 
-FontFactory& ThreadLocalStorage::GetFontFactory()
-{
-  return mCore->GetFontFactory();
-}
-
 ShaderFactory& ThreadLocalStorage::GetShaderFactory()
 {
   return mCore->GetShaderFactory();
@@ -119,9 +117,9 @@ GestureEventProcessor& ThreadLocalStorage::GetGestureEventProcessor()
   return mCore->GetGestureEventProcessor();
 }
 
-EmojiFactory& ThreadLocalStorage::GetEmojiFactory()
+RelayoutController& ThreadLocalStorage::GetRelayoutController()
 {
-  return mCore->GetEmojiFactory();
+  return mCore->GetRelayoutController();
 }
 
 } // namespace Internal