<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[20029] trunk/WebKitTools</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/20029">20029</a></dd>
<dt>Author</dt> <dd>andersca</dd>
<dt>Date</dt> <dd>2007-03-07 14:30:43 -0800 (Wed, 07 Mar 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre> Reviewed by Adam.
Add some assertions.
* DumpRenderTree/DumpRenderTree.m:
(-[WaitUntilDoneDelegate webView:didStartProvisionalLoadForFrame:]):
(-[WaitUntilDoneDelegate webView:didCommitLoadForFrame:]):
(-[WaitUntilDoneDelegate webView:didFailProvisionalLoadWithError:forFrame:]):
(-[WaitUntilDoneDelegate webView:didFailLoadWithError:forFrame:]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebKitToolsChangeLog">trunk/WebKitTools/ChangeLog</a></li>
<li><a href="#trunkWebKitToolsDumpRenderTreeDumpRenderTreem">trunk/WebKitTools/DumpRenderTree/DumpRenderTree.m</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebKitToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/ChangeLog (20028 => 20029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/ChangeLog 2007-03-07 21:25:16 UTC (rev 20028)
+++ trunk/WebKitTools/ChangeLog 2007-03-07 22:30:43 UTC (rev 20029)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2007-03-07 Anders Carlsson <acarlsson@apple.com>
+
+ Reviewed by Adam.
+
+ Add some assertions.
+
+ * DumpRenderTree/DumpRenderTree.m:
+ (-[WaitUntilDoneDelegate webView:didStartProvisionalLoadForFrame:]):
+ (-[WaitUntilDoneDelegate webView:didCommitLoadForFrame:]):
+ (-[WaitUntilDoneDelegate webView:didFailProvisionalLoadWithError:forFrame:]):
+ (-[WaitUntilDoneDelegate webView:didFailLoadWithError:forFrame:]):
+
</ins><span class="cx"> 2007-03-07 David Kilzer <ddkilzer@webkit.org>
</span><span class="cx">
</span><span class="cx"> Reviewed by Darin.
</span></span></pre></div>
<a id="trunkWebKitToolsDumpRenderTreeDumpRenderTreem"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/DumpRenderTree/DumpRenderTree.m (20028 => 20029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/DumpRenderTree/DumpRenderTree.m 2007-03-07 21:25:16 UTC (rev 20028)
+++ trunk/WebKitTools/DumpRenderTree/DumpRenderTree.m 2007-03-07 22:30:43 UTC (rev 20029)
</span><span class="lines">@@ -61,6 +61,7 @@
</span><span class="cx"> #import <WebKit/WebPreferencesPrivate.h>
</span><span class="cx"> #import <WebKit/WebResourceLoadDelegate.h>
</span><span class="cx"> #import <WebKit/WebViewPrivate.h>
</span><ins>+#import <JavaScriptCore/Assertions.h>
</ins><span class="cx"> #import <getopt.h>
</span><span class="cx"> #import <malloc/malloc.h>
</span><span class="cx"> #import <objc/objc-runtime.h> // for class_poseAs
</span><span class="lines">@@ -836,6 +837,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)webView:(WebView *)sender didStartProvisionalLoadForFrame:(WebFrame *)f
</span><span class="cx"> {
</span><ins>+ ASSERT([f provisionalDataSource]);
</ins><span class="cx"> // Make sure we only set this once per test. If it gets cleared, and then set again, we might
</span><span class="cx"> // end up doing two dumps for one test.
</span><span class="cx"> if (!topLoadingFrame && !done)
</span><span class="lines">@@ -844,6 +846,9 @@
</span><span class="cx">
</span><span class="cx"> - (void)webView:(WebView *)sender didCommitLoadForFrame:(WebFrame *)f
</span><span class="cx"> {
</span><ins>+ ASSERT(![f provisionalDataSource]);
+ ASSERT([f dataSource]);
+
</ins><span class="cx"> windowIsKey = YES;
</span><span class="cx"> NSView *documentView = [[frame frameView] documentView];
</span><span class="cx"> [[[frame webView] window] makeFirstResponder:documentView];
</span><span class="lines">@@ -853,6 +858,8 @@
</span><span class="cx">
</span><span class="cx"> - (void)webView:(WebView *)sender didFailProvisionalLoadWithError:(NSError *)error forFrame:(WebFrame *)frame
</span><span class="cx"> {
</span><ins>+ ASSERT([frame provisionalDataSource]);
+
</ins><span class="cx"> [self webView:sender locationChangeDone:error forDataSource:[frame provisionalDataSource]];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -864,6 +871,9 @@
</span><span class="cx">
</span><span class="cx"> - (void)webView:(WebView *)sender didFailLoadWithError:(NSError *)error forFrame:(WebFrame *)frame
</span><span class="cx"> {
</span><ins>+ ASSERT(![frame provisionalDataSource]);
+ ASSERT([frame dataSource]);
+
</ins><span class="cx"> [self webView:sender locationChangeDone:error forDataSource:[frame dataSource]];
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>