(WebEngine) Reset native image source when engine size changed.

To avoid flickering situation during webview resize, let we just create
new NativeImageSource, and then use it.

Change-Id: Ic748ac234d2bb6bd959e2f5fd1c25b648c8cee4b
Signed-off-by: Eunki, Hong <eunkiki.hong@samsung.com>

diff --git a/dali-extension/web-engine-chromium/tizen-web-engine-chromium.cpp b/dali-extension/web-engine-chromium/tizen-web-engine-chromium.cpp
old mode 100755 (executable)
new mode 100644 (file)
index 512e03a..13c0971
--- a/dali-extension/web-engine-chromium/tizen-web-engine-chromium.cpp
+++ b/dali-extension/web-engine-chromium/tizen-web-engine-chromium.cpp
@@ -68,10 +68,10 @@ void ExecuteCallback(Callback callback, std::unique_ptr<Arg> arg)
   }
 }
 
-template <typename Callback, typename Arg>
+template<typename Callback, typename Arg>
 void ExecuteCallback(Callback callback, Arg*& arg)
 {
-  if (callback)
+  if(callback)
   {
     callback(arg);
   }
@@ -376,7 +376,7 @@ void TizenWebEngineChromium::AddJavaScriptMessageHandler(const std::string& expo
 void TizenWebEngineChromium::RegisterJavaScriptAlertCallback(JavaScriptAlertCallback callback)
 {
   mJavaScriptAlertCallback = callback;
-  if (mJavaScriptAlertCallback)
+  if(mJavaScriptAlertCallback)
   {
     ewk_view_javascript_alert_callback_set(mWebView, &TizenWebEngineChromium::OnJavaScriptAlert, this);
   }
@@ -394,7 +394,7 @@ void TizenWebEngineChromium::JavaScriptAlertReply()
 void TizenWebEngineChromium::RegisterJavaScriptConfirmCallback(JavaScriptConfirmCallback callback)
 {
   mJavaScriptConfirmCallback = callback;
-  if (mJavaScriptConfirmCallback)
+  if(mJavaScriptConfirmCallback)
   {
     ewk_view_javascript_confirm_callback_set(mWebView, &TizenWebEngineChromium::OnJavaScriptConfirm, this);
   }
@@ -412,7 +412,7 @@ void TizenWebEngineChromium::JavaScriptConfirmReply(bool confirmed)
 void TizenWebEngineChromium::RegisterJavaScriptPromptCallback(JavaScriptPromptCallback callback)
 {
   mJavaScriptPromptCallback = callback;
-  if (mJavaScriptPromptCallback)
+  if(mJavaScriptPromptCallback)
   {
     ewk_view_javascript_prompt_callback_set(mWebView, &TizenWebEngineChromium::OnJavaScriptPrompt, this);
   }
@@ -624,6 +624,11 @@ bool TizenWebEngineChromium::FeedTouchEvent(const TouchEvent& touch)
   return fed;
 }
 
+void TizenWebEngineChromium::ResetDaliImageSource()
+{
+  mDaliImageSrc = NativeImageSource::New(0, 0, NativeImageSource::COLOR_DEPTH_DEFAULT);
+}
+
 bool TizenWebEngineChromium::SendKeyEvent(const Dali::KeyEvent& keyEvent)
 {
   void* evasKeyEvent = 0;
@@ -799,6 +804,9 @@ void TizenWebEngineChromium::RegisterGeolocationPermissionCallback(GeolocationPe
 
 void TizenWebEngineChromium::UpdateDisplayArea(Dali::Rect<int32_t> displayArea)
 {
+  // Size was changed. Destroy previous native image source, and create new one.
+  ResetDaliImageSource();
+
   evas_object_move(mWebView, displayArea.x, displayArea.y);
   SetSize(displayArea.width, displayArea.height);
   evas_object_geometry_set(mWebView, displayArea.x, displayArea.y, displayArea.width, displayArea.height);
@@ -883,7 +891,7 @@ void TizenWebEngineChromium::RegisterSslCertificateChangedCallback(WebEngineCert
 void TizenWebEngineChromium::RegisterHttpAuthHandlerCallback(WebEngineHttpAuthHandlerCallback callback)
 {
   mHttpAuthHandlerCallback = callback;
-  if (mHttpAuthHandlerCallback)
+  if(mHttpAuthHandlerCallback)
   {
     ewk_view_authentication_callback_set(mWebView, &TizenWebEngineChromium::OnAuthenticationChallenged, this);
   }
@@ -936,10 +944,22 @@ void TizenWebEngineChromium::UpdateImage(tbm_surface_h buffer)
   {
     return;
   }
-  Any source(buffer);
-  mDaliImageSrc->SetSource(source);
-  Dali::Stage::GetCurrent().KeepRendering(0.0f);
-  ExecuteCallback(mFrameRenderedCallback);
+
+  uint32_t width  = tbm_surface_get_width(buffer);
+  uint32_t height = tbm_surface_get_height(buffer);
+
+  // Upldate source only if buffer size is equal with current image
+  if(mWidth == width && mHeight == height)
+  {
+    Any source(buffer);
+    mDaliImageSrc->SetSource(source);
+    Dali::Stage::GetCurrent().KeepRendering(0.0f);
+    ExecuteCallback(mFrameRenderedCallback);
+  }
+  else
+  {
+    DALI_LOG_DEBUG_INFO("(WebEngine) WebEngine size not matched with buffer (WebEngine size is %ux%u, but buffer size is %ux%u)\n", mWidth, mHeight, width, height);
+  }
 }
 
 void TizenWebEngineChromium::OnFrameRendered(void* data, Evas_Object*, void* buffer)
@@ -982,7 +1002,7 @@ void TizenWebEngineChromium::OnUrlChanged(void* data, Evas_Object*, void* newUrl
 {
   auto        pThis = static_cast<TizenWebEngineChromium*>(data);
   std::string url;
-  if (newUrl != nullptr)
+  if(newUrl != nullptr)
   {
     url = static_cast<char*>(newUrl);
     DALI_LOG_RELEASE_INFO("#UrlChanged : %s\n", url.c_str());
@@ -1057,10 +1077,10 @@ void TizenWebEngineChromium::OnNavigationPolicyDecided(void* data, Evas_Object*,
 void TizenWebEngineChromium::OnNewWindowCreated(void* data, Evas_Object*, void* out_view)
 {
   DALI_LOG_RELEASE_INFO("#NewWindowCreated.\n");
-  auto pThis = static_cast<TizenWebEngineChromium*>(data);
+  auto                   pThis     = static_cast<TizenWebEngineChromium*>(data);
   Dali::WebEnginePlugin* outPlugin = nullptr;
   ExecuteCallback(pThis->mNewWindowCreatedCallback, outPlugin);
-  if (outPlugin)
+  if(outPlugin)
   {
     *static_cast<Evas_Object**>(out_view) = WebEngineManager::Get().Find(outPlugin);
   }
@@ -1116,9 +1136,9 @@ void TizenWebEngineChromium::OnAuthenticationChallenged(Evas_Object*, Ewk_Auth_C
 
 void TizenWebEngineChromium::OnJavaScriptEvaluated(Evas_Object*, const char* result, void* data)
 {
-  auto pThis = static_cast<TizenWebEngineChromium*>(data);
+  auto        pThis = static_cast<TizenWebEngineChromium*>(data);
   std::string jsResult;
-  if (result != nullptr)
+  if(result != nullptr)
   {
     jsResult = result;
   }
@@ -1130,9 +1150,9 @@ void TizenWebEngineChromium::OnJavaScriptInjected(Evas_Object* o, Ewk_Script_Mes
   auto plugin = WebEngineManager::Get().Find(o);
   if(plugin)
   {
-    auto pThis = static_cast<TizenWebEngineChromium*>(plugin);
+    auto        pThis = static_cast<TizenWebEngineChromium*>(plugin);
     std::string resultText;
-    if (message.body != nullptr)
+    if(message.body != nullptr)
     {
       resultText = static_cast<char*>(message.body);
     }
@@ -1142,7 +1162,7 @@ void TizenWebEngineChromium::OnJavaScriptInjected(Evas_Object* o, Ewk_Script_Mes
 
 Eina_Bool TizenWebEngineChromium::OnJavaScriptAlert(Evas_Object* o, const char* alert_text, void* data)
 {
-  auto pThis  = static_cast<TizenWebEngineChromium*>(data);
+  auto        pThis = static_cast<TizenWebEngineChromium*>(data);
   std::string alertText;
   if(alert_text != nullptr)
   {
@@ -1153,7 +1173,7 @@ Eina_Bool TizenWebEngineChromium::OnJavaScriptAlert(Evas_Object* o, const char*
 
 Eina_Bool TizenWebEngineChromium::OnJavaScriptConfirm(Evas_Object* o, const char* message, void* data)
 {
-  auto pThis  = static_cast<TizenWebEngineChromium*>(data);
+  auto        pThis = static_cast<TizenWebEngineChromium*>(data);
   std::string messageText;
   if(message != nullptr)
   {
@@ -1164,7 +1184,7 @@ Eina_Bool TizenWebEngineChromium::OnJavaScriptConfirm(Evas_Object* o, const char
 
 Eina_Bool TizenWebEngineChromium::OnJavaScriptPrompt(Evas_Object* o, const char* message, const char* default_value, void* data)
 {
-  auto pThis  = static_cast<TizenWebEngineChromium*>(data);
+  auto        pThis = static_cast<TizenWebEngineChromium*>(data);
   std::string messageText;
   if(message != nullptr)
   {

diff --git a/dali-extension/web-engine-chromium/tizen-web-engine-chromium.h b/dali-extension/web-engine-chromium/tizen-web-engine-chromium.h
old mode 100755 (executable)
new mode 100644 (file)
index 6b57f8b..1455f17
--- a/dali-extension/web-engine-chromium/tizen-web-engine-chromium.h
+++ b/dali-extension/web-engine-chromium/tizen-web-engine-chromium.h
@@ -39,7 +39,6 @@ class PixelData;
 
 namespace Plugin
 {
-
 /**
  * @brief A class implements Dali::WebEnginePlugin for tizen chromium.
  */
@@ -546,35 +545,35 @@ public:
 private:
   static Dali::PixelData ConvertImageColorSpace(Evas_Object* image);
 
-  static void OnFrameRendered(void* data, Evas_Object*, void* buffer);
-  static void OnLoadStarted(void* data, Evas_Object*, void*);
-  static void OnLoadInProgress(void* data, Evas_Object*, void*);
-  static void OnLoadFinished(void* data, Evas_Object*, void*);
-  static void OnLoadError(void* data, Evas_Object*, void* rawError);
-  static void OnUrlChanged(void* data, Evas_Object*, void* newUrl);
-  static void OnConsoleMessageReceived(void* data, Evas_Object*, void* eventInfo);
-  static void OnEdgeLeft(void* data, Evas_Object*, void*);
-  static void OnEdgeRight(void* data, Evas_Object*, void*);
-  static void OnEdgeTop(void* data, Evas_Object*, void*);
-  static void OnEdgeBottom(void* data, Evas_Object*, void*);
-  static void OnFormRepostDecided(void* data, Evas_Object*, void* eventInfo);
-  static void OnResponsePolicyDecided(void* data, Evas_Object*, void* policy);
-  static void OnNavigationPolicyDecided(void* data, Evas_Object*, void* policy);
-  static void OnNewWindowCreated(void* data, Evas_Object*, void* out_view);
-  static void OnCertificateConfirmed(void* data, Evas_Object*, void* eventInfo);
-  static void OnSslCertificateChanged(void* data, Evas_Object*, void* eventInfo);
-  static void OnContextMenuShown(void* data, Evas_Object*, void* eventInfo);
-  static void OnContextMenuHidden(void* data, Evas_Object*, void* eventInfo);
-  static void OnAuthenticationChallenged(Evas_Object*, Ewk_Auth_Challenge* authChallenge, void* data);
-  static void OnJavaScriptEvaluated(Evas_Object* o, const char* result, void* data);
-  static void OnJavaScriptInjected(Evas_Object* o, Ewk_Script_Message message);
+  static void      OnFrameRendered(void* data, Evas_Object*, void* buffer);
+  static void      OnLoadStarted(void* data, Evas_Object*, void*);
+  static void      OnLoadInProgress(void* data, Evas_Object*, void*);
+  static void      OnLoadFinished(void* data, Evas_Object*, void*);
+  static void      OnLoadError(void* data, Evas_Object*, void* rawError);
+  static void      OnUrlChanged(void* data, Evas_Object*, void* newUrl);
+  static void      OnConsoleMessageReceived(void* data, Evas_Object*, void* eventInfo);
+  static void      OnEdgeLeft(void* data, Evas_Object*, void*);
+  static void      OnEdgeRight(void* data, Evas_Object*, void*);
+  static void      OnEdgeTop(void* data, Evas_Object*, void*);
+  static void      OnEdgeBottom(void* data, Evas_Object*, void*);
+  static void      OnFormRepostDecided(void* data, Evas_Object*, void* eventInfo);
+  static void      OnResponsePolicyDecided(void* data, Evas_Object*, void* policy);
+  static void      OnNavigationPolicyDecided(void* data, Evas_Object*, void* policy);
+  static void      OnNewWindowCreated(void* data, Evas_Object*, void* out_view);
+  static void      OnCertificateConfirmed(void* data, Evas_Object*, void* eventInfo);
+  static void      OnSslCertificateChanged(void* data, Evas_Object*, void* eventInfo);
+  static void      OnContextMenuShown(void* data, Evas_Object*, void* eventInfo);
+  static void      OnContextMenuHidden(void* data, Evas_Object*, void* eventInfo);
+  static void      OnAuthenticationChallenged(Evas_Object*, Ewk_Auth_Challenge* authChallenge, void* data);
+  static void      OnJavaScriptEvaluated(Evas_Object* o, const char* result, void* data);
+  static void      OnJavaScriptInjected(Evas_Object* o, Ewk_Script_Message message);
   static Eina_Bool OnJavaScriptAlert(Evas_Object* o, const char* alert_text, void*);
   static Eina_Bool OnJavaScriptConfirm(Evas_Object* o, const char* message, void*);
   static Eina_Bool OnJavaScriptPrompt(Evas_Object* o, const char* message, const char* default_value, void*);
-  static void OnHitTestCreated(Evas_Object*, int x, int y, int hitTestMode, Ewk_Hit_Test* hitTest, void* data);
-  static void OnScreenshotCaptured(Evas_Object* image, void* data);
-  static void OnVideoPlaying(Evas_Object*, Eina_Bool isPlaying, void* data);
-  static void OnPlainTextReceived(Evas_Object* o, const char* plainText, void* data);
+  static void      OnHitTestCreated(Evas_Object*, int x, int y, int hitTestMode, Ewk_Hit_Test* hitTest, void* data);
+  static void      OnScreenshotCaptured(Evas_Object* image, void* data);
+  static void      OnVideoPlaying(Evas_Object*, Eina_Bool isPlaying, void* data);
+  static void      OnPlainTextReceived(Evas_Object* o, const char* plainText, void* data);
   static Eina_Bool OnGeolocationPermission(Evas_Object*, Ewk_Geolocation_Permission_Request* request, void* data);
 
   void UpdateImage(tbm_surface_h buffer);
@@ -582,6 +581,11 @@ private:
   bool FeedMouseEvent(const TouchEvent& touch);
   bool FeedTouchEvent(const TouchEvent& touch);
 
+  /**
+   * @brief Destroy and re-create native image source.
+   */
+  void ResetDaliImageSource();
+
   // ewk web view.
   Dali::NativeImageSourcePtr                mDaliImageSrc;
   Evas_Object*                              mWebView;