<!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>[287230] trunk/Source/WebCore</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/287230">287230</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2021-12-18 13:34:02 -0800 (Sat, 18 Dec 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Use smart pointers for WebCoreNSURLSessionDataTask ObjC members
https://bugs.webkit.org/show_bug.cgi?id=234477
<rdar://79224869>

Patch by Alex Christensen <achristensen@webkit.org> on 2021-12-18
Reviewed by Brady Eidson.

Seems like a smart thing to do.

* platform/network/cocoa/WebCoreNSURLSession.h:
* platform/network/cocoa/WebCoreNSURLSession.mm:
(-[WebCoreNSURLSessionDataTask originalRequest]):
(-[WebCoreNSURLSessionDataTask setOriginalRequest:]):
(-[WebCoreNSURLSessionDataTask currentRequest]):
(-[WebCoreNSURLSessionDataTask setCurrentRequest:]):
(-[WebCoreNSURLSessionDataTask error]):
(-[WebCoreNSURLSessionDataTask setError:]):
(-[WebCoreNSURLSessionDataTask taskDescription]):
(-[WebCoreNSURLSessionDataTask setTaskDescription:]):
(-[WebCoreNSURLSessionDataTask dealloc]):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcocoaWebCoreNSURLSessionh">trunk/Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcocoaWebCoreNSURLSessionmm">trunk/Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (287229 => 287230)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-12-18 20:30:27 UTC (rev 287229)
+++ trunk/Source/WebCore/ChangeLog      2021-12-18 21:34:02 UTC (rev 287230)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2021-12-18  Alex Christensen  <achristensen@webkit.org>
+
+        Use smart pointers for WebCoreNSURLSessionDataTask ObjC members
+        https://bugs.webkit.org/show_bug.cgi?id=234477
+        <rdar://79224869>
+
+        Reviewed by Brady Eidson.
+
+        Seems like a smart thing to do.
+
+        * platform/network/cocoa/WebCoreNSURLSession.h:
+        * platform/network/cocoa/WebCoreNSURLSession.mm:
+        (-[WebCoreNSURLSessionDataTask originalRequest]):
+        (-[WebCoreNSURLSessionDataTask setOriginalRequest:]):
+        (-[WebCoreNSURLSessionDataTask currentRequest]):
+        (-[WebCoreNSURLSessionDataTask setCurrentRequest:]):
+        (-[WebCoreNSURLSessionDataTask error]):
+        (-[WebCoreNSURLSessionDataTask setError:]):
+        (-[WebCoreNSURLSessionDataTask taskDescription]):
+        (-[WebCoreNSURLSessionDataTask setTaskDescription:]):
+        (-[WebCoreNSURLSessionDataTask dealloc]):
+
</ins><span class="cx"> 2021-12-17  Simon Fraser  <simon.fraser@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Read the default value of the ScrollAnimatorEnabled setting from NSUserDefaults
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcocoaWebCoreNSURLSessionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.h (287229 => 287230)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.h        2021-12-18 20:30:27 UTC (rev 287229)
+++ trunk/Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.h   2021-12-18 21:34:02 UTC (rev 287230)
</span><span class="lines">@@ -125,29 +125,29 @@
</span><span class="cx">     RefPtr<WebCore::PlatformMediaResource> _resource;
</span><span class="cx">     RetainPtr<NSURLResponse> _response;
</span><span class="cx">     NSUInteger _taskIdentifier;
</span><del>-    NSURLRequest *_originalRequest;
-    NSURLRequest *_currentRequest;
</del><ins>+    RetainPtr<NSURLRequest> _originalRequest;
+    RetainPtr<NSURLRequest> _currentRequest;
</ins><span class="cx">     int64_t _countOfBytesReceived;
</span><span class="cx">     int64_t _countOfBytesSent;
</span><span class="cx">     int64_t _countOfBytesExpectedToSend;
</span><span class="cx">     int64_t _countOfBytesExpectedToReceive;
</span><span class="cx">     NSURLSessionTaskState _state;
</span><del>-    NSError *_error;
-    NSString *_taskDescription;
</del><ins>+    RetainPtr<NSError> _error;
+    RetainPtr<NSString> _taskDescription;
</ins><span class="cx">     float _priority;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> @property NSUInteger taskIdentifier;
</span><del>-@property (copy) NSURLRequest *originalRequest;
-@property (copy) NSURLRequest *currentRequest;
-@property (readonly, copy) NSURLResponse *response;
</del><ins>+@property (nullable, readonly, copy) NSURLRequest *originalRequest;
+@property (nullable, readonly, copy) NSURLRequest *currentRequest;
+@property (nullable, readonly, copy) NSURLResponse *response;
</ins><span class="cx"> @property (assign, atomic) int64_t countOfBytesReceived;
</span><span class="cx"> @property int64_t countOfBytesSent;
</span><span class="cx"> @property int64_t countOfBytesExpectedToSend;
</span><span class="cx"> @property int64_t countOfBytesExpectedToReceive;
</span><span class="cx"> @property NSURLSessionTaskState state;
</span><del>-@property (copy) NSError *error;
-@property (copy) NSString *taskDescription;
</del><ins>+@property (nullable, readonly, copy) NSError *error;
+@property (nullable, copy) NSString *taskDescription;
</ins><span class="cx"> @property float priority;
</span><span class="cx"> - (void)cancel;
</span><span class="cx"> - (void)suspend;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcocoaWebCoreNSURLSessionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.mm (287229 => 287230)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.mm       2021-12-18 20:30:27 UTC (rev 287229)
+++ trunk/Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.mm  2021-12-18 21:34:02 UTC (rev 287230)
</span><span class="lines">@@ -721,7 +721,7 @@
</span><span class="cx">         request = mutableRequest.get();
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    self.originalRequest = self.currentRequest = request;
</del><ins>+    self->_originalRequest = self->_currentRequest = request;
</ins><span class="cx"> 
</span><span class="cx">     return self;
</span><span class="cx"> }
</span><span class="lines">@@ -770,17 +770,38 @@
</span><span class="cx"> 
</span><span class="cx"> #pragma mark - NSURLSession API
</span><span class="cx"> @synthesize taskIdentifier = _taskIdentifier;
</span><del>-@synthesize originalRequest = _originalRequest;
-@synthesize currentRequest = _currentRequest;
</del><span class="cx"> @synthesize countOfBytesReceived = _countOfBytesReceived;
</span><span class="cx"> @synthesize countOfBytesSent = _countOfBytesSent;
</span><span class="cx"> @synthesize countOfBytesExpectedToSend = _countOfBytesExpectedToSend;
</span><span class="cx"> @synthesize countOfBytesExpectedToReceive = _countOfBytesExpectedToReceive;
</span><span class="cx"> @synthesize state = _state;
</span><del>-@synthesize error = _error;
-@synthesize taskDescription = _taskDescription;
</del><span class="cx"> @synthesize priority = _priority;
</span><span class="cx"> 
</span><ins>+- (NSURLRequest *)originalRequest
+{
+    return adoptNS([_originalRequest copy]).autorelease();
+}
+
+- (NSURLRequest *)currentRequest
+{
+    return adoptNS([_currentRequest copy]).autorelease();
+}
+
+- (NSError *)error
+{
+    return adoptNS([_error copy]).autorelease();
+}
+
+- (NSString *)taskDescription
+{
+    return adoptNS([_taskDescription copy]).autorelease();
+}
+
+- (void)setTaskDescription:(NSString *)description
+{
+    _taskDescription = adoptNS([description copy]);
+}
+
</ins><span class="cx"> - (WebCoreNSURLSession *)session
</span><span class="cx"> {
</span><span class="cx">     return _session.get().get();
</span><span class="lines">@@ -831,11 +852,6 @@
</span><span class="cx"> 
</span><span class="cx"> - (void)dealloc
</span><span class="cx"> {
</span><del>-    [_originalRequest release];
-    [_currentRequest release];
-    [_error release];
-    [_taskDescription release];
-
</del><span class="cx">     if (!isMainThread() && _resource) {
</span><span class="cx">         if (auto* client = _resource->client())
</span><span class="cx">             static_cast<WebCoreNSURLSessionDataTaskClient*>(client)->clearTask();
</span></span></pre>
</div>
</div>

</body>
</html>