DevTools: Sort execution contexts in nested frames

third_party/WebKit/Source/devtools/front_end/sdk/RuntimeModel.js

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 27 matching lines @@
     WebInspector.SDKModel.call(this, WebInspector.RuntimeModel, target);
 
     this._agent = target.runtimeAgent();
     this.target().registerRuntimeDispatcher(new WebInspector.RuntimeDispatcher(this));
     if (target.hasJSContext())
         this._agent.enable();
     /**
      * @type {!Object.<number, !WebInspector.ExecutionContext>}
      */
     this._executionContextById = {};
+    this._executionContextComparator = WebInspector.ExecutionContext.comparator;

[pfeldman, 2016/07/09 02:02:09]

We can now remove the frameId-related logic from the default comparator.

[einbinder, 2016/07/11 18:40:14]

Done.

 
     if (WebInspector.moduleSetting("customFormatters").get())
         this._agent.setCustomObjectFormatterEnabled(true);
 
     WebInspector.moduleSetting("customFormatters").addChangeListener(this._customFormattersStateChanged.bind(this));
 }
 
 WebInspector.RuntimeModel.Events = {
     ExecutionContextCreated: "ExecutionContextCreated",
     ExecutionContextDestroyed: "ExecutionContextDestroyed",
     ExecutionContextChanged: "ExecutionContextChanged"
 }
 
 WebInspector.RuntimeModel._privateScript = "private script";
 
 WebInspector.RuntimeModel.prototype = {
 
     /**
      * @return {!Array.<!WebInspector.ExecutionContext>}
      */
     executionContexts: function()
     {
-        return Object.values(this._executionContextById);
+        return Object.values(this._executionContextById).sort(this.executionContextComparator());
     },
 
     /**
+     * @param {function(!WebInspector.ExecutionContext,!WebInspector.ExecutionContext)} comparator
+     */
+    setExecutionContextComparator: function(comparator)
+    {
+        this._executionContextComparator = comparator;
+    },
+
+    /**
+     * @return {function(!WebInspector.ExecutionContext,!WebInspector.ExecutionContext)} comparator
+     */
+    executionContextComparator: function()
+    {
+        return this._executionContextComparator;
+    },
+
+    /**
      * @return {?WebInspector.ExecutionContext}
      */
     defaultExecutionContext: function()
     {
         for (var context of Object.values(this._executionContextById)) {
             if (context.isDefault)
                 return context;
         }
         return null;
     },
@@ skipping 722 matching lines @@
     },
 
     /**
      * @return {!Promise<undefined>}
      */
     remove: function()
     {
         if (!this._removeFunction)
             return Promise.resolve();
         return this._removeFunction.callFunctionPromise(callCustomRemove, [
-                WebInspector.RemoteObject.toCallArgument(this._type),
-                WebInspector.RemoteObject.toCallArgument(this._originalHandler),
-                WebInspector.RemoteObject.toCallArgument(this._useCapture),
-                WebInspector.RemoteObject.toCallArgument(this._passive),
-            ]).then(() => undefined);
+            WebInspector.RemoteObject.toCallArgument(this._type),
+            WebInspector.RemoteObject.toCallArgument(this._originalHandler),
+            WebInspector.RemoteObject.toCallArgument(this._useCapture),
+            WebInspector.RemoteObject.toCallArgument(this._passive),
+        ]).then(() => undefined);
 
         /**
          * @param {string} type
          * @param {function()} listener
          * @param {boolean} useCapture
          * @param {boolean} passive
          * @this {Function}
          * @suppressReceiverCheck
          */
         function callCustomRemove(type, listener, useCapture, passive)
@@ skipping 65 matching lines @@
     /**
      * @return {boolean}
      */
     isNormalListenerType: function()
     {
         return this._listenerType === "normal";
     },
 
     __proto__: WebInspector.SDKObject.prototype
 }