[prev in list] [next in list] [prev in thread] [next in thread]
List: webkit-changes
Subject: [webkit-changes] [158132] branches/safari-537.73-branch/LayoutTests
From: mark.lam () apple ! com
Date: 2013-10-28 21:32:59
Message-ID: 20131028213259.AB36D3038FD () svn ! webkit ! org
[Download RAW message or body]
[Attachment #2 (text/html)]
<!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>[158132] branches/safari-537.73-branch/LayoutTests</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/158132">158132</a></dd> \
<dt>Author</dt> <dd>mark.lam@apple.com</dd> <dt>Date</dt> <dd>2013-10-28 14:32:59 \
-0700 (Mon, 28 Oct 2013)</dd> </dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/155471">r155471</a>.
https://bugs.webkit.org/show_bug.cgi?id=123409.
Missing files from previous merge commit for <a \
href="http://trac.webkit.org/projects/webkit/changeset/155471">r155471</a>.
* inspector-protocol/debugger/resources: Added.
* inspector-protocol/debugger/resources/exception.js: Added.
(exceptionBasic):
(exceptionDOM):
(throwString):
(throwParam):
(exceptionInHostFunction):
(catchNested):
(noException):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari53773branchLayoutTestsChangeLog">branches/safari-537.73-branch/LayoutTests/ChangeLog</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>branches/safari-537.73-branch/LayoutTests/inspector-protocol/debugger/resources/</li>
<li><a href="#branchessafari53773branchLayoutTestsinspectorprotocoldebuggerresourcese \
xceptionjs">branches/safari-537.73-branch/LayoutTests/inspector-protocol/debugger/resources/exception.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari53773branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: \
branches/safari-537.73-branch/LayoutTests/ChangeLog (158131 => 158132)</h4> <pre \
class="diff"><span> <span class="info">--- \
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) </span><span class="lines">@@ -3,6 +3,23 @@
</span><span class="cx"> Merge r155471.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=123409.
</span><span class="cx">
</span><ins>+ 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 <mark.lam@apple.com>
+
+ Merge r155471.
+ https://bugs.webkit.org/show_bug.cgi?id=123409.
+
</ins><span class="cx"> Reviewed by Geoffrey Garen.
</span><span class="cx">
</span><span class="cx"> Re-based test results from merge.
</span></span></pre></div>
<a id="branchessafari53773branchLayoutTestsinspectorprotocoldebuggerresourcesexceptionjs"></a>
<div class="addfile"><h4>Added: \
branches/safari-537.73-branch/LayoutTests/inspector-protocol/debugger/resources/exception.js \
(0 => 158132)</h4> <pre class="diff"><span>
<span class="info">--- \
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) </span><span class="lines">@@ -0,0 +1,46 @@
</span><ins>+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";
+}
</ins></span></pre>
</div>
</div>
</body>
</html>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic