<!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>[168361] trunk/Tools</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/168361">168361</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2014-05-06 09:19:22 -0700 (Tue, 06 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Try to fix iOS build.
* DumpRenderTree/mac/TestRunnerMac.mm:
(-[APITestDelegateIPhone initWithTestRunner:utf8Data:baseURL:]):
Updated since I changed testRunner into a pointer instead of a reference.
Updated argument names to avoid conflict with field names.
(-[APITestDelegateIPhone run]): Ditto.
(-[APITestDelegateIPhone _cleanUp]): Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreemacTestRunnerMacmm">trunk/Tools/DumpRenderTree/mac/TestRunnerMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (168360 => 168361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-05-06 16:17:19 UTC (rev 168360)
+++ trunk/Tools/ChangeLog 2014-05-06 16:19:22 UTC (rev 168361)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-05-06 Darin Adler <darin@apple.com>
+
+ Try to fix iOS build.
+
+ * DumpRenderTree/mac/TestRunnerMac.mm:
+ (-[APITestDelegateIPhone initWithTestRunner:utf8Data:baseURL:]):
+ Updated since I changed testRunner into a pointer instead of a reference.
+ Updated argument names to avoid conflict with field names.
+ (-[APITestDelegateIPhone run]): Ditto.
+ (-[APITestDelegateIPhone _cleanUp]): Ditto.
+
</ins><span class="cx"> 2014-05-06 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r168304.
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacTestRunnerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/TestRunnerMac.mm (168360 => 168361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/TestRunnerMac.mm 2014-05-06 16:17:19 UTC (rev 168360)
+++ trunk/Tools/DumpRenderTree/mac/TestRunnerMac.mm 2014-05-06 16:19:22 UTC (rev 168361)
</span><span class="lines">@@ -925,7 +925,7 @@
</span><span class="cx">
</span><span class="cx"> @interface APITestDelegateIPhone : NSObject
</span><span class="cx"> {
</span><del>- TestRunner& testRunner;
</del><ins>+ TestRunner* testRunner;
</ins><span class="cx"> NSData *data;
</span><span class="cx"> NSURL *baseURL;
</span><span class="cx"> WebView *webView;
</span><span class="lines">@@ -936,15 +936,15 @@
</span><span class="cx">
</span><span class="cx"> @implementation APITestDelegateIPhone
</span><span class="cx">
</span><del>-- (id)initWithTestRunner:(TestRunner*)runner utf8Data:(JSStringRef)data baseURL:(JSStringRef)baseURL
</del><ins>+- (id)initWithTestRunner:(TestRunner*)runner utf8Data:(JSStringRef)dataString baseURL:(JSStringRef)baseURLString
</ins><span class="cx"> {
</span><span class="cx"> self = [super init];
</span><span class="cx"> if (!self)
</span><span class="cx"> return nil;
</span><span class="cx">
</span><del>- testRunner = *runner;
- data = [[(NSString *)adoptCF(JSStringCopyCFString(kCFAllocatorDefault, data)).get() dataUsingEncoding:NSUTF8StringEncoding] retain];
- baseURL = [[NSURL URLWithString:(NSString *)adoptCF(JSStringCopyCFString(kCFAllocatorDefault, baseURL)).get()] retain];
</del><ins>+ testRunner = runner;
+ data = [[(NSString *)adoptCF(JSStringCopyCFString(kCFAllocatorDefault, dataString)).get() dataUsingEncoding:NSUTF8StringEncoding] retain];
+ baseURL = [[NSURL URLWithString:(NSString *)adoptCF(JSStringCopyCFString(kCFAllocatorDefault, baseURLString)).get()] retain];
</ins><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -960,7 +960,7 @@
</span><span class="cx"> if (webView)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- testRunner.setWaitToDump(true);
</del><ins>+ testRunner->setWaitToDump(true);
</ins><span class="cx">
</span><span class="cx"> WebThreadLock();
</span><span class="cx">
</span><span class="lines">@@ -981,7 +981,7 @@
</span><span class="cx"> [webView release];
</span><span class="cx"> webView = nil;
</span><span class="cx">
</span><del>- testRunner.notifyDone();
</del><ins>+ testRunner->notifyDone();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)webView:(WebView *)sender didFailLoadWithError:(NSError *)error forFrame:(WebFrame *)frame
</span></span></pre>
</div>
</div>
</body>
</html>