Fixed crash issue during receiving reset event

[Issue#] N/A
[Problem] Crash issue occurred when webapp receive reset event
[Cause] RunnableWidgetObjectState isn't stable
[Solution] Change state when receive reset event to ShowedState
[SCMRequest] N/A

Change-Id: I0cc1f777bcbd03e146cfd956c292b06e4550df89

diff --git a/src/api_new/runnable_widget_object_state.cpp b/src/api_new/runnable_widget_object_state.cpp
index 485d020..ef30b04 100644 (file)
--- a/src/api_new/runnable_widget_object_state.cpp
+++ b/src/api_new/runnable_widget_object_state.cpp
@@ -220,6 +220,11 @@ StateChange ShowedState::allowReload()
     return StateChange::NoChange;
 }
 
+StateChange ShowedState::allowReset()
+{
+    return StateChange(RunnableWidgetObjectStatePtr(new ShowedState(m_object)));
+}
+
 SuspendedState::SuspendedState(RunnableWidgetObject & object) : RunnableWidgetObjectState(object)
 {
 }
@@ -234,18 +239,18 @@ StateChange SuspendedState::allowResume()
     return StateChange(RunnableWidgetObjectStatePtr(new ShowedState(m_object)));
 }
 
-HiddenState::HiddenState(RunnableWidgetObject & object) : RunnableWidgetObjectState(object)
+StateChange SuspendedState::allowReset()
 {
+    return StateChange(RunnableWidgetObjectStatePtr(new ShowedState(m_object)));
 }
 
-std::string HiddenState::toString() const
+HiddenState::HiddenState(RunnableWidgetObject & object) : RunnableWidgetObjectState(object)
 {
-    return "HIDEN";
 }
 
-StateChange HiddenState::allowReset()
+std::string HiddenState::toString() const
 {
-    return StateChange(RunnableWidgetObjectStatePtr(new InitialState(m_object)));
+    return "HIDEN";
 }
 
 StateChange HiddenState::allowHide()

diff --git a/src/api_new/runnable_widget_object_state.h b/src/api_new/runnable_widget_object_state.h
index 8db860a..16af46a 100644 (file)
--- a/src/api_new/runnable_widget_object_state.h
+++ b/src/api_new/runnable_widget_object_state.h
@@ -149,6 +149,7 @@ public:
     StateChange allowBackward();
     StateChange allowForward();
     StateChange allowReload();
+    StateChange allowReset();
 };
 
 /**
@@ -161,6 +162,7 @@ public:
     std::string toString() const;
 
     StateChange allowResume();
+    StateChange allowReset();
 };
 
 /**
@@ -173,7 +175,6 @@ public:
     std::string toString() const;
 
     StateChange allowHide();
-    StateChange allowReset();
 };
 
 }