Title: [200538] trunk/Source
Revision
200538
Author
[email protected]
Date
2016-05-06 22:44:40 -0700 (Fri, 06 May 2016)

Log Message

Web Inspector: Misc CommandLineAPI cleanup
https://bugs.webkit.org/show_bug.cgi?id=157450

Reviewed by Ryosuke Niwa.

Source/_javascript_Core:

* inspector/InjectedScriptSource.js:
(BasicCommandLineAPI):
Fix mistake in r200533, and modernize related code.

Source/WebCore:

* inspector/CommandLineAPIModuleSource.js:
(bind):

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (200537 => 200538)


--- trunk/Source/_javascript_Core/ChangeLog	2016-05-07 04:25:49 UTC (rev 200537)
+++ trunk/Source/_javascript_Core/ChangeLog	2016-05-07 05:44:40 UTC (rev 200538)
@@ -1,5 +1,16 @@
 2016-05-06  Joseph Pecoraro  <[email protected]>
 
+        Web Inspector: Misc CommandLineAPI cleanup
+        https://bugs.webkit.org/show_bug.cgi?id=157450
+
+        Reviewed by Ryosuke Niwa.
+
+        * inspector/InjectedScriptSource.js:
+        (BasicCommandLineAPI):
+        Fix mistake in r200533, and modernize related code.
+
+2016-05-06  Joseph Pecoraro  <[email protected]>
+
         Web Inspector: Improve console.count()
         https://bugs.webkit.org/show_bug.cgi?id=157439
         <rdar://problem/26152654>

Modified: trunk/Source/_javascript_Core/inspector/InjectedScriptSource.js (200537 => 200538)


--- trunk/Source/_javascript_Core/inspector/InjectedScriptSource.js	2016-05-07 04:25:49 UTC (rev 200537)
+++ trunk/Source/_javascript_Core/inspector/InjectedScriptSource.js	2016-05-07 05:44:40 UTC (rev 200538)
@@ -1374,33 +1374,24 @@
 }
 
 
-function slice(array, index)
+function bind(func, thisObject, ...outerArgs)
 {
-    var result = [];
-    for (var i = index || 0; i < array.length; ++i)
-        result.push(array[i]);
-    return result;
+    return function(...innerArgs) {
+        return func.apply(thisObject, outerArgs.concat(innerArgs));
+    };
 }
 
-function bind(func, thisObject, var_args)
-{
-    var args = slice(arguments, 2);
-    return function(var_args) {
-        return func.apply(thisObject, args.concat(slice(arguments)));
-    }
-}
-
 function BasicCommandLineAPI(callFrame)
 {
     this.$_ = injectedScript._lastResult;
     this.$exception = injectedScript._exceptionValue;
 
     // $1-$99
-    for (var i = 1; i <= injectedScript._savedResults.length; ++i)
+    for (let i = 1; i <= injectedScript._savedResults.length; ++i)
         this.__defineGetter__("$" + i, bind(injectedScript._savedResult, injectedScript, i));
 
     // Command Line API methods.
-    for (var i = 0; i < BasicCommandLineAPI.methods.length; ++i)
+    for (let method of BasicCommandLineAPI.methods)
         this[method.name] = method;
 }
 
@@ -1413,8 +1404,8 @@
 
     function keys(object) { return Object.keys(object); },
     function values(object) {
-        var result = [];
-        for (var key in object)
+        let result = [];
+        for (let key in object)
             result.push(object[key]);
         return result;
     },

Modified: trunk/Source/WebCore/ChangeLog (200537 => 200538)


--- trunk/Source/WebCore/ChangeLog	2016-05-07 04:25:49 UTC (rev 200537)
+++ trunk/Source/WebCore/ChangeLog	2016-05-07 05:44:40 UTC (rev 200538)
@@ -1,3 +1,13 @@
+2016-05-06  Joseph Pecoraro  <[email protected]>
+
+        Web Inspector: Misc CommandLineAPI cleanup
+        https://bugs.webkit.org/show_bug.cgi?id=157450
+
+        Reviewed by Ryosuke Niwa.
+
+        * inspector/CommandLineAPIModuleSource.js:
+        (bind):
+
 2016-05-06  Simon Fraser  <[email protected]>
 
         Enable IOS_TEXT_AUTOSIZING on Mac and make it testable

Modified: trunk/Source/WebCore/inspector/CommandLineAPIModuleSource.js (200537 => 200538)


--- trunk/Source/WebCore/inspector/CommandLineAPIModuleSource.js	2016-05-07 04:25:49 UTC (rev 200537)
+++ trunk/Source/WebCore/inspector/CommandLineAPIModuleSource.js	2016-05-07 05:44:40 UTC (rev 200538)
@@ -43,7 +43,7 @@
 {
     return function(...innerArgs) {
         return func.apply(thisObject, outerArgs.concat(innerArgs));
-    }
+    };
 }
 
 /**
@@ -60,7 +60,7 @@
     this.__defineGetter__("$0", bind(commandLineAPIImpl._inspectedObject, commandLineAPIImpl));
 
     // $1-$99
-    for (var i = 1; i <= injectedScript._savedResults.length; ++i)
+    for (let i = 1; i <= injectedScript._savedResults.length; ++i)
         this.__defineGetter__("$" + i, bind(injectedScript._savedResult, injectedScript, i));
 
     // Command Line API methods.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to