<!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>[196345] 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/196345">196345</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2016-02-09 16:15:58 -0800 (Tue, 09 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Mac] Graphical corruption in videos when enabling custom loading path
https://bugs.webkit.org/show_bug.cgi?id=154044
Reviewed by Alex Christensen.
The NSOperationQueue provided by AVFoundation from the AVAssetResourceLoader queue is not
set to be a serial queue. So when adding dataReceived operations to that queue, there exists
the possibility that some operations are handled before others, and the client will receieve
data out of order.
A real NSURLSession object will only issue another operation when the first operation
completes, so emulate this behavior in WebCoreNSURLSession by using a serial dispatch queue.
The internal queue will enqueue an operation to the resource loader's queue, and block until
that operation completes, thus ensuring ordering of the data (and other) operations.
* platform/network/cocoa/WebCoreNSURLSession.h:
* platform/network/cocoa/WebCoreNSURLSession.mm:
(-[WebCoreNSURLSession initWithResourceLoader:delegate:delegateQueue:]): Initialize _internalQueue
(-[WebCoreNSURLSession addDelegateOperation:]): Added utility method.
(-[WebCoreNSURLSession taskCompleted:]): Call -addDelegateOperation:
(-[WebCoreNSURLSession finishTasksAndInvalidate]): Ditto.
(-[WebCoreNSURLSession resetWithCompletionHandler:]): Ditto.
(-[WebCoreNSURLSession flushWithCompletionHandler:]): Ditto.
(-[WebCoreNSURLSession getTasksWithCompletionHandler:]): Ditto.
(-[WebCoreNSURLSession getAllTasksWithCompletionHandler:]): Ditto.
(-[WebCoreNSURLSessionDataTask resource:receivedResponse:]): Ditto.
(-[WebCoreNSURLSessionDataTask resource:receivedData:length:]): Ditto.
(-[WebCoreNSURLSessionDataTask resourceFinished:]): Ditto.
Drive-by fix:
(-[WebCoreNSURLSessionDataTask resource:receivedData:length:]): Set countOfBytesReceived outside the operation,
queue, matching NSURLSessionDataTask's behavior.</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 (196344 => 196345)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-02-10 00:14:20 UTC (rev 196344)
+++ trunk/Source/WebCore/ChangeLog 2016-02-10 00:15:58 UTC (rev 196345)
</span><span class="lines">@@ -1,3 +1,38 @@
</span><ins>+2016-02-09 Jer Noble <jer.noble@apple.com>
+
+ [Mac] Graphical corruption in videos when enabling custom loading path
+ https://bugs.webkit.org/show_bug.cgi?id=154044
+
+ Reviewed by Alex Christensen.
+
+ The NSOperationQueue provided by AVFoundation from the AVAssetResourceLoader queue is not
+ set to be a serial queue. So when adding dataReceived operations to that queue, there exists
+ the possibility that some operations are handled before others, and the client will receieve
+ data out of order.
+
+ A real NSURLSession object will only issue another operation when the first operation
+ completes, so emulate this behavior in WebCoreNSURLSession by using a serial dispatch queue.
+ The internal queue will enqueue an operation to the resource loader's queue, and block until
+ that operation completes, thus ensuring ordering of the data (and other) operations.
+
+ * platform/network/cocoa/WebCoreNSURLSession.h:
+ * platform/network/cocoa/WebCoreNSURLSession.mm:
+ (-[WebCoreNSURLSession initWithResourceLoader:delegate:delegateQueue:]): Initialize _internalQueue
+ (-[WebCoreNSURLSession addDelegateOperation:]): Added utility method.
+ (-[WebCoreNSURLSession taskCompleted:]): Call -addDelegateOperation:
+ (-[WebCoreNSURLSession finishTasksAndInvalidate]): Ditto.
+ (-[WebCoreNSURLSession resetWithCompletionHandler:]): Ditto.
+ (-[WebCoreNSURLSession flushWithCompletionHandler:]): Ditto.
+ (-[WebCoreNSURLSession getTasksWithCompletionHandler:]): Ditto.
+ (-[WebCoreNSURLSession getAllTasksWithCompletionHandler:]): Ditto.
+ (-[WebCoreNSURLSessionDataTask resource:receivedResponse:]): Ditto.
+ (-[WebCoreNSURLSessionDataTask resource:receivedData:length:]): Ditto.
+ (-[WebCoreNSURLSessionDataTask resourceFinished:]): Ditto.
+
+ Drive-by fix:
+ (-[WebCoreNSURLSessionDataTask resource:receivedData:length:]): Set countOfBytesReceived outside the operation,
+ queue, matching NSURLSessionDataTask's behavior.
+
</ins><span class="cx"> 2016-02-09 Nan Wang <n_wang@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS Simulator] accessibility/text-marker/text-marker-range-stale-node-crash.html crashing
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcocoaWebCoreNSURLSessionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.h (196344 => 196345)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.h 2016-02-10 00:14:20 UTC (rev 196344)
+++ trunk/Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.h 2016-02-10 00:15:58 UTC (rev 196345)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #import "CachedResourceHandle.h"
</span><span class="cx"> #import <Foundation/NSURLSession.h>
</span><span class="cx"> #import <wtf/HashSet.h>
</span><ins>+#import <wtf/OSObjectPtr.h>
</ins><span class="cx"> #import <wtf/RefPtr.h>
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx">
</span><span class="lines">@@ -58,6 +59,7 @@
</span><span class="cx"> HashSet<RetainPtr<WebCoreNSURLSessionDataTask>> _dataTasks;
</span><span class="cx"> BOOL _invalidated;
</span><span class="cx"> NSUInteger _nextTaskIdentifier;
</span><ins>+ OSObjectPtr<dispatch_queue_t> _internalQueue;
</ins><span class="cx"> }
</span><span class="cx"> - (id)initWithResourceLoader:(WebCore::CachedResourceLoader&)loader delegate:(id<NSURLSessionTaskDelegate>)delegate delegateQueue:(NSOperationQueue*)queue;
</span><span class="cx"> @property (readonly, retain) NSOperationQueue *delegateQueue;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcocoaWebCoreNSURLSessionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.mm (196344 => 196345)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.mm 2016-02-10 00:14:20 UTC (rev 196344)
+++ trunk/Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.mm 2016-02-10 00:15:58 UTC (rev 196345)
</span><span class="lines">@@ -43,6 +43,7 @@
</span><span class="cx"> @property (readonly) CachedResourceLoader& loader;
</span><span class="cx"> @property (readwrite, retain) id<NSURLSessionTaskDelegate> delegate;
</span><span class="cx"> - (void)taskCompleted:(WebCoreNSURLSessionDataTask *)task;
</span><ins>+- (void)addDelegateOperation:(void (^)(void))operation;
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @interface WebCoreNSURLSessionDataTask ()
</span><span class="lines">@@ -76,6 +77,8 @@
</span><span class="cx"> self.delegate = inDelegate;
</span><span class="cx"> _queue = inQueue ? inQueue : [NSOperationQueue mainQueue];
</span><span class="cx"> _invalidated = NO;
</span><ins>+ _internalQueue = adoptOSObject(dispatch_queue_create("WebCoreNSURLSession _internalQueue", DISPATCH_QUEUE_SERIAL));
+
</ins><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -102,12 +105,22 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> RetainPtr<WebCoreNSURLSession> strongSelf { self };
</span><del>- [self.delegateQueue addOperationWithBlock:[strongSelf] {
</del><ins>+ [self addDelegateOperation:[strongSelf] {
</ins><span class="cx"> if ([strongSelf.get().delegate respondsToSelector:@selector(URLSession:didBecomeInvalidWithError:)])
</span><span class="cx"> [strongSelf.get().delegate URLSession:(NSURLSession *)strongSelf.get() didBecomeInvalidWithError:nil];
</span><span class="cx"> }];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)addDelegateOperation:(void (^)(void))block
+{
+ RetainPtr<WebCoreNSURLSession> strongSelf { self };
+ RetainPtr<NSBlockOperation> operation = [NSBlockOperation blockOperationWithBlock:block];
+ dispatch_async(_internalQueue.get(), [strongSelf, operation] {
+ [strongSelf.get().delegateQueue addOperation:operation.get()];
+ [operation waitUntilFinished];
+ });
+}
+
</ins><span class="cx"> #pragma mark - NSURLSession API
</span><span class="cx"> @synthesize sessionDescription=_sessionDescription;
</span><span class="cx"> @dynamic delegate;
</span><span class="lines">@@ -146,7 +159,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> RetainPtr<WebCoreNSURLSession> strongSelf { self };
</span><del>- [self.delegateQueue addOperationWithBlock:[strongSelf] {
</del><ins>+ [self addDelegateOperation:[strongSelf] {
</ins><span class="cx"> if ([strongSelf.get().delegate respondsToSelector:@selector(URLSession:didBecomeInvalidWithError:)])
</span><span class="cx"> [strongSelf.get().delegate URLSession:(NSURLSession *)strongSelf.get() didBecomeInvalidWithError:nil];
</span><span class="cx"> }];
</span><span class="lines">@@ -163,13 +176,13 @@
</span><span class="cx"> - (void)resetWithCompletionHandler:(void (^)(void))completionHandler
</span><span class="cx"> {
</span><span class="cx"> // FIXME: This cannot currently be implemented. We cannot guarantee that the next connection will happen on a new socket.
</span><del>- [self.delegateQueue addOperationWithBlock:completionHandler];
</del><ins>+ [self addDelegateOperation:completionHandler];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)flushWithCompletionHandler:(void (^)(void))completionHandler
</span><span class="cx"> {
</span><span class="cx"> // FIXME: This cannot currently be implemented. We cannot guarantee that the next connection will happen on a new socket.
</span><del>- [self.delegateQueue addOperationWithBlock:completionHandler];
</del><ins>+ [self addDelegateOperation:completionHandler];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)getTasksWithCompletionHandler:(void (^)(NSArray<NSURLSessionDataTask *> *dataTasks, NSArray<NSURLSessionUploadTask *> *uploadTasks, NSArray<NSURLSessionDownloadTask *> *downloadTasks))completionHandler
</span><span class="lines">@@ -177,7 +190,7 @@
</span><span class="cx"> NSMutableArray *array = [NSMutableArray arrayWithCapacity:_dataTasks.size()];
</span><span class="cx"> for (auto& task : _dataTasks)
</span><span class="cx"> [array addObject:task.get()];
</span><del>- [self.delegateQueue addOperationWithBlock:^{
</del><ins>+ [self addDelegateOperation:^{
</ins><span class="cx"> completionHandler(array, nil, nil);
</span><span class="cx"> }];
</span><span class="cx"> }
</span><span class="lines">@@ -187,7 +200,7 @@
</span><span class="cx"> NSMutableArray *array = [NSMutableArray arrayWithCapacity:_dataTasks.size()];
</span><span class="cx"> for (auto& task : _dataTasks)
</span><span class="cx"> [array addObject:task.get()];
</span><del>- [self.delegateQueue addOperationWithBlock:^{
</del><ins>+ [self addDelegateOperation:^{
</ins><span class="cx"> completionHandler(array);
</span><span class="cx"> }];
</span><span class="cx"> }
</span><span class="lines">@@ -469,7 +482,7 @@
</span><span class="cx"> self.countOfBytesExpectedToReceive = response.expectedContentLength();
</span><span class="cx"> [self _setDefersLoading:YES];
</span><span class="cx"> RetainPtr<WebCoreNSURLSessionDataTask> strongSelf { self };
</span><del>- [self.session.delegateQueue addOperationWithBlock:[strongSelf] {
</del><ins>+ [self.session addDelegateOperation:[strongSelf] {
</ins><span class="cx"> id<NSURLSessionDataDelegate> dataDelegate = (id<NSURLSessionDataDelegate>)strongSelf.get().session.delegate;
</span><span class="cx"> if (![dataDelegate respondsToSelector:@selector(URLSession:dataTask:didReceiveResponse:completionHandler:)]) {
</span><span class="cx"> callOnMainThread([strongSelf] {
</span><span class="lines">@@ -500,10 +513,11 @@
</span><span class="cx"> // FIXME: try to avoid a copy, if possible.
</span><span class="cx"> // e.g., RetainPtr<CFDataRef> cfData = resource->resourceBuffer()->createCFData();
</span><span class="cx">
</span><ins>+ self.countOfBytesReceived += length;
+
</ins><span class="cx"> RetainPtr<NSData> nsData = adoptNS([[NSData alloc] initWithBytes:data length:length]);
</span><span class="cx"> RetainPtr<WebCoreNSURLSessionDataTask> strongSelf { self };
</span><del>- [self.session.delegateQueue addOperationWithBlock:[strongSelf, length, nsData] {
- strongSelf.get().countOfBytesReceived += length;
</del><ins>+ [self.session addDelegateOperation:[strongSelf, length, nsData] {
</ins><span class="cx"> id<NSURLSessionDataDelegate> dataDelegate = (id<NSURLSessionDataDelegate>)strongSelf.get().session.delegate;
</span><span class="cx"> if ([dataDelegate respondsToSelector:@selector(URLSession:dataTask:didReceiveData:)])
</span><span class="cx"> [dataDelegate URLSession:(NSURLSession *)strongSelf.get().session dataTask:(NSURLSessionDataTask *)strongSelf.get() didReceiveData:nsData.get()];
</span><span class="lines">@@ -529,7 +543,7 @@
</span><span class="cx"> self.state = NSURLSessionTaskStateCompleted;
</span><span class="cx">
</span><span class="cx"> RetainPtr<WebCoreNSURLSessionDataTask> strongSelf { self };
</span><del>- [self.session.delegateQueue addOperationWithBlock:[strongSelf] {
</del><ins>+ [self.session addDelegateOperation:[strongSelf] {
</ins><span class="cx"> id<NSURLSessionTaskDelegate> delegate = (id<NSURLSessionTaskDelegate>)strongSelf.get().session.delegate;
</span><span class="cx"> if ([delegate respondsToSelector:@selector(URLSession:task:didCompleteWithError:)])
</span><span class="cx"> [delegate URLSession:(NSURLSession *)strongSelf.get().session task:(NSURLSessionDataTask *)strongSelf.get() didCompleteWithError:nil];
</span></span></pre>
</div>
</div>
</body>
</html>