Move return values to its own section (this commit is a but messed up, didn't commit after merging).

Author: David Håsäther

src/build-application/build_application.js

@@ -61,6 +61,29 @@ window.app.MIN_SUPPORTED_CORE_VERSION = 167;
 
 window.cls.MessageMixin.apply(window.app); // Give the app object message handling powers
 
+window.app.profiles = {};
+window.app.profiles.DEFAULT = 1;
+window.app.profiles.PROFILER = 2;
+window.app.profiles.HTTP_PROFILER = 3;
+window.app.profiles[window.app.profiles.DEFAULT] = ["window-manager",
+                                                    "console-logger",
+                                                    "exec",
+                                                    "ecmascript-debugger",
+                                                    "cookie-manager",
+                                                    "resource-manager",
+                                                    "document-manager"];
+window.app.profiles[window.app.profiles.DEFAULT].is_enabled = false;
+window.app.profiles[window.app.profiles.PROFILER] = ["window-manager",
+                                                     "exec",
+                                                     "profiler",
+                                                     "overlay"];
+window.app.profiles[window.app.profiles.PROFILER].is_enabled = false;
+window.app.profiles[window.app.profiles.HTTP_PROFILER] = ["window-manager",
+                                                          "resource-manager",
+                                                          "document-manager",
+                                                          "exec"];
+window.app.profiles[window.app.profiles.HTTP_PROFILER].is_enabled = false;
+
 window.app.build_application = function(on_services_created, on_services_enabled)
 {
 
@@ -157,15 +180,9 @@ window.app.build_application = function(on_services_created, on_services_enabled
     {
       on_services_created(service_descriptions);
     }
-    for (service_name in service_descriptions)
-    {
-      if(service_name in window.services &&
-            window.services[service_name].is_implemented &&
-            service_name != "scope")
-      {
-        window.services['scope'].requestEnable(0,[service_name]);
-      }
-    }
+
+    window.services.scope.enable_profile(window.settings.general.get("profile-mode") ||
+                                         window.app.profiles.DEFAULT);
   }
 
   var create_raw_interface = function(service_name)
@@ -188,7 +205,7 @@ window.app.build_application = function(on_services_created, on_services_enabled
       var tracker = new cls.UserTracker(trackerurl);
       var cb = function(status, url)
       {
-        if (status != 200)
+        if (status != 200 && !cls.ScopeHTTPInterface.is_enabled)
         {
           opera.postError("Usertracker could not send heartbeat to tracker server at " + url + ". Got status " + status);
         }
@@ -217,7 +234,9 @@ window.app.build_application = function(on_services_created, on_services_enabled
     'ecmascript-debugger',
     'cookie-manager',
     'resource-manager',
-    'document-manager'
+    'document-manager',
+    'profiler',
+    'overlay'
   ].forEach(create_raw_interface);
   var params = this.helpers.parse_url_arguments();
   if(params.debug)

src/build-application/build_ecmascript_debugger_6_0.js

@@ -84,11 +84,18 @@ window.app.builders.EcmascriptDebugger["6.0"] = function(service)
                         'scroll mono');
 
     /* Runtime State */
-    new SidePanelView('scripts-side-panel', 
-                      ui_strings.M_VIEW_LABEL_RUNTIME_STATE,
-                      ['watches', 'callstack', 'inspection'],
-                      // default expanded flags for the view list
-                      [false, true, true]);
+    new cls.JSSidePanelView('scripts-side-panel', 
+                            ui_strings.M_VIEW_LABEL_RUNTIME_STATE,
+                            ['watches', 'return-values', 'callstack', 'inspection'],
+                            // default expanded flags for the view list
+                            [false, true, true]);
+
+    /* Return Values */
+    cls.ReturnValuesView.prototype = ViewBase;
+    new cls.ReturnValuesView('return-values',
+                          "Return Values",
+                          'scroll mono');
+    cls.ReturnValuesView.create_ui_widgets();
 
     /* Callstack */
     cls.CallstackView.prototype = ViewBase;
@@ -153,11 +160,11 @@ window.app.builders.EcmascriptDebugger["6.0"] = function(service)
                           'scroll css-layout');
 
     /* Runtime State */
-    new SidePanelView('breakpoints-side-panel', 
-                      ui_strings.M_VIEW_LABEL_BREAKPOINTS,
-                      ['breakpoints', 'event-breakpoints'],
-                      // default expanded flags for the view list
-                      [true, false]);
+    new cls.JSSidePanelView('breakpoints-side-panel', 
+                            ui_strings.M_VIEW_LABEL_BREAKPOINTS,
+                            ['breakpoints', 'event-breakpoints'],
+                            // default expanded flags for the view list
+                            [true, false]);
 
     /* Event Breakpoints */
     window.event_breakpoints = cls.EventBreakpoints.get_instance();

src/client-en.xml

@@ -196,6 +196,7 @@ window.load_screen_timeout = window.setTimeout(function()
 <link rel="stylesheet" href="./ecma-debugger/breakpoints/style.css"/>
 <link rel="stylesheet" href="./storage/storage_style.css"/>
 <link rel="stylesheet" href="./screenshot/style.css"/>
+<link rel="stylesheet" href="./profiler/profiler_style.css"/>
 <link rel="stylesheet" href="./ui-scripts/tooltip/tooltip.css"/>
 
 
@@ -249,7 +250,6 @@ window.load_screen_timeout = window.setTimeout(function()
 <script src="./lib/test_framework.js"/>
 
 
-
 <script src="./ui-scripts/ui.js"/>
 <script src="./ui-scripts/tabbar.js"/>
 <script src="./ui-scripts/actions/actionbroker.js"/>
@@ -327,6 +327,7 @@ window.load_screen_timeout = window.setTimeout(function()
 <script src="./build-application/build_ecmascript_debugger_6_0.js"></script>
 <script src="./build-application/build_cookie_manager_1_0.js"></script>
 <script src="./build-application/build_resource_manager_1_0.js"></script>
+<script src="./build-application/build_profiler_1_0.js"></script>
 <script src="./build-application/build_document_manager_1_0.js"></script>
 
 <script src="./debug/debug.js"/>
@@ -367,7 +368,10 @@ window.load_screen_timeout = window.setTimeout(function()
 <script src="./ecma-debugger/stop_at.js"/>
 <script src="./ecma-debugger/runtime_onload_handler.js"/>
 <script src="./ecma-debugger/views-runtimes.js"/>
+<script src="./ecma-debugger/view_return_values.js"/>
+<script src="./ecma-debugger/view_callstack.js"/>
 <script src="./ecma-debugger/views.js"/>
+<script src="./ecma-debugger/view_js_sidepanel.js"/>
 
 <script src="./ecma-debugger/objectinspection.6.0/prettyprinter.js"/>
 <script src="./ecma-debugger/objectinspection.6.0/inspectiontooltip.js"/>
@@ -466,6 +470,14 @@ window.load_screen_timeout = window.setTimeout(function()
 <script src="./repl/dfcommands.js"/>
 <script src="./repl/runtimeselect.js"/>
 
+<script src="./overlay/overlay_service.js"/>
+
+<script src="./profiler/profiler.1.0.responses.getevents.js"/>
+<script src="./profiler/profiler.1.0.responses.stopprofiler.js"/>
+<script src="./profiler/profiler_service.js"/>
+<script src="./profiler/profiler_view.js"/>
+<script src="./profiler/profiler_templates.js"/>
+
 
 <script src="./resource-manager/resource_service.js"/>
 

src/client/client.js

@@ -142,6 +142,7 @@ window.cls.Client = function()
 
   this.setup = function()
   {
+    window.services.scope.reset();
     var port = _get_port_number();
     var client = {
       id: clients.length + 1,
@@ -157,6 +158,7 @@ window.cls.Client = function()
     {
       // implement the scope DOM API
       cls.ScopeHTTPInterface.call(opera /*, force_stp_0 */);
+      cls.ScopeHTTPInterface.is_enabled = true;
     }
 
     if (!opera.stpVersion)
@@ -333,8 +335,12 @@ window.cls.Client = function()
     new CompositeView('console_panel',
                       ui_strings.M_VIEW_LABEL_COMMAND_LINE,
                       layouts.console_rough_layout);
-
-  };
+    new CompositeView('profiler_mode',
+                      ui_strings.M_VIEW_LABEL_PROFILER,
+                      layouts.profiler_rough_layout,
+                      null,
+                      services);
+  }
 
   this.create_window_controls = function()
   {
@@ -361,7 +367,8 @@ window.cls.Client = function()
       controls.push(new Button("top-window-close", "", ui_strings.S_BUTTON_LABEL_CLOSE_WINDOW));
     }
 
-    document.documentElement.render(templates.window_controls(controls));
+    var win_ctrls = document.documentElement.render(templates.window_controls(controls));
+    window.messages.post("window-controls-created", {window_controls: win_ctrls});
 
     var button = UI.get_instance().get_button("toggle-remote-debug-overlay");
     if (this.current_client && this.connection_is_remote(this.current_client))
@@ -450,31 +457,41 @@ window.cls.Client = function()
     if (last_selected_view)
     {
       var esdi = window.services['ecmascript-debugger'];
-      var cb = this._on_ecmascript_enabled.bind(this, last_selected_view);
-      esdi.add_listener('enable-success', cb);
+      this._on_profile_enabled_cb = this._profile_enabled.bind(this, last_selected_view);
+      window.messages.addListener("profile-enabled", this._on_profile_enabled_cb);
     }
   };
 
-  this._on_ecmascript_enabled = function(last_selected_view)
+  this._profile_enabled = function(last_selected_view, msg)
   {
-    var tag = tagManager.set_callback(null, function(status, message)
+    if (msg.profile == window.app.profiles.DEFAULT)
     {
-      const OBJECT_ID = 0;
-      if (!message[OBJECT_ID])
+      var tag = window.tag_manager.set_callback(this, function(status, message)
       {
-        // if last_selected_view is hidden and the tab has a fallback_view_id, use that.
-        if (
-          views[last_selected_view] &&
-          views[last_selected_view].is_hidden &&
-          views[last_selected_view].fallback_view_id
-        )
-        {
-          last_selected_view = views[last_selected_view].fallback_view_id;
-        }
-        UI.get_instance().show_view(last_selected_view);
-      }
-    });
-    window.services['ecmascript-debugger'].requestGetSelectedObject(tag);
+        const OBJECT_ID = 0;
+        if (!message[OBJECT_ID])
+          this._show_last_selected_view(last_selected_view);
+      });
+      var esdi = window.services["ecmascript-debugger"];
+      esdi.requestGetSelectedObject(tag);
+    }
+    else
+      this._show_last_selected_view(last_selected_view);
+    
+    window.messages.removeListener("profile-enabled", this._on_profile_enabled_cb);
+
+  };
+
+  this._show_last_selected_view = function(last_selected_view)
+  {
+    // if last_selected_view is hidden and the tab has a fallback_view_id, use that.
+    if (window.views[last_selected_view] &&
+        window.views[last_selected_view].is_hidden &&
+        window.views[last_selected_view].fallback_view_id)
+    {
+      last_selected_view = window.views[last_selected_view].fallback_view_id;
+    }
+    UI.get_instance().show_view(last_selected_view);
   };
 
   window.app.addListener('services-created', this.on_services_created.bind(this));
@@ -498,7 +515,15 @@ ui_framework.layouts.error_console_rough_layout =
       ]
     }
   ]
-};
+}
+
+ui_framework.layouts.profiler_rough_layout =
+{
+    dir: 'v',
+    width: 1000,
+    height: 1000,
+    children: [{ height: 1000, tabbar: { tabs: ["profiler_all"], is_hidden: true } }]
+}
 
 ui_framework.layouts.environment_rough_layout =
 {
@@ -657,6 +682,7 @@ ui_framework.layouts.main_layout =
       'network_mode',
       'resource_panel',
       'storage',
+      'profiler_mode',
       {view: 'console_mode', tab_class: ErrorConsoleTab},
       'utils',
       'console_panel'

src/console-logger/console.js

@@ -111,7 +111,13 @@ cls.ConsoleLogger.ErrorConsoleDataBase = function()
       topCell.disableTab(view_id, true);
     };
     this._update_views(true);
-  }
+  };
+
+  this._on_profile_disabled = function(msg)
+  {
+    if (msg.profile == window.app.profiles.DEFAULT)
+      this.clear_all();
+  };
 
   /**
    * Toggle an entry.
@@ -309,6 +315,7 @@ cls.ConsoleLogger.ErrorConsoleDataBase = function()
 
     window.messages.addListener("setting-changed", this._on_setting_change.bind(this));
     window.messages.addListener("debug-context-selected", this.clear_all.bind(this));
+    window.messages.addListener("profile-disabled", this._on_profile_disabled.bind(this));
 
     var logger = window.services["console-logger"];
     logger.add_listener("consolemessage", this._on_console_message.bind(this));
@@ -329,6 +336,12 @@ cls.ConsoleLogger["2.1"].ErrorConsoleData = function()
     services['console-logger'].requestListMessages(tag);
   };
 
+  this._on_profile_enabled = function(msg)
+  {
+    if (msg.profile == window.app.profiles.DEFAULT)
+      this._on_window_filter_change();
+  };
+
   this._on_list_messages = function(status, message)
   {
     const DATA = 0;
@@ -352,6 +365,7 @@ cls.ConsoleLogger["2.1"].ErrorConsoleData = function()
   this._init = function()
   {
     services["ecmascript-debugger"].addListener("window-filter-change", this._on_window_filter_change.bind(this));
+    window.messages.addListener("profile-enabled", this._on_profile_enabled.bind(this));
     this.init();
   }
   this._init();
@@ -377,6 +391,7 @@ var ErrorConsoleViewPrototype = function()
   this._render_timeout = 0;
   this._rendertime = 0;
   this.needs_instant_update = false;
+  this.required_services = ["console-logger"];
 
   this.createView = function(container)
   {
@@ -416,6 +431,11 @@ var ErrorConsoleViewPrototype = function()
     }
   };
 
+  this.create_disabled_view = function(container)
+  {
+    container.clearAndRender(window.templates.disabled_view());
+  };
+
   this._create_delayed = function()
   {
     this._render_timeout = 0;

src/cookie-manager/cookie_manager_data.js

@@ -156,6 +156,15 @@ cls.CookieManager.CookieDataBase = function()
     }
   };
 
+  this._on_profile_disabled = function(msg)
+  {
+    if (msg.profile == window.app.profiles.DEFAULT)
+    {
+      this.cookie_list = [];
+      this._rts = {};
+    }
+  };
+
   this._request_location_object_id = function(rt_id, active_tab_counter)
   {
     var script = "location";
@@ -342,6 +351,7 @@ cls.CookieManager.CookieDataBase = function()
     this._rts = {};
     this._active_tab_count = 0;
     window.messages.addListener('active-tab', this._on_active_tab.bind(this));
+    window.messages.addListener('profile-disabled', this._on_profile_disabled.bind(this));
   };
 };
 

src/cookie-manager/cookie_manager_views.js

@@ -15,6 +15,7 @@ cls.CookieManager.CookieManagerViewBase = function()
 
   this._init = function(id, name, container_class, data_reference)
   {
+    this.required_services = ["cookie-manager", "ecmascript-debugger"];
     this.init(id, name, container_class, null, "cookiemanager-container");
 
     this.shared_shortcuts = "storage";
@@ -192,6 +193,11 @@ cls.CookieManager.CookieManagerViewBase = function()
     window.messages.addListener("debug-context-selected", this._clear_container.bind(this));
   };
 
+  this.create_disabled_view = function(container)
+  {
+    container.clearAndRender(window.templates.disabled_view());
+  };
+
   this._make_sorter = function(prop)
   {
     return function(obj_a, obj_b) {