Title: [193458] branches/safari-601.1.46-branch/Source/_javascript_Core
Revision
193458
Author
[email protected]
Date
2015-12-04 12:54:16 -0800 (Fri, 04 Dec 2015)

Log Message

Merge r189415. rdar://problem/23581597

Modified Paths

Diff

Modified: branches/safari-601.1.46-branch/Source/_javascript_Core/ChangeLog (193457 => 193458)


--- branches/safari-601.1.46-branch/Source/_javascript_Core/ChangeLog	2015-12-04 20:54:12 UTC (rev 193457)
+++ branches/safari-601.1.46-branch/Source/_javascript_Core/ChangeLog	2015-12-04 20:54:16 UTC (rev 193458)
@@ -1,5 +1,23 @@
 2015-12-04  Timothy Hatcher  <[email protected]>
 
+        Merge r189415. rdar://problem/23581597
+
+    2015-09-04  Joseph Pecoraro  <[email protected]>
+
+            Web Inspector: Test Runtime.saveResult and $n values
+            https://bugs.webkit.org/show_bug.cgi?id=148837
+
+            Reviewed by Timothy Hatcher.
+
+            * inspector/InjectedScriptSource.js:
+            (InjectedScript.prototype._evaluateOn):
+            We don't need to be in the console object group to put the value
+            in the saved results list. That strong reference will ensure $n
+            values are always alive even if other object groups were used
+            when creating and subsequently released.
+
+2015-12-04  Timothy Hatcher  <[email protected]>
+
         Merge r188976. rdar://problem/23581597
 
     2015-08-26  Brian Burg  <[email protected]>

Modified: branches/safari-601.1.46-branch/Source/_javascript_Core/inspector/InjectedScriptSource.js (193457 => 193458)


--- branches/safari-601.1.46-branch/Source/_javascript_Core/inspector/InjectedScriptSource.js	2015-12-04 20:54:12 UTC (rev 193457)
+++ branches/safari-601.1.46-branch/Source/_javascript_Core/inspector/InjectedScriptSource.js	2015-12-04 20:54:16 UTC (rev 193458)
@@ -487,7 +487,7 @@
             var expressionFunction = evalFunction.call(object, boundExpressionFunctionString);
             var result = expressionFunction.apply(null, parameters);
 
-            if (objectGroup === "console" && saveResult)
+            if (saveResult)
                 this._saveResult(result);
 
             return result;
@@ -507,7 +507,7 @@
 
             var result = evalFunction.call(inspectedGlobalObject, _expression_);
 
-            if (objectGroup === "console" && saveResult)
+            if (saveResult)
                 this._saveResult(result);
 
             return result;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to