Title: [158132] branches/safari-537.73-branch/LayoutTests
- Revision
- 158132
- Author
- [email protected]
- Date
- 2013-10-28 14:32:59 -0700 (Mon, 28 Oct 2013)
Log Message
Merge r155471.
https://bugs.webkit.org/show_bug.cgi?id=123409.
Missing files from previous merge commit for r155471.
* inspector-protocol/debugger/resources: Added.
* inspector-protocol/debugger/resources/exception.js: Added.
(exceptionBasic):
(exceptionDOM):
(throwString):
(throwParam):
(exceptionInHostFunction):
(catchNested):
(noException):
Modified Paths
Added Paths
Diff
Modified: branches/safari-537.73-branch/LayoutTests/ChangeLog (158131 => 158132)
--- branches/safari-537.73-branch/LayoutTests/ChangeLog 2013-10-28 21:27:30 UTC (rev 158131)
+++ branches/safari-537.73-branch/LayoutTests/ChangeLog 2013-10-28 21:32:59 UTC (rev 158132)
@@ -3,6 +3,23 @@
Merge r155471.
https://bugs.webkit.org/show_bug.cgi?id=123409.
+ Missing files from previous merge commit for r155471.
+
+ * inspector-protocol/debugger/resources: Added.
+ * inspector-protocol/debugger/resources/exception.js: Added.
+ (exceptionBasic):
+ (exceptionDOM):
+ (throwString):
+ (throwParam):
+ (exceptionInHostFunction):
+ (catchNested):
+ (noException):
+
+2013-10-28 Mark Lam <[email protected]>
+
+ Merge r155471.
+ https://bugs.webkit.org/show_bug.cgi?id=123409.
+
Reviewed by Geoffrey Garen.
Re-based test results from merge.
Added: branches/safari-537.73-branch/LayoutTests/inspector-protocol/debugger/resources/exception.js (0 => 158132)
--- branches/safari-537.73-branch/LayoutTests/inspector-protocol/debugger/resources/exception.js (rev 0)
+++ branches/safari-537.73-branch/LayoutTests/inspector-protocol/debugger/resources/exception.js 2013-10-28 21:32:59 UTC (rev 158132)
@@ -0,0 +1,46 @@
+function exceptionBasic()
+{
+ ({}).a.b.c.d;
+}
+
+function exceptionDOM()
+{
+ document.body.appendChild(0);
+}
+
+function throwString()
+{
+ throw "exception string";
+}
+
+function throwParam(o)
+{
+ throw o;
+}
+
+function exceptionInHostFunction()
+{
+ [1].map(function(x) {
+ throw "exception in host function";
+ });
+}
+
+function catchNested(func, depth /* optionalArgsToFunc... */)
+{
+ if (depth > 1) {
+ var args = Array.prototype.slice.call(arguments, 0);
+ --args[1];
+ catchNested.apply(this, args);
+ } else {
+ try {
+ func.apply(this, Array.prototype.slice.call(arguments, 2));
+ } catch (e) {
+ console.log("catchNested caught exception: " + JSON.stringify(e));
+ }
+ }
+}
+
+function noException()
+{
+ return "no exception";
+}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
