Title: [112102] trunk
- Revision
- 112102
- Author
- [email protected]
- Date
- 2012-03-26 08:30:20 -0700 (Mon, 26 Mar 2012)
Log Message
Web Inspector: 'use strict' exceptions stop in inspector code
https://bugs.webkit.org/show_bug.cgi?id=82199
Reviewed by Yury Semikhatsky.
Source/WebCore:
Accessing callee from within InjectedScript made inspector stop on handled exceptions.
I replaced it with Object.prototype.toString.call(obj) === "[object Arguments]".
* inspector/InjectedScriptSource.js:
LayoutTests:
* inspector/console/console-format-collections-expected.txt:
* inspector/console/console-format-collections.html:
* platform/chromium/inspector/console/console-format-collections-expected.txt:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (112101 => 112102)
--- trunk/LayoutTests/ChangeLog 2012-03-26 15:26:03 UTC (rev 112101)
+++ trunk/LayoutTests/ChangeLog 2012-03-26 15:30:20 UTC (rev 112102)
@@ -1,3 +1,14 @@
+2012-03-26 Pavel Feldman <[email protected]>
+
+ Web Inspector: 'use strict' exceptions stop in inspector code
+ https://bugs.webkit.org/show_bug.cgi?id=82199
+
+ Reviewed by Yury Semikhatsky.
+
+ * inspector/console/console-format-collections-expected.txt:
+ * inspector/console/console-format-collections.html:
+ * platform/chromium/inspector/console/console-format-collections-expected.txt:
+
2012-03-26 Mihai Balan <[email protected]>
[CSS Regions] In region styling (@-webkit-region) the position for CSS rules is incorrectly computed
Modified: trunk/LayoutTests/inspector/console/console-format-collections-expected.txt (112101 => 112102)
--- trunk/LayoutTests/inspector/console/console-format-collections-expected.txt 2012-03-26 15:26:03 UTC (rev 112101)
+++ trunk/LayoutTests/inspector/console/console-format-collections-expected.txt 2012-03-26 15:30:20 UTC (rev 112102)
@@ -6,6 +6,7 @@
CONSOLE MESSAGE: line 35: [object NodeList]
CONSOLE MESSAGE: line 41: 1,2,
CONSOLE MESSAGE: line 44: [object Object]
+CONSOLE MESSAGE: line 51: [object Arguments]
Tests that console nicely formats HTML Collections and NodeLists.
[<select id="sel" name="sel">…</select>] console-format-collections.html:15
@@ -18,4 +19,5 @@
[<input type="radio" name="x" value="x1">, <input type="radio" name="x" value="x2">] console-format-collections.html:35
[1, Array[2]] console-format-collections.html:41
NonArrayWithLength console-format-collections.html:44
+[1, "2"] console-format-collections.html:51
Modified: trunk/LayoutTests/inspector/console/console-format-collections.html (112101 => 112102)
--- trunk/LayoutTests/inspector/console/console-format-collections.html 2012-03-26 15:26:03 UTC (rev 112101)
+++ trunk/LayoutTests/inspector/console/console-format-collections.html 2012-03-26 15:30:20 UTC (rev 112102)
@@ -43,6 +43,12 @@
var nonArray = new NonArrayWithLength();
console.log(nonArray);
+ // Arguments
+ function generateArguments(foo, bar)
+ {
+ return arguments;
+ }
+ console.log(generateArguments(1, "2"));
runTest();
}
Modified: trunk/LayoutTests/platform/chromium/inspector/console/console-format-collections-expected.txt (112101 => 112102)
--- trunk/LayoutTests/platform/chromium/inspector/console/console-format-collections-expected.txt 2012-03-26 15:26:03 UTC (rev 112101)
+++ trunk/LayoutTests/platform/chromium/inspector/console/console-format-collections-expected.txt 2012-03-26 15:30:20 UTC (rev 112102)
@@ -6,6 +6,7 @@
CONSOLE MESSAGE: line 35: [object NodeList]
CONSOLE MESSAGE: line 41: 1,2,
CONSOLE MESSAGE: line 44: [object Object]
+CONSOLE MESSAGE: line 51: [object Arguments]
Tests that console nicely formats HTML Collections and NodeLists.
[<select id="sel" name="sel">…</select>] console-format-collections.html:15
@@ -18,4 +19,5 @@
[<input type="radio" name="x" value="x1">, <input type="radio" name="x" value="x2">] console-format-collections.html:35
[1, Array[2]] console-format-collections.html:41
NonArrayWithLength console-format-collections.html:44
+[1, "2"] console-format-collections.html:51
Modified: trunk/Source/WebCore/ChangeLog (112101 => 112102)
--- trunk/Source/WebCore/ChangeLog 2012-03-26 15:26:03 UTC (rev 112101)
+++ trunk/Source/WebCore/ChangeLog 2012-03-26 15:30:20 UTC (rev 112102)
@@ -1,3 +1,15 @@
+2012-03-26 Pavel Feldman <[email protected]>
+
+ Web Inspector: 'use strict' exceptions stop in inspector code
+ https://bugs.webkit.org/show_bug.cgi?id=82199
+
+ Reviewed by Yury Semikhatsky.
+
+ Accessing callee from within InjectedScript made inspector stop on handled exceptions.
+ I replaced it with Object.prototype.toString.call(obj) === "[object Arguments]".
+
+ * inspector/InjectedScriptSource.js:
+
2012-03-26 Mihai Balan <[email protected]>
[CSS Regions] In region styling (@-webkit-region) the position for CSS rules is incorrectly computed
Modified: trunk/Source/WebCore/inspector/InjectedScriptSource.js (112101 => 112102)
--- trunk/Source/WebCore/inspector/InjectedScriptSource.js 2012-03-26 15:26:03 UTC (rev 112101)
+++ trunk/Source/WebCore/inspector/InjectedScriptSource.js 2012-03-26 15:30:20 UTC (rev 112102)
@@ -424,7 +424,7 @@
try {
if (typeof obj.splice === "function" && isFinite(obj.length))
return "array";
- if (typeof obj.callee === "function" && isFinite(obj.length)) // arguments.
+ if (Object.prototype.toString.call(obj) === "[object Arguments]" && isFinite(obj.length)) // arguments.
return "array";
} catch (e) {
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
