<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[185741] trunk</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/185741">185741</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-06-19 01:05:54 -0700 (Fri, 19 Jun 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Web Inspector: Avoid getOwnPropertyNames/Symbols on very large lists
https://bugs.webkit.org/show_bug.cgi?id=146141

Patch by Joseph Pecoraro &lt;pecoraro@apple.com&gt; on 2015-06-19
Reviewed by Timothy Hatcher.

Source/JavaScriptCore:

* inspector/InjectedScriptSource.js:
(InjectedScript.prototype._propertyDescriptors):
Avoid calling getOwnPropertyNames/Symbols on very large lists. Instead
just generate property descriptors for the first 100 indexes. Note
this would behave poorly for sparse arrays with a length &gt; 100, but
general support for lists with more than 100 elements is poor. See:
&lt;https://webkit.org/b/143589&gt; Web Inspector: Better handling for large collections in Object Trees

Source/WebInspectorUI:

* UserInterface/Controllers/JavaScriptRuntimeCompletionProvider.js:
(WebInspector.JavaScriptRuntimeCompletionProvider.prototype.completionControllerCompletionsNeeded):
When building completions for a large array, instead of building a list of all the indices
just send a single number back to the frontend and let it generate a list for completion.
We should do even better and avoid building a lookup table here for completion of an index.

LayoutTests:

* inspector/model/remote-object-expected.txt:
* inspector/model/remote-object.html:
There were existing progressions (0 =&gt; -1).
There were existing regressions (RegExp properties moving to prototype with descriptors on the prototype).
Add a test for a very large list that would have caused out of memory / hang.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsinspectormodelremoteobjectexpectedtxt">trunk/LayoutTests/inspector/model/remote-object-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectormodelremoteobjecthtml">trunk/LayoutTests/inspector/model/remote-object.html</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorInjectedScriptSourcejs">trunk/Source/JavaScriptCore/inspector/InjectedScriptSource.js</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceControllersJavaScriptRuntimeCompletionProviderjs">trunk/Source/WebInspectorUI/UserInterface/Controllers/JavaScriptRuntimeCompletionProvider.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (185740 => 185741)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2015-06-19 07:58:54 UTC (rev 185740)
+++ trunk/LayoutTests/ChangeLog        2015-06-19 08:05:54 UTC (rev 185741)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-06-19  Joseph Pecoraro  &lt;pecoraro@apple.com&gt;
+
+        Web Inspector: Avoid getOwnPropertyNames/Symbols on very large lists
+        https://bugs.webkit.org/show_bug.cgi?id=146141
+
+        Reviewed by Timothy Hatcher.
+
+        * inspector/model/remote-object-expected.txt:
+        * inspector/model/remote-object.html:
+        There were existing progressions (0 =&gt; -1).
+        There were existing regressions (RegExp properties moving to prototype with descriptors on the prototype).
+        Add a test for a very large list that would have caused out of memory / hang.
+
</ins><span class="cx"> 2015-06-18  Gyuyoung Kim  &lt;gyuyoung.kim@webkit.org&gt;
</span><span class="cx"> 
</span><span class="cx">         [EFL] Unreviewed, gardening on June 19th.
</span></span></pre></div>
<a id="trunkLayoutTestsinspectormodelremoteobjectexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/model/remote-object-expected.txt (185740 => 185741)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/model/remote-object-expected.txt        2015-06-19 07:58:54 UTC (rev 185740)
+++ trunk/LayoutTests/inspector/model/remote-object-expected.txt        2015-06-19 08:05:54 UTC (rev 185741)
</span><span class="lines">@@ -273,26 +273,6 @@
</span><span class="cx">         &quot;_name&quot;: &quot;lastIndex&quot;,
</span><span class="cx">         &quot;_type&quot;: &quot;number&quot;,
</span><span class="cx">         &quot;_value&quot;: &quot;0&quot;
</span><del>-      },
-      {
-        &quot;_name&quot;: &quot;global&quot;,
-        &quot;_type&quot;: &quot;boolean&quot;,
-        &quot;_value&quot;: &quot;false&quot;
-      },
-      {
-        &quot;_name&quot;: &quot;ignoreCase&quot;,
-        &quot;_type&quot;: &quot;boolean&quot;,
-        &quot;_value&quot;: &quot;false&quot;
-      },
-      {
-        &quot;_name&quot;: &quot;multiline&quot;,
-        &quot;_type&quot;: &quot;boolean&quot;,
-        &quot;_value&quot;: &quot;false&quot;
-      },
-      {
-        &quot;_name&quot;: &quot;source&quot;,
-        &quot;_type&quot;: &quot;string&quot;,
-        &quot;_value&quot;: &quot; &quot;
</del><span class="cx">       }
</span><span class="cx">     ],
</span><span class="cx">     &quot;_entries&quot;: null
</span><span class="lines">@@ -317,26 +297,6 @@
</span><span class="cx">         &quot;_name&quot;: &quot;lastIndex&quot;,
</span><span class="cx">         &quot;_type&quot;: &quot;number&quot;,
</span><span class="cx">         &quot;_value&quot;: &quot;0&quot;
</span><del>-      },
-      {
-        &quot;_name&quot;: &quot;global&quot;,
-        &quot;_type&quot;: &quot;boolean&quot;,
-        &quot;_value&quot;: &quot;false&quot;
-      },
-      {
-        &quot;_name&quot;: &quot;ignoreCase&quot;,
-        &quot;_type&quot;: &quot;boolean&quot;,
-        &quot;_value&quot;: &quot;false&quot;
-      },
-      {
-        &quot;_name&quot;: &quot;multiline&quot;,
-        &quot;_type&quot;: &quot;boolean&quot;,
-        &quot;_value&quot;: &quot;false&quot;
-      },
-      {
-        &quot;_name&quot;: &quot;source&quot;,
-        &quot;_type&quot;: &quot;string&quot;,
-        &quot;_value&quot;: &quot;(?:)&quot;
</del><span class="cx">       }
</span><span class="cx">     ],
</span><span class="cx">     &quot;_entries&quot;: null
</span><span class="lines">@@ -361,26 +321,6 @@
</span><span class="cx">         &quot;_name&quot;: &quot;lastIndex&quot;,
</span><span class="cx">         &quot;_type&quot;: &quot;number&quot;,
</span><span class="cx">         &quot;_value&quot;: &quot;0&quot;
</span><del>-      },
-      {
-        &quot;_name&quot;: &quot;global&quot;,
-        &quot;_type&quot;: &quot;boolean&quot;,
-        &quot;_value&quot;: &quot;false&quot;
-      },
-      {
-        &quot;_name&quot;: &quot;ignoreCase&quot;,
-        &quot;_type&quot;: &quot;boolean&quot;,
-        &quot;_value&quot;: &quot;false&quot;
-      },
-      {
-        &quot;_name&quot;: &quot;multiline&quot;,
-        &quot;_type&quot;: &quot;boolean&quot;,
-        &quot;_value&quot;: &quot;false&quot;
-      },
-      {
-        &quot;_name&quot;: &quot;source&quot;,
-        &quot;_type&quot;: &quot;string&quot;,
-        &quot;_value&quot;: &quot;^r(e)g[e]{1,}x+&quot;
</del><span class="cx">       }
</span><span class="cx">     ],
</span><span class="cx">     &quot;_entries&quot;: null
</span><span class="lines">@@ -405,26 +345,6 @@
</span><span class="cx">         &quot;_name&quot;: &quot;lastIndex&quot;,
</span><span class="cx">         &quot;_type&quot;: &quot;number&quot;,
</span><span class="cx">         &quot;_value&quot;: &quot;0&quot;
</span><del>-      },
-      {
-        &quot;_name&quot;: &quot;global&quot;,
-        &quot;_type&quot;: &quot;boolean&quot;,
-        &quot;_value&quot;: &quot;true&quot;
-      },
-      {
-        &quot;_name&quot;: &quot;ignoreCase&quot;,
-        &quot;_type&quot;: &quot;boolean&quot;,
-        &quot;_value&quot;: &quot;true&quot;
-      },
-      {
-        &quot;_name&quot;: &quot;multiline&quot;,
-        &quot;_type&quot;: &quot;boolean&quot;,
-        &quot;_value&quot;: &quot;false&quot;
-      },
-      {
-        &quot;_name&quot;: &quot;source&quot;,
-        &quot;_type&quot;: &quot;string&quot;,
-        &quot;_value&quot;: &quot;^r(e)g[e]{1,}x+&quot;
</del><span class="cx">       }
</span><span class="cx">     ],
</span><span class="cx">     &quot;_entries&quot;: null
</span><span class="lines">@@ -449,26 +369,6 @@
</span><span class="cx">         &quot;_name&quot;: &quot;lastIndex&quot;,
</span><span class="cx">         &quot;_type&quot;: &quot;number&quot;,
</span><span class="cx">         &quot;_value&quot;: &quot;0&quot;
</span><del>-      },
-      {
-        &quot;_name&quot;: &quot;global&quot;,
-        &quot;_type&quot;: &quot;boolean&quot;,
-        &quot;_value&quot;: &quot;false&quot;
-      },
-      {
-        &quot;_name&quot;: &quot;ignoreCase&quot;,
-        &quot;_type&quot;: &quot;boolean&quot;,
-        &quot;_value&quot;: &quot;false&quot;
-      },
-      {
-        &quot;_name&quot;: &quot;multiline&quot;,
-        &quot;_type&quot;: &quot;boolean&quot;,
-        &quot;_value&quot;: &quot;false&quot;
-      },
-      {
-        &quot;_name&quot;: &quot;source&quot;,
-        &quot;_type&quot;: &quot;string&quot;,
-        &quot;_value&quot;: &quot;(?:)&quot;
</del><span class="cx">       }
</span><span class="cx">     ],
</span><span class="cx">     &quot;_entries&quot;: null
</span><span class="lines">@@ -493,26 +393,6 @@
</span><span class="cx">         &quot;_name&quot;: &quot;lastIndex&quot;,
</span><span class="cx">         &quot;_type&quot;: &quot;number&quot;,
</span><span class="cx">         &quot;_value&quot;: &quot;0&quot;
</span><del>-      },
-      {
-        &quot;_name&quot;: &quot;global&quot;,
-        &quot;_type&quot;: &quot;boolean&quot;,
-        &quot;_value&quot;: &quot;false&quot;
-      },
-      {
-        &quot;_name&quot;: &quot;ignoreCase&quot;,
-        &quot;_type&quot;: &quot;boolean&quot;,
-        &quot;_value&quot;: &quot;true&quot;
-      },
-      {
-        &quot;_name&quot;: &quot;multiline&quot;,
-        &quot;_type&quot;: &quot;boolean&quot;,
-        &quot;_value&quot;: &quot;false&quot;
-      },
-      {
-        &quot;_name&quot;: &quot;source&quot;,
-        &quot;_type&quot;: &quot;string&quot;,
-        &quot;_value&quot;: &quot;test&quot;
</del><span class="cx">       }
</span><span class="cx">     ],
</span><span class="cx">     &quot;_entries&quot;: null
</span><span class="lines">@@ -563,7 +443,7 @@
</span><span class="cx">       {
</span><span class="cx">         &quot;_name&quot;: &quot;1&quot;,
</span><span class="cx">         &quot;_type&quot;: &quot;number&quot;,
</span><del>-        &quot;_value&quot;: &quot;0&quot;
</del><ins>+        &quot;_value&quot;: &quot;-0&quot;
</ins><span class="cx">       },
</span><span class="cx">       {
</span><span class="cx">         &quot;_name&quot;: &quot;2&quot;,
</span><span class="lines">@@ -1199,6 +1079,77 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> -----------------------------------------------------
</span><ins>+EXPRESSION: var buffer = new ArrayBuffer(10000000); var int8View = new Int8Array(buffer); int8View
+{
+  &quot;_type&quot;: &quot;object&quot;,
+  &quot;_subtype&quot;: &quot;array&quot;,
+  &quot;_objectId&quot;: &quot;&lt;filtered&gt;&quot;,
+  &quot;_description&quot;: &quot;Int8Array&quot;,
+  &quot;_size&quot;: 10000000,
+  &quot;_preview&quot;: {
+    &quot;_type&quot;: &quot;object&quot;,
+    &quot;_subtype&quot;: &quot;array&quot;,
+    &quot;_description&quot;: &quot;Int8Array&quot;,
+    &quot;_lossless&quot;: false,
+    &quot;_overflow&quot;: true,
+    &quot;_size&quot;: 10000000,
+    &quot;_properties&quot;: [
+      {
+        &quot;_name&quot;: &quot;0&quot;,
+        &quot;_type&quot;: &quot;number&quot;,
+        &quot;_value&quot;: &quot;0&quot;
+      },
+      {
+        &quot;_name&quot;: &quot;1&quot;,
+        &quot;_type&quot;: &quot;number&quot;,
+        &quot;_value&quot;: &quot;0&quot;
+      },
+      {
+        &quot;_name&quot;: &quot;2&quot;,
+        &quot;_type&quot;: &quot;number&quot;,
+        &quot;_value&quot;: &quot;0&quot;
+      },
+      {
+        &quot;_name&quot;: &quot;3&quot;,
+        &quot;_type&quot;: &quot;number&quot;,
+        &quot;_value&quot;: &quot;0&quot;
+      },
+      {
+        &quot;_name&quot;: &quot;4&quot;,
+        &quot;_type&quot;: &quot;number&quot;,
+        &quot;_value&quot;: &quot;0&quot;
+      },
+      {
+        &quot;_name&quot;: &quot;5&quot;,
+        &quot;_type&quot;: &quot;number&quot;,
+        &quot;_value&quot;: &quot;0&quot;
+      },
+      {
+        &quot;_name&quot;: &quot;6&quot;,
+        &quot;_type&quot;: &quot;number&quot;,
+        &quot;_value&quot;: &quot;0&quot;
+      },
+      {
+        &quot;_name&quot;: &quot;7&quot;,
+        &quot;_type&quot;: &quot;number&quot;,
+        &quot;_value&quot;: &quot;0&quot;
+      },
+      {
+        &quot;_name&quot;: &quot;8&quot;,
+        &quot;_type&quot;: &quot;number&quot;,
+        &quot;_value&quot;: &quot;0&quot;
+      },
+      {
+        &quot;_name&quot;: &quot;9&quot;,
+        &quot;_type&quot;: &quot;number&quot;,
+        &quot;_value&quot;: &quot;0&quot;
+      }
+    ],
+    &quot;_entries&quot;: null
+  }
+}
+
+-----------------------------------------------------
</ins><span class="cx"> EXPRESSION: ({})
</span><span class="cx"> {
</span><span class="cx">   &quot;_type&quot;: &quot;object&quot;,
</span><span class="lines">@@ -1261,7 +1212,7 @@
</span><span class="cx">       {
</span><span class="cx">         &quot;_name&quot;: &quot;c&quot;,
</span><span class="cx">         &quot;_type&quot;: &quot;number&quot;,
</span><del>-        &quot;_value&quot;: &quot;0&quot;
</del><ins>+        &quot;_value&quot;: &quot;-0&quot;
</ins><span class="cx">       }
</span><span class="cx">     ],
</span><span class="cx">     &quot;_entries&quot;: null
</span></span></pre></div>
<a id="trunkLayoutTestsinspectormodelremoteobjecthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/model/remote-object.html (185740 => 185741)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/model/remote-object.html        2015-06-19 07:58:54 UTC (rev 185740)
+++ trunk/LayoutTests/inspector/model/remote-object.html        2015-06-19 08:05:54 UTC (rev 185741)
</span><span class="lines">@@ -87,6 +87,7 @@
</span><span class="cx">         {expression: &quot;a = null; (function() { a = arguments; })(1, '2', /3/); a&quot;},
</span><span class="cx">         {expression: &quot;new Int32Array(new ArrayBuffer(16))&quot;},
</span><span class="cx">         {expression: &quot;var intArray = new Int32Array(new ArrayBuffer(16)); for (var i = 0; i &lt; intArray.length; ++i) intArray[i] = i; intArray&quot;},
</span><ins>+        {expression: &quot;var buffer = new ArrayBuffer(10000000); var int8View = new Int8Array(buffer); int8View&quot;}, // 10000000 elements.
</ins><span class="cx"> 
</span><span class="cx">         // Object
</span><span class="cx">         {expression: &quot;({})&quot;},
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (185740 => 185741)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog        2015-06-19 07:58:54 UTC (rev 185740)
+++ trunk/Source/JavaScriptCore/ChangeLog        2015-06-19 08:05:54 UTC (rev 185741)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-06-19  Joseph Pecoraro  &lt;pecoraro@apple.com&gt;
+
+        Web Inspector: Avoid getOwnPropertyNames/Symbols on very large lists
+        https://bugs.webkit.org/show_bug.cgi?id=146141
+
+        Reviewed by Timothy Hatcher.
+
+        * inspector/InjectedScriptSource.js:
+        (InjectedScript.prototype._propertyDescriptors):
+        Avoid calling getOwnPropertyNames/Symbols on very large lists. Instead
+        just generate property descriptors for the first 100 indexes. Note
+        this would behave poorly for sparse arrays with a length &gt; 100, but
+        general support for lists with more than 100 elements is poor. See:
+        &lt;https://webkit.org/b/143589&gt; Web Inspector: Better handling for large collections in Object Trees
+
</ins><span class="cx"> 2015-06-18  Yusuke Suzuki  &lt;utatane.tea@gmail.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [DFG] Avoid OSR exit in the middle of string concatenation
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorInjectedScriptSourcejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/InjectedScriptSource.js (185740 => 185741)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/InjectedScriptSource.js        2015-06-19 07:58:54 UTC (rev 185740)
+++ trunk/Source/JavaScriptCore/inspector/InjectedScriptSource.js        2015-06-19 08:05:54 UTC (rev 185741)
</span><span class="lines">@@ -698,12 +698,34 @@
</span><span class="cx">             }
</span><span class="cx">         }
</span><span class="cx"> 
</span><del>-        // Iterate prototype chain.
</del><ins>+        function arrayIndexPropertyNames(o, length)
+        {
+            var array = new Array(length);
+            for (var i = 0; i &lt; length; ++i) {
+                if (i in o)
+                    array.push(&quot;&quot; + i);
+            }
+            return array;
+        }
+
+        // FIXME: &lt;https://webkit.org/b/143589&gt; Web Inspector: Better handling for large collections in Object Trees
+        // For array types with a large length we attempt to skip getOwnPropertyNames and instead just sublist of indexes.
+        var isArrayTypeWithLargeLength = false;
+        try {
+            isArrayTypeWithLargeLength = injectedScript._subtype(object) === &quot;array&quot; &amp;&amp; isFinite(object.length) &amp;&amp; object.length &gt; 100;
+        } catch(e) {}
+
</ins><span class="cx">         for (var o = object; this._isDefined(o); o = o.__proto__) {
</span><span class="cx">             var isOwnProperty = o === object;
</span><del>-            processProperties(o, Object.getOwnPropertyNames(o), isOwnProperty);
-            if (Object.getOwnPropertySymbols)
-                processProperties(o, Object.getOwnPropertySymbols(o), isOwnProperty);
</del><ins>+
+            if (isArrayTypeWithLargeLength &amp;&amp; isOwnProperty)
+                processProperties(o, arrayIndexPropertyNames(o, 100), isOwnProperty);
+            else {
+                processProperties(o, Object.getOwnPropertyNames(o), isOwnProperty);
+                if (Object.getOwnPropertySymbols)
+                    processProperties(o, Object.getOwnPropertySymbols(o), isOwnProperty);
+            }
+
</ins><span class="cx">             if (collectionMode === InjectedScript.CollectionMode.OwnProperties)
</span><span class="cx">                 break;
</span><span class="cx">         }
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (185740 => 185741)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog        2015-06-19 07:58:54 UTC (rev 185740)
+++ trunk/Source/WebInspectorUI/ChangeLog        2015-06-19 08:05:54 UTC (rev 185741)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-06-19  Joseph Pecoraro  &lt;pecoraro@apple.com&gt;
+
+        Web Inspector: Avoid getOwnPropertyNames/Symbols on very large lists
+        https://bugs.webkit.org/show_bug.cgi?id=146141
+
+        Reviewed by Timothy Hatcher.
+
+        * UserInterface/Controllers/JavaScriptRuntimeCompletionProvider.js:
+        (WebInspector.JavaScriptRuntimeCompletionProvider.prototype.completionControllerCompletionsNeeded):
+        When building completions for a large array, instead of building a list of all the indices
+        just send a single number back to the frontend and let it generate a list for completion.
+        We should do even better and avoid building a lookup table here for completion of an index.
+
</ins><span class="cx"> 2015-06-18  Matt Baker  &lt;mattbaker@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Web Inspector: Rendering Frames timeline selection should snap to frame boundaries
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceControllersJavaScriptRuntimeCompletionProviderjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/JavaScriptRuntimeCompletionProvider.js (185740 => 185741)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Controllers/JavaScriptRuntimeCompletionProvider.js        2015-06-19 07:58:54 UTC (rev 185740)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/JavaScriptRuntimeCompletionProvider.js        2015-06-19 08:05:54 UTC (rev 185741)
</span><span class="lines">@@ -125,6 +125,34 @@
</span><span class="cx">                 return;
</span><span class="cx">             }
</span><span class="cx"> 
</span><ins>+            function getArrayCompletions(primitiveType)
+            {
+                var array = this;
+                var arrayLength;
+
+                var resultSet = {};
+                for (var o = array; o; o = o.__proto__) {
+                    try {
+                        if (o === array &amp;&amp; o.length) {
+                            // If the array type has a length, don't include a list of all the indexes.
+                            // Include it at the end and the frontend can build the list.
+                            arrayLength = o.length;
+                        } else {
+                            var names = Object.getOwnPropertyNames(o);
+                            for (var i = 0; i &lt; names.length; ++i)
+                                resultSet[names[i]] = true;
+                        }
+                    } catch (e) {
+                        // Ignore
+                    }
+                }
+
+                if (arrayLength)
+                    resultSet[&quot;length&quot;] = arrayLength;
+
+                return resultSet;
+            }
+
</ins><span class="cx">             function getCompletions(primitiveType)
</span><span class="cx">             {
</span><span class="cx">                 var object;
</span><span class="lines">@@ -151,7 +179,9 @@
</span><span class="cx">                 return resultSet;
</span><span class="cx">             }
</span><span class="cx"> 
</span><del>-            if (result.type === &quot;object&quot; || result.type === &quot;function&quot;)
</del><ins>+            if (result.subtype === &quot;array&quot;)
+                result.callFunctionJSON(getArrayCompletions, undefined, receivedArrayPropertyNames.bind(this));
+            else if (result.type === &quot;object&quot; || result.type === &quot;function&quot;)
</ins><span class="cx">                 result.callFunctionJSON(getCompletions, undefined, receivedPropertyNames.bind(this));
</span><span class="cx">             else if (result.type === &quot;string&quot; || result.type === &quot;number&quot; || result.type === &quot;boolean&quot;)
</span><span class="cx">                 WebInspector.runtimeManager.evaluateInInspectedWindow(&quot;(&quot; + getCompletions + &quot;)(\&quot;&quot; + result.type + &quot;\&quot;)&quot;, &quot;completion&quot;, false, true, true, false, false, receivedPropertyNamesFromEvaluate.bind(this));
</span><span class="lines">@@ -164,6 +194,20 @@
</span><span class="cx">             receivedPropertyNames.call(this, result &amp;&amp; !wasThrown ? result.value : null);
</span><span class="cx">         }
</span><span class="cx"> 
</span><ins>+        function receivedArrayPropertyNames(propertyNames)
+        {
+            // FIXME: &lt;https://webkit.org/b/143589&gt; Web Inspector: Better handling for large collections in Object Trees
+            // If there was an array like object, we generate autocompletion up to 1000 indexes, but this should
+            // handle a list with arbitrary length.
+            if (propertyNames &amp;&amp; typeof propertyNames.length === &quot;number&quot;) {
+                var max = Math.min(propertyNames.length, 1000);
+                for (var i = 0; i &lt; max; ++i)
+                    propertyNames[i] = true;
+            }
+
+            receivedPropertyNames.call(this, propertyNames);
+        }
+
</ins><span class="cx">         function receivedPropertyNames(propertyNames)
</span><span class="cx">         {
</span><span class="cx">             propertyNames = propertyNames || {};
</span></span></pre>
</div>
</div>

</body>
</html>