<!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>[168348] trunk</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/168348">168348</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2014-05-05 20:12:54 -0700 (Mon, 05 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>RetainPtr: Use adoptCF function instead of AdoptCF constructor argument
https://bugs.webkit.org/show_bug.cgi?id=80222
Reviewed by Alexey Proskuryakov.
Source/WTF:
All the clients are gone, so we can now remove AdoptCF and AdoptNS.
* wtf/RetainPtr.h: Removed the public constructors that let you specify AdoptCF
and AdoptNS. Instead, made the adoptCF and adoptNS functions be friends and use
a private constructor that takes an Adopt argument.
(WTF::adoptCF): Moved the Objective-C class check in here.
(WTF::adoptNS): Moved the code to deal with the CFRetain for garbage collection
in here; it used to be spread across the constructor and adoptNSReference.
Tools:
* DumpRenderTree/mac/TestRunnerMac.mm:
(-[APITestDelegateIPhone initWithTestRunner:utf8Data:baseURL:]): Updated to
do more work here so we don't use RetainPtr local variables.
(-[APITestDelegateIPhone dealloc]): Added.
(-[APITestDelegateIPhone run]): Added an early exit if the web view is already
created. Updated for changes to member names and types.
(-[APITestDelegateIPhone _cleanUp]): Added code to set webView to nil and
updated for changes to member names and types. Changed to two word spelling.
(-[APITestDelegateIPhone webView:didFailLoadWithError:forFrame:]): Updated
name of _cleanUp method.
(-[APITestDelegateIPhone webView:didFailProvisionalLoadWithError:forFrame:]):
Ditto.
(-[APITestDelegateIPhone webView:didFinishLoadForFrame:]): Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfRetainPtrh">trunk/Source/WTF/wtf/RetainPtr.h</a></li>
<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="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (168347 => 168348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2014-05-06 02:54:26 UTC (rev 168347)
+++ trunk/Source/WTF/ChangeLog 2014-05-06 03:12:54 UTC (rev 168348)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-05-04 Darin Adler <darin@apple.com>
+
+ RetainPtr: Use adoptCF function instead of AdoptCF constructor argument
+ https://bugs.webkit.org/show_bug.cgi?id=80222
+
+ Reviewed by Alexey Proskuryakov.
+
+ All the clients are gone, so we can now remove AdoptCF and AdoptNS.
+
+ * wtf/RetainPtr.h: Removed the public constructors that let you specify AdoptCF
+ and AdoptNS. Instead, made the adoptCF and adoptNS functions be friends and use
+ a private constructor that takes an Adopt argument.
+ (WTF::adoptCF): Moved the Objective-C class check in here.
+ (WTF::adoptNS): Moved the code to deal with the CFRetain for garbage collection
+ in here; it used to be spread across the constructor and adoptNSReference.
+
</ins><span class="cx"> 2014-05-04 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Optimize JSRopeString for resolving directly to AtomicString.
</span></span></pre></div>
<a id="trunkSourceWTFwtfRetainPtrh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/RetainPtr.h (168347 => 168348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/RetainPtr.h 2014-05-06 02:54:26 UTC (rev 168347)
+++ trunk/Source/WTF/wtf/RetainPtr.h 2014-05-06 03:12:54 UTC (rev 168348)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2005, 2006, 2007, 2008, 2010, 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2005, 2006, 2007, 2008, 2010, 2013, 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * This library is free software; you can redistribute it and/or
</span><span class="cx"> * modify it under the terms of the GNU Library General Public
</span><span class="lines">@@ -48,29 +48,10 @@
</span><span class="cx"> // Unlike most most of our smart pointers, RetainPtr can take either the pointer type or the pointed-to type,
</span><span class="cx"> // so both RetainPtr<NSDictionary> and RetainPtr<CFDictionaryRef> will work.
</span><span class="cx">
</span><del>-#if !PLATFORM(IOS)
- #define AdoptCF DeprecatedAdoptCF
- #define AdoptNS DeprecatedAdoptNS
-#endif
</del><ins>+ template<typename T> class RetainPtr;
</ins><span class="cx">
</span><del>- enum AdoptCFTag { AdoptCF };
- enum AdoptNSTag { AdoptNS };
-
-#if defined(__OBJC__) && !__has_feature(objc_arc)
-#ifdef OBJC_NO_GC
- inline void adoptNSReference(id)
- {
- }
-#else
- inline void adoptNSReference(id ptr)
- {
- if (ptr) {
- CFRetain(ptr);
- [ptr release];
- }
- }
-#endif
-#endif
</del><ins>+ template<typename T> RetainPtr<T> adoptCF(T CF_RELEASES_ARGUMENT) WARN_UNUSED_RETURN;
+ template<typename T> RetainPtr<T> adoptNS(T NS_RELEASES_ARGUMENT) WARN_UNUSED_RETURN;
</ins><span class="cx">
</span><span class="cx"> template<typename T> class RetainPtr {
</span><span class="cx"> public:
</span><span class="lines">@@ -78,27 +59,9 @@
</span><span class="cx"> typedef ValueType* PtrType;
</span><span class="cx"> typedef CFTypeRef StorageType;
</span><span class="cx">
</span><del>- RetainPtr() : m_ptr(0) {}
</del><ins>+ RetainPtr() : m_ptr(nullptr) { }
</ins><span class="cx"> RetainPtr(PtrType ptr) : m_ptr(toStorageType(ptr)) { if (m_ptr) CFRetain(m_ptr); }
</span><span class="cx">
</span><del>- RetainPtr(AdoptCFTag, PtrType ptr)
- : m_ptr(toStorageType(ptr))
- {
-#ifdef __OBJC__
- static_assert((!std::is_convertible<T, id>::value), "Don't use adoptCF with Objective-C pointer types, use adoptNS.");
-#endif
- }
-
-#if __has_feature(objc_arc)
- RetainPtr(AdoptNSTag, PtrType ptr) : m_ptr(toStorageType(ptr)) { if (m_ptr) CFRetain(m_ptr); }
-#else
- RetainPtr(AdoptNSTag, PtrType ptr)
- : m_ptr(toStorageType(ptr))
- {
- adoptNSReference(ptr);
- }
-#endif
-
</del><span class="cx"> RetainPtr(const RetainPtr& o) : m_ptr(o.m_ptr) { if (StorageType ptr = m_ptr) CFRetain(ptr); }
</span><span class="cx">
</span><span class="cx"> RetainPtr(RetainPtr&& o) : m_ptr(toStorageType(o.leakRef())) { }
</span><span class="lines">@@ -124,7 +87,7 @@
</span><span class="cx">
</span><span class="cx"> // This conversion operator allows implicit conversion to bool but not to other integer types.
</span><span class="cx"> typedef StorageType RetainPtr::*UnspecifiedBoolType;
</span><del>- operator UnspecifiedBoolType() const { return m_ptr ? &RetainPtr::m_ptr : 0; }
</del><ins>+ operator UnspecifiedBoolType() const { return m_ptr ? &RetainPtr::m_ptr : nullptr; }
</ins><span class="cx">
</span><span class="cx"> RetainPtr& operator=(const RetainPtr&);
</span><span class="cx"> template<typename U> RetainPtr& operator=(const RetainPtr<U>&);
</span><span class="lines">@@ -136,7 +99,13 @@
</span><span class="cx">
</span><span class="cx"> void swap(RetainPtr&);
</span><span class="cx">
</span><ins>+ template<typename U> friend RetainPtr<U> adoptCF(U CF_RELEASES_ARGUMENT) WARN_UNUSED_RETURN;
+ template<typename U> friend RetainPtr<U> adoptNS(U NS_RELEASES_ARGUMENT) WARN_UNUSED_RETURN;
+
</ins><span class="cx"> private:
</span><ins>+ enum AdoptTag { Adopt };
+ RetainPtr(PtrType ptr, AdoptTag) : m_ptr(toStorageType(ptr)) { }
+
</ins><span class="cx"> static PtrType hashTableDeletedValue() { return reinterpret_cast<PtrType>(-1); }
</span><span class="cx">
</span><span class="cx"> #if defined (__OBJC__) && __has_feature(objc_arc)
</span><span class="lines">@@ -165,6 +134,9 @@
</span><span class="cx"> StorageType m_ptr;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+ // Helper function for creating a RetainPtr using template argument deduction.
+ template<typename T> inline RetainPtr<T> retainPtr(T) WARN_UNUSED_RETURN;
+
</ins><span class="cx"> template<typename T> template<typename U> inline RetainPtr<T>::RetainPtr(const RetainPtr<U>& o)
</span><span class="cx"> : m_ptr(toStorageType(o.get()))
</span><span class="cx"> {
</span><span class="lines">@@ -175,7 +147,7 @@
</span><span class="cx"> template<typename T> inline void RetainPtr<T>::clear()
</span><span class="cx"> {
</span><span class="cx"> if (StorageType ptr = m_ptr) {
</span><del>- m_ptr = 0;
</del><ins>+ m_ptr = nullptr;
</ins><span class="cx"> CFRelease(ptr);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -183,7 +155,7 @@
</span><span class="cx"> template<typename T> inline typename RetainPtr<T>::PtrType RetainPtr<T>::leakRef()
</span><span class="cx"> {
</span><span class="cx"> PtrType ptr = fromStorageType(m_ptr);
</span><del>- m_ptr = 0;
</del><ins>+ m_ptr = nullptr;
</ins><span class="cx"> return ptr;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -269,23 +241,32 @@
</span><span class="cx"> return a != b.get();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- template<typename T> inline RetainPtr<T> adoptCF(T CF_RELEASES_ARGUMENT) WARN_UNUSED_RETURN;
- template<typename T> inline RetainPtr<T> adoptCF(T CF_RELEASES_ARGUMENT o)
</del><ins>+ template<typename T> inline RetainPtr<T> adoptCF(T CF_RELEASES_ARGUMENT ptr)
</ins><span class="cx"> {
</span><del>- return RetainPtr<T>(AdoptCF, o);
</del><ins>+#ifdef __OBJC__
+ static_assert((!std::is_convertible<T, id>::value), "Don't use adoptCF with Objective-C pointer types, use adoptNS.");
+#endif
+ return RetainPtr<T>(ptr, RetainPtr<T>::Adopt);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- template<typename T> inline RetainPtr<T> adoptNS(T NS_RELEASES_ARGUMENT) WARN_UNUSED_RETURN;
- template<typename T> inline RetainPtr<T> adoptNS(T NS_RELEASES_ARGUMENT o)
</del><ins>+#ifdef __OBJC__
+ template<typename T> inline RetainPtr<T> adoptNS(T NS_RELEASES_ARGUMENT ptr)
</ins><span class="cx"> {
</span><del>- return RetainPtr<T>(AdoptNS, o);
</del><ins>+#if __has_feature(objc_arc)
+ return ptr;
+#elif defined(OBJC_NO_GC)
+ return RetainPtr<T>(ptr, RetainPtr<T>::Adopt);
+#else
+ RetainPtr<T> result = ptr;
+ [ptr release];
+ return result;
+#endif
</ins><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><del>- // Helper function for creating a RetainPtr using template argument deduction.
- template<typename T> inline RetainPtr<T> retainPtr(T) WARN_UNUSED_RETURN;
- template<typename T> inline RetainPtr<T> retainPtr(T o)
</del><ins>+ template<typename T> inline RetainPtr<T> retainPtr(T ptr)
</ins><span class="cx"> {
</span><del>- return o;
</del><ins>+ return ptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename P> struct HashTraits<RetainPtr<P>> : SimpleClassHashTraits<RetainPtr<P>> { };
</span><span class="lines">@@ -324,11 +305,6 @@
</span><span class="cx"> static const bool safeToCompareToEmptyOrDeleted = false;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-#if !PLATFORM(IOS)
- #undef AdoptCF
- #undef AdoptNS
-#endif
-
</del><span class="cx"> } // namespace WTF
</span><span class="cx">
</span><span class="cx"> using WTF::RetainPtr;
</span><span class="lines">@@ -336,11 +312,6 @@
</span><span class="cx"> using WTF::adoptNS;
</span><span class="cx"> using WTF::retainPtr;
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
-using WTF::AdoptCF;
-using WTF::AdoptNS;
-#endif
-
</del><span class="cx"> #endif // USE(CF) || defined(__OBJC__)
</span><span class="cx">
</span><span class="cx"> #endif // WTF_RetainPtr_h
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (168347 => 168348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-05-06 02:54:26 UTC (rev 168347)
+++ trunk/Tools/ChangeLog 2014-05-06 03:12:54 UTC (rev 168348)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-05-04 Darin Adler <darin@apple.com>
+
+ RetainPtr: Use adoptCF function instead of AdoptCF constructor argument
+ https://bugs.webkit.org/show_bug.cgi?id=80222
+
+ Reviewed by Alexey Proskuryakov.
+
+ * DumpRenderTree/mac/TestRunnerMac.mm:
+ (-[APITestDelegateIPhone initWithTestRunner:utf8Data:baseURL:]): Updated to
+ do more work here so we don't use RetainPtr local variables.
+ (-[APITestDelegateIPhone dealloc]): Added.
+ (-[APITestDelegateIPhone run]): Added an early exit if the web view is already
+ created. Updated for changes to member names and types.
+ (-[APITestDelegateIPhone _cleanUp]): Added code to set webView to nil and
+ updated for changes to member names and types. Changed to two word spelling.
+ (-[APITestDelegateIPhone webView:didFailLoadWithError:forFrame:]): Updated
+ name of _cleanUp method.
+ (-[APITestDelegateIPhone webView:didFailProvisionalLoadWithError:forFrame:]):
+ Ditto.
+ (-[APITestDelegateIPhone webView:didFinishLoadForFrame:]): Ditto.
+
</ins><span class="cx"> 2014-05-05 Benjamin Poulain <benjamin@webkit.org>
</span><span class="cx">
</span><span class="cx"> Clean up Image Document and tweak the layout and viewport
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacTestRunnerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/TestRunnerMac.mm (168347 => 168348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/TestRunnerMac.mm 2014-05-06 02:54:26 UTC (rev 168347)
+++ trunk/Tools/DumpRenderTree/mac/TestRunnerMac.mm 2014-05-06 03:12:54 UTC (rev 168348)
</span><span class="lines">@@ -922,77 +922,88 @@
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><ins>+
</ins><span class="cx"> @interface APITestDelegateIPhone : NSObject
</span><span class="cx"> {
</span><del>- TestRunner* m_layoutTestRunner;
- JSStringRef m_utf8Data;
- JSStringRef m_baseURL;
- WebView *m_webView;
</del><ins>+ TestRunner& testRunner;
+ NSData *data;
+ NSURL *baseURL;
+ WebView *webView;
</ins><span class="cx"> }
</span><del>-
-- (id)initWithTestRunner:(TestRunner*)layoutTestRunner utf8Data:(JSStringRef)utf8Data baseURL:(JSStringRef)baseURL;
</del><ins>+- (id)initWithTestRunner:(TestRunner*)testRunner utf8Data:(JSStringRef)data baseURL:(JSStringRef)baseURL;
</ins><span class="cx"> - (void)run;
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @implementation APITestDelegateIPhone
</span><span class="cx">
</span><del>-- (id)initWithTestRunner:(TestRunner*)layoutTestRunner utf8Data:(JSStringRef)utf8Data baseURL:(JSStringRef)baseURL
</del><ins>+- (id)initWithTestRunner:(TestRunner*)runner utf8Data:(JSStringRef)data baseURL:(JSStringRef)baseURL
</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>- m_layoutTestRunner = layoutTestRunner;
- m_utf8Data = utf8Data;
- m_baseURL = baseURL;
</del><ins>+ testRunner = *runner;
+ data = [[(NSString *)adoptCF(JSStringCopyCFString(kCFAllocatorDefault, data)).get() dataUsingEncoding:NSUTF8StringEncoding] retain];
+ baseURL = [[NSURL URLWithString:(NSString *)adoptCF(JSStringCopyCFString(kCFAllocatorDefault, baseURL)).get()] retain];
</ins><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)dealloc
+{
+ [data release];
+ [baseURL release];
+ [super dealloc];
+}
+
</ins><span class="cx"> - (void)run
</span><span class="cx"> {
</span><del>- m_layoutTestRunner->setWaitToDump(true);
</del><ins>+ if (webView)
+ return;
</ins><span class="cx">
</span><del>- RetainPtr<CFStringRef> utf8DataCF(AdoptCF, JSStringCopyCFString(kCFAllocatorDefault, m_utf8Data));
- RetainPtr<CFStringRef> baseURLCF(AdoptCF, JSStringCopyCFString(kCFAllocatorDefault, m_baseURL));
- m_utf8Data = NULL;
- m_baseURL = NULL;
</del><ins>+ testRunner.setWaitToDump(true);
</ins><span class="cx">
</span><span class="cx"> WebThreadLock();
</span><del>- m_webView = [[WebView alloc] initWithFrame:NSZeroRect frameName:@"" groupName:@""];
- [m_webView setFrameLoadDelegate:self];
</del><span class="cx">
</span><del>- [[m_webView mainFrame] loadData:[(NSString *)utf8DataCF.get() dataUsingEncoding:NSUTF8StringEncoding] MIMEType:@"text/html" textEncodingName:@"utf-8" baseURL:[NSURL URLWithString:(NSString *)baseURLCF.get()]];
</del><ins>+ webView = [[WebView alloc] initWithFrame:NSZeroRect frameName:@"" groupName:@""];
+ [webView setFrameLoadDelegate:self];
+ [[webView mainFrame] loadData:data MIMEType:@"text/html" textEncodingName:@"utf-8" baseURL:baseURL];
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)_cleanup
</del><ins>+- (void)_cleanUp
</ins><span class="cx"> {
</span><ins>+ if (!webView)
+ return;
+
</ins><span class="cx"> WebThreadLock();
</span><del>- [m_webView _clearDelegates];
- [m_webView close];
- [m_webView release];
</del><span class="cx">
</span><del>- m_layoutTestRunner->notifyDone();
</del><ins>+ [webView _clearDelegates];
+ [webView close];
+ [webView release];
+ webView = nil;
+
+ 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 class="cx"> {
</span><span class="cx"> printf("API Test load failed\n");
</span><del>- [self _cleanup];
</del><ins>+ [self _cleanUp];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)webView:(WebView *)sender didFailProvisionalLoadWithError:(NSError *)error forFrame:(WebFrame *)frame
</span><span class="cx"> {
</span><span class="cx"> printf("API Test load failed provisional\n");
</span><del>- [self _cleanup];
</del><ins>+ [self _cleanUp];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)webView:(WebView *)sender didFinishLoadForFrame:(WebFrame *)frame
</span><span class="cx"> {
</span><span class="cx"> printf("API Test load succeeded\n");
</span><del>- [self _cleanup];
</del><ins>+ [self _cleanUp];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span><ins>+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void TestRunner::apiTestNewWindowDataLoadBaseURL(JSStringRef utf8Data, JSStringRef baseURL)
</span></span></pre>
</div>
</div>
</body>
</html>