Merge branch 'tizen_30' into tizen_40

diff --git a/runtime/browser/web_application.cc b/runtime/browser/web_application.cc
index ac93129..a99a876 100755 (executable)
--- a/runtime/browser/web_application.cc
+++ b/runtime/browser/web_application.cc
@@ -931,8 +931,12 @@ void WebApplication::OnHardwareKey(WebView* view, const std::string& keyname) {
       if(enabled)
         view->EvalJavascript(kBackKeyEventScript);
       if (!view->Backward()) {
-        LOGGER(DEBUG) << "Terminate";
-        Terminate();
+        if (view_stack_.size() == 1) {
+          LOGGER(DEBUG) << "Terminate";
+          Terminate();
+        } else {
+          RemoveWebViewFromStack(view_stack_.front());
+        }
       }
     }
     return;
@@ -947,8 +951,12 @@ void WebApplication::OnHardwareKey(WebView* view, const std::string& keyname) {
         (app_data_->widget_info() != NULL &&
          app_data_->widget_info()->view_modes() == "windowed")) {
       if (!view->Backward()) {
-        LOGGER(DEBUG) << "Terminate";
-        Terminate();
+        if (view_stack_.size() == 1) {
+          LOGGER(DEBUG) << "Terminate";
+          Terminate();
+        } else {
+          RemoveWebViewFromStack(view_stack_.front());
+        }
       }
     }
   } else if (enabled && kKeyNameMenu == keyname) {