Changeset 202527 in webkit

Timestamp:

Jun 27, 2016 5:36:40 PM (8 years ago)

Author:

Ryan Haddad

Message:

Unreviewed, rolling out r202520.
​https://bugs.webkit.org/show_bug.cgi?id=159185

This change broke the 32-bit El Capitan build (Requested by
ryanhaddad on #webkit).

Reverted changeset:

"REGRESSION?(r202466): http/tests/security/canvas-remote-read-
remote-video-redirect.html failing on Sierra"
​https://bugs.webkit.org/show_bug.cgi?id=159172
​http://trac.webkit.org/changeset/202520

Patch by Commit Queue <​commit-queue@webkit.org> on 2016-06-27

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (modified) (1 diff)
• platform/network/cocoa/WebCoreNSURLSession.h (modified) (3 diffs)
• platform/network/cocoa/WebCoreNSURLSession.mm (modified) (8 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-06-27  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r202520.
+        https://bugs.webkit.org/show_bug.cgi?id=159185
+
+        This change broke the 32-bit El Capitan build (Requested by
+        ryanhaddad on #webkit).
+
+        Reverted changeset:
+
+        "REGRESSION?(r202466): http/tests/security/canvas-remote-read-
+        remote-video-redirect.html failing on Sierra"
+        https://bugs.webkit.org/show_bug.cgi?id=159172
+        http://trac.webkit.org/changeset/202520
+
 2016-06-27  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm

@@ -2242 +2242 @@
     Ref<SecurityOrigin> resolvedOrigin(SecurityOrigin::create(resolvedURL()));
     Ref<SecurityOrigin> requestedOrigin(SecurityOrigin::createFromString(assetURL()));
-    if (!resolvedOrigin.get().isSameSchemeHostPort(&requestedOrigin.get()))
-        return false;
-
-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED > 101100
-    AVAssetResourceLoader *resourceLoader = m_avAsset.get().resourceLoader;
-    if (Settings::isAVFoundationNSURLSessionEnabled() && [resourceLoader respondsToSelector:@selector(URLSession)]) {
-        WebCoreNSURLSession *session = (WebCoreNSURLSession *)resourceLoader.URLSession;
-        if ([session respondsToSelector:@selector(hasSingleSecurityOrigin)])
-            return session.hasSingleSecurityOrigin;
-    }
-#endif
-    return true;
+    return resolvedOrigin.get().isSameSchemeHostPort(&requestedOrigin.get());
 }
 

trunk/Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.h

@@ -47 +47 @@
 class PlatformMediaResourceLoader;
 class WebCoreNSURLSessionDataTaskClient;
-class SecurityOrigin;
 }
 
@@ -65 +64 @@
     HashSet<RetainPtr<WebCoreNSURLSessionDataTask>> _dataTasks;
     BOOL _invalidated;
-    BOOL _hasSingleSecurityOrigin;
     NSUInteger _nextTaskIdentifier;
     OSObjectPtr<dispatch_queue_t> _internalQueue;
     WebCoreNSURLSessionCORSAccessCheckResults _corsResults;
-    RefPtr<WebCore::SecurityOrigin> _requestedOrigin;
 }
 - (id)initWithResourceLoader:(WebCore::PlatformMediaResourceLoader&)loader delegate:(id<NSURLSessionTaskDelegate>)delegate delegateQueue:(NSOperationQueue*)queue;
@@ -77 +74 @@
 @property (copy) NSString *sessionDescription;
 @property (readonly) BOOL didPassCORSAccessChecks;
-@property (readonly) BOOL hasSingleSecurityOrigin;
 - (void)finishTasksAndInvalidate;
 - (void)invalidateAndCancel;

trunk/Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.mm

@@ -31 +31 @@
 #import "CachedResourceRequest.h"
 #import "PlatformMediaResourceLoader.h"
-#import "SecurityOrigin.h"
 #import "SubresourceLoader.h"
 
@@ -46 +45 @@
 - (void)addDelegateOperation:(void (^)(void))operation;
 - (void)task:(WebCoreNSURLSessionDataTask *)task didReceiveCORSAccessCheckResult:(BOOL)result;
-- (void)updateHasSingleSecurityOrigin:(SecurityOrigin&)origin;
 @end
 
@@ -86 +84 @@
     _queue = inQueue ? inQueue : [NSOperationQueue mainQueue];
     _internalQueue = adoptOSObject(dispatch_queue_create("WebCoreNSURLSession _internalQueue", DISPATCH_QUEUE_SERIAL));
-    _hasSingleSecurityOrigin = YES;
 
     return self;
@@ -143 +140 @@
 }
 
-- (void)updateHasSingleSecurityOrigin:(SecurityOrigin&)origin
-{
-    if (!_requestedOrigin) {
-        _requestedOrigin = &origin;
-        return;
-    }
-
-    if (!origin.isSameSchemeHostPort(_requestedOrigin.get()))
-        _hasSingleSecurityOrigin = false;
-}
-
 #pragma mark - NSURLSession API
 @synthesize sessionDescription=_sessionDescription;
@@ -249 +235 @@
         return nil;
 
-    [self updateHasSingleSecurityOrigin:SecurityOrigin::create([request URL])];
-
     WebCoreNSURLSessionDataTask *task = [[WebCoreNSURLSessionDataTask alloc] initWithSession:self identifier:_nextTaskIdentifier++ request:request];
     _dataTasks.add(task);
@@ -260 +244 @@
     if (_invalidated)
         return nil;
-
-    [self updateHasSingleSecurityOrigin:SecurityOrigin::create(url)];
 
     WebCoreNSURLSessionDataTask *task = [[WebCoreNSURLSessionDataTask alloc] initWithSession:self identifier:_nextTaskIdentifier++ URL:url];
@@ -543 +525 @@
     ASSERT(isMainThread());
     [self.session task:self didReceiveCORSAccessCheckResult:resource.didPassAccessControlCheck()];
-    [self.session updateHasSingleSecurityOrigin:SecurityOrigin::create(response.url())];
     self.countOfBytesExpectedToReceive = response.expectedContentLength();
     [self _setDefersLoading:YES];
@@ -628 +609 @@
     if (response.httpStatusCode() != 302 && response.httpStatusCode() != 307)
         self.currentRequest = [NSURLRequest requestWithURL:request.url()];
-
-    [self.session updateHasSingleSecurityOrigin:SecurityOrigin::create(request.url())];
 }