Revert "Initial implementation of app loop" 34/171534/1
authorws29.jung <ws29.jung@samsung.com>
Mon, 5 Mar 2018 08:52:39 +0000 (17:52 +0900)
committerws29.jung <ws29.jung@samsung.com>
Mon, 5 Mar 2018 10:34:27 +0000 (19:34 +0900)
This commit causes WebApp crash.

This reverts commit c76ede6a4d27ae6dcda26d5f1990072755f5d793.

Change-Id: I2e11d793959c740cbba092910c0aac83443db87a
Signed-off-by: ws29.jung <ws29.jung@samsung.com>
17 files changed:
atom/app/atom_main.cc
atom/app/runtime.cc [deleted file]
atom/app/runtime.h [deleted file]
atom/app/ui_runtime.cc [deleted file]
atom/app/ui_runtime.h [deleted file]
atom/browser/api/atom_api_web_contents.cc
atom/browser/api/atom_api_window.cc
atom/browser/api/atom_api_window.h
atom/browser/browser.cc
atom/browser/browser.h
atom/browser/browser_observer.h
efl/build/system.gyp
electron.gyp
filenames.gypi
wrt/src/runtime.js
wrt/src/web_window.js
wrt/src/web_window_tag.js

index 522e499..cd51296 100644 (file)
@@ -44,8 +44,6 @@
 #include "base/logging.h"
 #endif
 
-#include "atom/app/runtime.h"
-
 namespace {
 
 const char* kRunAsNode = "ELECTRON_RUN_AS_NODE";
@@ -138,18 +136,6 @@ int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t* cmd, int) {
 #elif defined(OS_LINUX)  // defined(OS_WIN)
 
 #if defined(OS_TIZEN)
-// For debug purpose only
-bool hasTizenPackageID(int argc, const char* const* argv) {
-  if (argc > 3) {
-    if (0 == strncmp(argv[0], "/opt/usr/globalapps/", strlen("/opt/usr/globalapps/"))) {
-      return true;
-    }
-  }
-  return false;
-}
-#endif
-
-#if defined(OS_TIZEN)
 int real_main(int argc, char* argv[]) {
 #else
 int main(int argc, char* argv[]) {
@@ -191,15 +177,7 @@ int main(int argc, char* argv[]) {
   params.argc = argc;
   params.argv = const_cast<const char**>(argv);
   atom::AtomCommandLine::Init(argc, argv);
-#if defined(OS_TIZEN)
-  if (hasTizenPackageID(argc,argv)) {
-    std::unique_ptr<runtime::Runtime> runtime = runtime::Runtime::MakeRuntime();
-    runtime->Exec(params);
-    return 1;
-  }
-#endif
   return content::ContentMain(params);
-
 }
 
 #if defined(OS_TIZEN)
diff --git a/atom/app/runtime.cc b/atom/app/runtime.cc
deleted file mode 100644 (file)
index 95a9b16..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-#include "atom/app/runtime.h"
-#include "atom/app/ui_runtime.h"
-#include "base/logging.h"
-
-namespace runtime {
-
-Runtime::~Runtime() {
-}
-
-std::unique_ptr<Runtime> Runtime::MakeRuntime() {
-/*  if (app_data->app_type() == common::ApplicationData::UI) {
-    return std::unique_ptr<Runtime>(new UiRuntime());
-  }
-#ifdef IME_FEATURE_SUPPORT
-  else if (app_data->app_type() == common::ApplicationData::IME) {
-    return std::unique_ptr<Runtime>(new ImeRuntime(app_data));
-  }
-#endif  // IME_FEATURE_SUPPORT
-#ifdef WATCH_FACE_FEATURE_SUPPORT
-  else if (app_data->app_type() == common::ApplicationData::WATCH) {
-    return std::unique_ptr<Runtime>(new WatchRuntime(app_data));
-  }
-#endif  // WATCH_FACE_FEATURE_SUPPORT
-  else { */
-    return std::unique_ptr<Runtime>(new UiRuntime());
-  //}
-}
-
-}  // namespace runtime
\ No newline at end of file
diff --git a/atom/app/runtime.h b/atom/app/runtime.h
deleted file mode 100644 (file)
index a893875..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-
-#ifndef RUNTIME_H_
-#define RUNTIME_H_
-
-#include <memory>
-#include <string>
-
-#include "content/public/app/content_main.h"
-
-namespace runtime {
-
-class Runtime {
- public:
-  virtual ~Runtime() = 0;
-
-  virtual int Exec(content::ContentMainParams params) = 0;
-
-  static std::unique_ptr<Runtime> MakeRuntime();
-};
-
-}  // namespace runtime
-
-#endif  // RUNTIME_H_
\ No newline at end of file
diff --git a/atom/app/ui_runtime.cc b/atom/app/ui_runtime.cc
deleted file mode 100644 (file)
index b732652..0000000
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd All Rights Reserved
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#include "atom/app/ui_runtime.h"
-#include "atom/app/atom_main_delegate.h"
-#include "content/public/app/content_main.h"
-#include "atom/common/atom_command_line.h"
-#include "atom/browser/atom_browser_client.h"
-#include "base/logging.h"
-#include "atom/browser/browser.h"
-
-#include <app.h>
-#include <string>
-#include <vector>
-
-namespace runtime {
-
-UiRuntime::UiRuntime() {
-}
-
-UiRuntime::~UiRuntime() {
-}
-
-
-bool UiRuntime::OnCreate() {
-  
-}
-
-void UiRuntime::OnTerminate() {
-}
-
-void UiRuntime::Terminate() {
-  
-}
-
-void UiRuntime::OnPause() {
-  LOG(ERROR) << "OnPause()";
-}
-
-void UiRuntime::OnResume() {
-  LOG(ERROR) << "OnResume()";
-}
-
-void UiRuntime::OnAppControl(app_control_h app_control) {
-    LOG(ERROR) << "OnAppControl()";
-}
-
-void UiRuntime::OnLanguageChanged(const std::string& language) {
-  LOG(ERROR) << "OnLanguageChanged()";
-}
-
-void UiRuntime::OnLowMemory() {
-  LOG(ERROR) << "OnLowMemory()";
-}
-
-int UiRuntime::Exec(content::ContentMainParams params) {
-  ui_app_lifecycle_callback_s ops = {NULL, NULL, NULL, NULL, NULL};
-
-    // onCreate
-    ops.create = [](void* data) -> bool {
-
-      LOG(ERROR) << "Create Tizen App.";
-      content::ContentMainParams *params = (content::ContentMainParams*)data;
-      content::ContentMain(*params);
-      return true;
-    };
-
-    // onTerminate
-    ops.terminate = [](void* data) -> void {
-      LOG(ERROR) << "Terminate Tizen App.";
-      atom::Browser *browser_model = atom::Browser::Get();
-      browser_model->Shutdown();
-    };
-
-    // onPause
-    ops.pause = [](void* data) -> void {
-      LOG(ERROR) << "Pause Tizen App.";
-      atom::Browser *browser_model = atom::Browser::Get();
-      browser_model->Hide();
-    };
-
-    // onResume
-    ops.resume = [](void* data) -> void {
-      LOG(ERROR) << "Resume Tizen App.";
-      atom::Browser *browser_model = atom::Browser::Get();
-      browser_model->Show();
-    };
-
-    // onAppControl
-    ops.app_control = [](app_control_h app_control, void* data) -> void {
-      LOG(ERROR) << "app_control Tizen App.";
-    };
-
-    std::vector<std::string> cmdAgrs =  atom::AtomCommandLine::argv();
-    int argc = cmdAgrs.size();
-    //std::string argv;
-    char **argvs = (char**)malloc(sizeof(char)*100);
-    for (int i=0;i<argc;i++) {
-      argvs[i] = (char*)malloc(sizeof(char)*200);
-      strcpy(argvs[i] , cmdAgrs[i].c_str());
-    }
-    LOG(ERROR) << "Start app";
-    ui_app_main(argc, (char **)argvs, &ops, &params);
-    return 1;
-}
-
-void UiRuntime::ResetWebApplication() {
-
-}
-
-} //namespace
\ No newline at end of file
diff --git a/atom/app/ui_runtime.h b/atom/app/ui_runtime.h
deleted file mode 100644 (file)
index 4f4dd36..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#ifndef UI_RUNTIME_H_
-#define UI_RUNTIME_H_
-
-#include <app.h>
-#include <string>
-#include "atom/app/runtime.h"
-#include "content/public/app/content_main.h"
-
-namespace runtime {
-
-class UiRuntime : public Runtime {
- public:
-  UiRuntime();
-  virtual ~UiRuntime();
-
-  virtual int Exec(content::ContentMainParams params);
-
- protected:
-  virtual bool OnCreate();
-  virtual void OnTerminate();
-  virtual void OnPause();
-  virtual void OnResume();
-  virtual void OnAppControl(app_control_h app_control);
-  virtual void OnLanguageChanged(const std::string& language);
-  virtual void OnLowMemory();
-  virtual void Terminate();
-
- private:
-  void ResetWebApplication();
-};
-
-}  // namespace runtime
-
-#endif  // XWALK_RUNTIME_BROWSER_UI_RUNTIME_H_
index 66c4564..8c473c5 100644 (file)
@@ -434,12 +434,7 @@ bool WebContents::DidAddMessageToConsole(content::WebContents* source,
                                          int32_t line_no,
                                          const base::string16& source_id) {
   if (type_ == BROWSER_WINDOW || type_ == OFF_SCREEN) {
-#if defined(USE_EFL)
-    LOG(ERROR) << "ConsoleMessage : " << message << "\", source: " << source_id << " (" << line_no << ")";
-    return true;
-#else
     return false;
-#endif
   } else {
     Emit("console-message", level, message, line_no, source_id);
     return true;
index f19fbda..72b8e33 100644 (file)
@@ -310,16 +310,6 @@ void Window::OnWindowMessage(UINT message, WPARAM w_param, LPARAM l_param) {
 }
 #endif
 
-#if defined(USE_EFL)
-void Window::OnSuspend() {
-  Emit("app-on-suspend");
-}
-
-void Window::OnResume() {
-  Emit("app-on-resume");
-}
-#endif
-
 // static
 mate::WrappableBase* Window::New(mate::Arguments* args) {
   if (!Browser::Get()->is_ready()) {
index daa56c7..75f0328 100644 (file)
@@ -96,11 +96,6 @@ class Window : public mate::TrackableObject<Window>,
   void OnWindowMessage(UINT message, WPARAM w_param, LPARAM l_param) override;
   #endif
 
-  #if defined(USE_EFL)
-  void OnSuspend();
-  void OnResume();
-  #endif
-
  private:
   void Init(v8::Isolate* isolate,
             v8::Local<v8::Object> wrapper,
index 6f2a3c7..b2900a3 100644 (file)
@@ -213,14 +213,4 @@ void Browser::OnWindowAllClosed() {
   }
 }
 
-void Browser::Hide() {
-  for (BrowserObserver& observer : observers_)
-      observer.OnSuspend();
-}
-
-void Browser::Show() {
-  for (BrowserObserver& observer : observers_)
-      observer.OnResume();
-}
-
 }  // namespace atom
index fc674dd..78cac65 100644 (file)
@@ -104,8 +104,6 @@ class Browser : public WindowListObserver {
   void SetLoginItemSettings(LoginItemSettings settings);
   LoginItemSettings GetLoginItemSettings(const LoginItemSettings& options);
 
-  void Hide();
-  void Show();
 #if defined(OS_MACOSX)
   // Hide the application.
   void Hide();
index b5760ec..88a50a9 100644 (file)
@@ -55,8 +55,6 @@ class BrowserObserver {
   // The browser's accessibility suppport has changed.
   virtual void OnAccessibilitySupportChanged() {}
 
-  virtual void OnSuspend() {}
-  virtual void OnResume() {}
 #if defined(OS_MACOSX)
   // The browser wants to resume a user activity via handoff. (macOS only)
   virtual void OnContinueUserActivity(
index 3e0f94f..8934237 100644 (file)
         }], # tizen_product_tv==1
       ],
     }, # vd-win-util
-    {
-      'target_name': 'capi-appfw-application',
-      'type': 'none',
-      'conditions': [
-        ['is_tizen==1', {
-          'direct_dependent_settings': {
-            'cflags': [
-              '<!@(<(pkg-config) --cflags capi-appfw-application)',
-            ],
-          },
-          'link_settings': {
-            'ldflags': [
-              '<!@(<(pkg-config) --libs-only-L --libs-only-other capi-appfw-application)',
-            ],
-            'libraries': [
-              '<!@(<(pkg-config) --libs-only-l capi-appfw-application)',
-            ],
-          },
-        }],
-      ],
-    }, # capi-appfw-application
   ],
 }
index 99d3545..a7f036f 100644 (file)
             'tizen/loader/loader.gyp:wrt-loader',
             '<(DEPTH)/efl/build/system.gyp:ecore',
             '<(DEPTH)/efl/build/system.gyp:launchpad',
-            '<(DEPTH)/efl/build/system.gyp:capi-appfw-application',
           ],
           'sources': [
             'tizen/loader/prelauncher.h',
                 '<(DEPTH)/efl/build/system.gyp:efl-extension',
                 '<(DEPTH)/efl/build/system.gyp:evas',
                 '<(DEPTH)/efl/build/system.gyp:icu',
-                '<(DEPTH)/efl/build/system.gyp:capi-appfw-application',
                 'electron_shell_copy',
               ],
             }, {
index 79dfbeb..16fd220 100644 (file)
@@ -99,8 +99,6 @@
       'atom/app/atom_main_delegate.h',
       'atom/app/atom_main_delegate_mac.mm',
       'atom/app/node_main.cc',
-      'atom/app/runtime.cc',
-      'atom/app/ui_runtime.cc',
       'atom/app/node_main.h',
       'atom/app/uv_task_runner.cc',
       'atom/app/uv_task_runner.h',
index ca2fc62..b156ca3 100644 (file)
@@ -115,11 +115,11 @@ class Runtime {
     killAllProcesses() {}
     handleWasEvents() {
         var _this = this;
-        events.on(WAS_EVENT.RUNTIME.RESUME, (sender, id) => {
+        events.on(WAS_EVENT.RUNTIME.FOCUS, (sender, id) => {
             runtime_debug('handleWasMessages: focus ' + id);
             return _this.onResume(id);
         });
-        events.on(WAS_EVENT.RUNTIME.SUSPEND, (sender, id) => {
+        events.on(WAS_EVENT.RUNTIME.UNFOCUS, (sender, id) => {
             return _this.onPause(id);
         });
     }
index 1111959..6423300 100644 (file)
@@ -131,14 +131,6 @@ class WebWindow {
         this.mainWindow.on('language-changed', function(event, locale) {
             webwindow_debug('WebWindow : language-changed event  = ' + (JSON.stringify(locale)));
         });
-        this.mainWindow.on('app-on-suspend', function() {
-            webwindow_debug('WebWindow : app-on-suspend');
-            events.emit(WAS_EVENT.RUNTIME.SUSPEND, 'web_window', self.mainWindow.id);
-        });
-        this.mainWindow.on('app-on-resume', function() {
-            webwindow_debug('WebWindow : app-on-resume');
-            events.emit(WAS_EVENT.RUNTIME.RESUME, 'web_window', self.mainWindow.id);
-        });
         this.mainWindow.webContents.on('crashed', function() {
             webwindow_debug('WebWindow : webContents crashed');
             global.webApplication.exit(100);
index ac02405..ae60995 100644 (file)
@@ -154,14 +154,6 @@ class WebWindowTag {
         this.mainWindow.on('language-changed', function(event, locale) {
             webwindow_debug('WebWindow : language-changed event  = ' + (JSON.stringify(locale)));
         });
-        this.mainWindow.on('app-on-suspend', function() {
-            webwindow_debug('WebWindow : app-on-suspend');
-            events.emit(WAS_EVENT.RUNTIME.SUSPEND, 'web_window', self.mainWindow.id);
-        });
-        this.mainWindow.on('app-on-resume', function() {
-            webwindow_debug('WebWindow : app-on-resume');
-            events.emit(WAS_EVENT.RUNTIME.RESUME, 'web_window', self.mainWindow.id);
-        });
         this.mainWindow.webContents.on('crashed', function() {
             webwindow_debug('WebWindow : webContents crashed');
             global.webApplication.exit(100);