[M120][WRTjs][VD] Fix app is paused issue when VSS app is launched

1.InitializeVSS early for hosted app to make sure aul app com connection is created.
2.In custom case, hide VSS is too later, it caused app window is showing before VSS
  video is stopped, then VSS recieve visibility change event and send INTERRUPT event
  to app, so app is paused.
  So hide VSS in HideSplashScreen(Followed M94 logic).

Reference:
https://review.tizen.org/gerrit/#/c/platform/framework/web/chromium-efl/+/303450/

Change-Id: I096dff53987b2b5cdda73d6dfe2c29266f6ac9f7
Signed-off-by: zhaosy <shiyusy.zhao@samsung.com>
(cherry picked from commit 3156f9570c64ed582530c98569c6948d7084d83d)

diff --git a/wrt/src/browser/basic_splash_screen.h b/wrt/src/browser/basic_splash_screen.h
index bc19aeb5b40d37a7826a66f5553972fb84071be0..0b2e7330c54958321fcd0978d8bb8cb0f783317c 100644 (file)
--- a/wrt/src/browser/basic_splash_screen.h
+++ b/wrt/src/browser/basic_splash_screen.h
@@ -32,6 +32,7 @@ class BasicSplashScreen : public SplashScreen {
  protected:
   BasicSplashScreen(std::unique_ptr<SplashScreenDelegate> delegate);
 
+  void BeforeHide() override {}
   wgt::parse::ReadyWhen GetReadyWhen() override;
 
   using SplashScreenData = const wgt::parse::LaunchScreenData;

diff --git a/wrt/src/browser/splash_screen.cc b/wrt/src/browser/splash_screen.cc
index 6204a859905611a2762cd97d0e49738c0101f1c7..15c5cef937202bf05f11cc08614c484429255768 100644 (file)
--- a/wrt/src/browser/splash_screen.cc
+++ b/wrt/src/browser/splash_screen.cc
@@ -84,6 +84,7 @@ bool SplashScreen::HideSplashScreen(HideReason reason) {
   }
   hidden_reason = reason;
 
+  splash_screen->BeforeHide();
   LOG(INFO) << "Will HideSplashScreen reason by " << reason;
   return true;
 }

diff --git a/wrt/src/browser/splash_screen.h b/wrt/src/browser/splash_screen.h
index 7b5308b77bcd9be1876fbd069709a7270dc7d5e1..ff453e794f511a482d73e4db8c2cd820bf5fcc0a 100644 (file)
--- a/wrt/src/browser/splash_screen.h
+++ b/wrt/src/browser/splash_screen.h
@@ -43,6 +43,7 @@ class SplashScreen : public electron::NativeWindowObserver {
   SplashScreen();
 
   virtual void Init() = 0;
+  virtual void BeforeHide() = 0;
   virtual void Hide() = 0;
   virtual wgt::parse::ReadyWhen GetReadyWhen() = 0;
 

diff --git a/wrt/src/browser/tv/native_web_runtime_delegate_tv.cc b/wrt/src/browser/tv/native_web_runtime_delegate_tv.cc
index 00cc1e084bf7e6ccbc07b1e444decd167cf13bde..fc12c6dbfd372b75f3eace4cf804f2d9ce526d41 100644 (file)
--- a/wrt/src/browser/tv/native_web_runtime_delegate_tv.cc
+++ b/wrt/src/browser/tv/native_web_runtime_delegate_tv.cc
@@ -291,8 +291,8 @@ void NativeWebRuntimeDelegateTV::EarlyLoadUrlIfHostedApp() {
 }
 
 void NativeWebRuntimeDelegateTV::DidInitialized() {
-  EarlyLoadUrlIfHostedApp();
   VideoSplashScreen::InitializeVSS();
+  EarlyLoadUrlIfHostedApp();
   SetD2dServiceMessageListener();
   SubscribePowerState();
 

diff --git a/wrt/src/browser/tv/video_splash_screen.cc b/wrt/src/browser/tv/video_splash_screen.cc
old mode 100755 (executable)
new mode 100644 (file)
index 9e2caa5..2e3f89a
--- a/wrt/src/browser/tv/video_splash_screen.cc
+++ b/wrt/src/browser/tv/video_splash_screen.cc
@@ -110,8 +110,10 @@ void VideoSplashScreen::InitializeVSS() {
   if (aul_app_com_connection_)
     return;
 
-  if (!aul_extension_splash_screen_tv_event("ISVIDEO"))
+  if (!aul_extension_splash_screen_tv_event("ISVIDEO")) {
+    LOG(ERROR) << "Failed to send ISVIDEO to VSS";
     return;
+  }
 
   std::string com_endpoint = kSplashScreenAulAppCom + app_data.app_id();
   if (aul_app_com_create(com_endpoint.c_str(), nullptr, OnSplashScreenMessage,
@@ -122,11 +124,19 @@ void VideoSplashScreen::InitializeVSS() {
   }
 }
 
+void VideoSplashScreen::BeforeHide() {
+  Hide();
+}
+
 void VideoSplashScreen::Hide() {
+  if (was_hidden_)
+    return;
+
   if (VideoSplashScreen::IsVSSPlaying()) {
     auto hidden_reason = SplashScreen::GetHiddenReason();
     const char* hide_reason = HideReasonToString(hidden_reason);
     HideVSSPlayer(hide_reason);
+    was_hidden_ = true;
   }
 }
 

diff --git a/wrt/src/browser/tv/video_splash_screen.h b/wrt/src/browser/tv/video_splash_screen.h
old mode 100755 (executable)
new mode 100644 (file)
index 9f08fac..661419f
--- a/wrt/src/browser/tv/video_splash_screen.h
+++ b/wrt/src/browser/tv/video_splash_screen.h
@@ -23,8 +23,11 @@ class VideoSplashScreen : public SplashScreen {
 
  private:
   void Init() override {}
+  void BeforeHide() override;
   void Hide() override;
   wgt::parse::ReadyWhen GetReadyWhen() override;
+
+  bool was_hidden_ = false;
 };
 
 }  // namespace wrt