Merge "[macos] Prevent race condition while creating the EGL Window" into devel/master

diff --git a/README.md b/README.md
index e3bed27..4bfe52a 100644 (file)
--- a/README.md
+++ b/README.md
@@ -13,6 +13,7 @@
       * [3. Building for MS Windows](#3-building-for-ms-windows)
          * Build with the Visual Studio project.
          * Build with CMake.
+      * [4. Building for MacOS](#4-building-for-macos)
 
 # Build Instructions
 
@@ -101,3 +102,23 @@ vcpkg-script folder in the windows-dependencies repository.
     - INSTALL_CMAKE_MODULES ---> Whether to install the CMake modules (Used by the CMake command find_package() to find previously installed libraries).
     - PROFILE_LCASE         ---> The platform (must be windows).
     - ENABLE_DEBUG          ---> Whether to build with debug enabled.
+
+## 4. Building for MacOS
+
+Here it is expected that the environment variables are set accordingly to
+`dali-core/README.md`.
+
+To build the repository enter the 'build/tizen' folder:
+```bash
+         $ cd dali-adaptor/build/tizen
+```
+Then run the following command to set up the build:
+```bash
+         $ cmake -DCMAKE_INSTALL_PREFIX=$DESKTOP_PREFIX -DCMAKE_TOOLCHAIN_FILE=$VCPKG_FOLDER/scripts/buildsystems/vcpkg.cmake -DINSTALL_CMAKE_MODULES=ON -DENABLE_PROFILE=MACOS -DPROFILE_LCASE=macos
+```
+If a Debug build is required, then add `-DCMAKE_BUILD_TYPE=Debug -DENABLE_DEBUG=ON`
+
+To build run:
+```bash
+         $ make install -j8
+```

diff --git a/dali/devel-api/adaptor-framework/web-engine-plugin.h b/dali/devel-api/adaptor-framework/web-engine-plugin.h
index 7b42614..5914637 100644 (file)
--- a/dali/devel-api/adaptor-framework/web-engine-plugin.h
+++ b/dali/devel-api/adaptor-framework/web-engine-plugin.h
@@ -331,6 +331,11 @@ public:
   virtual bool SendKeyEvent(const KeyEvent& event) = 0;
 
   /**
+   * @brief Sets focus.
+   */
+  virtual void SetFocus( bool focused ) = 0;
+
+  /**
    * @brief Connects to this signal to be notified when page loading is started.
    *
    * @return A signal object to connect with.

diff --git a/dali/devel-api/adaptor-framework/web-engine.cpp b/dali/devel-api/adaptor-framework/web-engine.cpp
old mode 100644 (file)
new mode 100755 (executable)
index f1a7420..69c2b79
--- a/dali/devel-api/adaptor-framework/web-engine.cpp
+++ b/dali/devel-api/adaptor-framework/web-engine.cpp
@@ -242,6 +242,11 @@ bool WebEngine::SendKeyEvent(const KeyEvent& event)
   return GetImplementation(*this).SendKeyEvent(event);
 }
 
+void WebEngine::SetFocus( bool focused )
+{
+  GetImplementation( *this ).SetFocus( focused );
+}
+
 Dali::WebEnginePlugin::WebEnginePageLoadSignalType& WebEngine::PageLoadStartedSignal()
 {
   return GetImplementation(*this).PageLoadStartedSignal();

diff --git a/dali/devel-api/adaptor-framework/web-engine.h b/dali/devel-api/adaptor-framework/web-engine.h
index dc72683..f3622ab 100644 (file)
--- a/dali/devel-api/adaptor-framework/web-engine.h
+++ b/dali/devel-api/adaptor-framework/web-engine.h
@@ -314,6 +314,11 @@ public:
   bool SendKeyEvent(const KeyEvent& event);
 
   /**
+   * @brief Set focus.
+   */
+  void SetFocus( bool focused );
+
+  /**
    * @brief Connects to this signal to be notified when page loading is started.
    *
    * @return A signal object to connect with.

diff --git a/dali/internal/web-engine/common/web-engine-impl.cpp b/dali/internal/web-engine/common/web-engine-impl.cpp
index c058c63..8e2d55d 100644 (file)
--- a/dali/internal/web-engine/common/web-engine-impl.cpp
+++ b/dali/internal/web-engine/common/web-engine-impl.cpp
@@ -343,6 +343,11 @@ bool WebEngine::SendKeyEvent( const Dali::KeyEvent& event )
   return mPlugin->SendKeyEvent( event );
 }
 
+void WebEngine::SetFocus( bool focused )
+{
+  mPlugin->SetFocus( focused );
+}
+
 Dali::WebEnginePlugin::WebEnginePageLoadSignalType& WebEngine::PageLoadStartedSignal()
 {
   return mPlugin->PageLoadStartedSignal();
@@ -362,3 +367,4 @@ Dali::WebEnginePlugin::WebEnginePageLoadErrorSignalType& WebEngine::PageLoadErro
 } // namespace Internal;
 } // namespace Dali;
 
+

diff --git a/dali/internal/web-engine/common/web-engine-impl.h b/dali/internal/web-engine/common/web-engine-impl.h
old mode 100644 (file)
new mode 100755 (executable)
index 19d93f3..a9a9928
--- a/dali/internal/web-engine/common/web-engine-impl.h
+++ b/dali/internal/web-engine/common/web-engine-impl.h
@@ -233,6 +233,11 @@ public:
   bool SendKeyEvent( const Dali::KeyEvent& event );
 
   /**
+   * @copydoc Dali::WebEngine::SetFocus()
+   */
+  void SetFocus( bool focused );
+
+  /**
    * @copydoc Dali::WebEngine::PageLoadStartedSignal()
    */
   Dali::WebEnginePlugin::WebEnginePageLoadSignalType& PageLoadStartedSignal();