Fix not web liveboxes of other tabs to be rendered when web-provider goes to foreground

[Issue#] N/A
[Problem] web-provider is crashed sometimes when some liveboxes are rendered on other pages
[Cause] web-provider are missing regarding some scenario of entering background and foreground
[Solution] web-provider does not render web liveboxes of other tabs when web-provider goes to foreground

Change-Id: Ie104f85d591ef900f590adc411ac04e40722c90c

diff --git a/src/Core/Box.cpp b/src/Core/Box.cpp
index 190a903..2e51dab 100644 (file)
--- a/src/Core/Box.cpp
+++ b/src/Core/Box.cpp
@@ -39,6 +39,7 @@ static const std::string renderTypeUpdate("update");
 Box::Box(BoxInfoPtr boxInfo, IBoxPluginFactoryPtr factory, EwkContextPtr ewkContext)
     : m_boxInfo(boxInfo)
     , m_factory(factory)
+    , m_currentTab(true)
 {
     LogD("enter");
     try {
@@ -138,6 +139,7 @@ bool Box::resume()
     CHECK_BOX_STATE(m_state, permitResume);
 
     try {
+        m_currentTab = true;
         m_updateTimer->start();
         m_view->resumeBox();
     } catch (...) {
@@ -148,12 +150,15 @@ bool Box::resume()
     return true;
 }
 
-bool Box::pause()
+bool Box::pause(bool background)
 {
     LogD("enter");
     CHECK_BOX_STATE(m_state, permitPause);
 
     try {
+        if (!background) {
+            m_currentTab = false;
+        }
         m_updateTimer->stop();
         m_view->pauseBox();
     } catch (...) {
@@ -214,6 +219,9 @@ bool Box::update()
 {
     LogD("enter");
 
+    if (!m_currentTab) {
+        return false;
+    }
     // reload box
     m_boxBuffer->startCanvasUpdate();
     RenderInfoPtr renderInfo = makeRenderInfo(renderTypeUpdate);
@@ -233,6 +241,11 @@ bool Box::changePeriod(float period)
     return true;
 }
 
+bool Box::isCurrentTab()
+{
+    return m_currentTab;
+}
+
 RenderInfoPtr Box::makeRenderInfo(const std::string& renderType) const
 {
     LogD("enter");

diff --git a/src/Core/Box.h b/src/Core/Box.h
index 12e1418..0ab2f18 100644 (file)
--- a/src/Core/Box.h
+++ b/src/Core/Box.h
@@ -46,11 +46,12 @@ class Box: public IBox, public IBoxContext {
         bool hide();
         bool resize(int width, int height);
         bool resume();
-        bool pause();
+        bool pause(bool background);
         bool openPd(int width, int height, double x, double y);
         bool closePd();
         bool update();
         bool changePeriod(float period);
+        bool isCurrentTab();
         ~Box();
 
     private:
@@ -74,6 +75,7 @@ class Box: public IBox, public IBoxContext {
         IRenderBufferPtr m_pdBuffer;
         IRenderViewPtr m_view;
         ITimerPtr m_updateTimer;
+        bool m_currentTab;
         //IBoxStatePtr m_state;
 
         friend class BoxSchemeHandler;

diff --git a/src/Core/BoxManager.cpp b/src/Core/BoxManager.cpp
index fe4256a..28efcca 100644 (file)
--- a/src/Core/BoxManager.cpp
+++ b/src/Core/BoxManager.cpp
@@ -159,14 +159,17 @@ bool BoxManager::requestPauseBox(std::string& instanceId)
         return false;
     }
     
-    return box->pause();
+    // paused by switching other page
+    return box->pause(false);
 }
 
 bool BoxManager::requestResumeAll()
 {
     LogD("enter");
     for (auto it = m_boxMap.begin(); it != m_boxMap.end(); it++) {
-        it->second->resume();
+        if (it->second->isCurrentTab()) {
+            it->second->resume();
+        }
     }
 
     return true;
@@ -176,7 +179,10 @@ bool BoxManager::requestPauseAll()
 {
     LogD("enter");
     for (auto it = m_boxMap.begin(); it != m_boxMap.end(); it++) {
-        it->second->pause();
+        if (it->second->isCurrentTab()) {
+            // paused by entering background
+            it->second->pause(true);
+        }
     }
 
     return true;

diff --git a/src/Core/IBox.h b/src/Core/IBox.h
index 5feee10..4452f9d 100644 (file)
--- a/src/Core/IBox.h
+++ b/src/Core/IBox.h
@@ -30,13 +30,12 @@ class IBox {
         virtual bool hide() = 0;
         virtual bool resize(int width, int height) = 0;
         virtual bool resume() = 0;
-        virtual bool pause() = 0;
+        virtual bool pause(bool background) = 0;
         virtual bool openPd(int width, int height, double x, double y) = 0;
         virtual bool closePd() = 0;
         virtual bool update() = 0;
-
-        // functions for specific service
         virtual bool changePeriod(float period) = 0;
+        virtual bool isCurrentTab() = 0;
 
         //virtual IBox& operator=(const IBox& rhs) = 0;
         //virtual bool operator==(const IBox& rhs) const = 0;