Title: [202527] trunk/Source/WebCore
- Revision
- 202527
- Author
- [email protected]
- Date
- 2016-06-27 17:36:40 -0700 (Mon, 27 Jun 2016)
Log 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 <[email protected]> on 2016-06-27
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (202526 => 202527)
--- trunk/Source/WebCore/ChangeLog 2016-06-28 00:36:03 UTC (rev 202526)
+++ trunk/Source/WebCore/ChangeLog 2016-06-28 00:36:40 UTC (rev 202527)
@@ -1,3 +1,18 @@
+2016-06-27 Commit Queue <[email protected]>
+
+ 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 <[email protected]>
REGRESSION?(r202466): http/tests/security/canvas-remote-read-remote-video-redirect.html failing on Sierra
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (202526 => 202527)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2016-06-28 00:36:03 UTC (rev 202526)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2016-06-28 00:36:40 UTC (rev 202527)
@@ -2241,18 +2241,7 @@
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());
}
bool MediaPlayerPrivateAVFoundationObjC::didPassCORSAccessCheck() const
Modified: trunk/Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.h (202526 => 202527)
--- trunk/Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.h 2016-06-28 00:36:03 UTC (rev 202526)
+++ trunk/Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.h 2016-06-28 00:36:40 UTC (rev 202527)
@@ -46,7 +46,6 @@
class PlatformMediaResource;
class PlatformMediaResourceLoader;
class WebCoreNSURLSessionDataTaskClient;
-class SecurityOrigin;
}
enum class WebCoreNSURLSessionCORSAccessCheckResults {
@@ -64,11 +63,9 @@
NSString *_sessionDescription;
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;
@property (readonly, retain) NSOperationQueue *delegateQueue;
@@ -76,7 +73,6 @@
@property (readonly, copy) NSURLSessionConfiguration *configuration;
@property (copy) NSString *sessionDescription;
@property (readonly) BOOL didPassCORSAccessChecks;
-@property (readonly) BOOL hasSingleSecurityOrigin;
- (void)finishTasksAndInvalidate;
- (void)invalidateAndCancel;
Modified: trunk/Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.mm (202526 => 202527)
--- trunk/Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.mm 2016-06-28 00:36:03 UTC (rev 202526)
+++ trunk/Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.mm 2016-06-28 00:36:40 UTC (rev 202527)
@@ -30,7 +30,6 @@
#import "CachedResourceRequest.h"
#import "PlatformMediaResourceLoader.h"
-#import "SecurityOrigin.h"
#import "SubresourceLoader.h"
using namespace WebCore;
@@ -45,7 +44,6 @@
- (void)taskCompleted:(WebCoreNSURLSessionDataTask *)task;
- (void)addDelegateOperation:(void (^)(void))operation;
- (void)task:(WebCoreNSURLSessionDataTask *)task didReceiveCORSAccessCheckResult:(BOOL)result;
-- (void)updateHasSingleSecurityOrigin:(SecurityOrigin&)origin;
@end
@interface WebCoreNSURLSessionDataTask ()
@@ -85,7 +83,6 @@
self.delegate = inDelegate;
_queue = inQueue ? inQueue : [NSOperationQueue mainQueue];
_internalQueue = adoptOSObject(dispatch_queue_create("WebCoreNSURLSession _internalQueue", DISPATCH_QUEUE_SERIAL));
- _hasSingleSecurityOrigin = YES;
return self;
}
@@ -142,17 +139,6 @@
_corsResults = WebCoreNSURLSessionCORSAccessCheckResults::Pass;
}
-- (void)updateHasSingleSecurityOrigin:(SecurityOrigin&)origin
-{
- if (!_requestedOrigin) {
- _requestedOrigin = &origin;
- return;
- }
-
- if (!origin.isSameSchemeHostPort(_requestedOrigin.get()))
- _hasSingleSecurityOrigin = false;
-}
-
#pragma mark - NSURLSession API
@synthesize sessionDescription=_sessionDescription;
@dynamic delegate;
@@ -248,8 +234,6 @@
if (_invalidated)
return nil;
- [self updateHasSingleSecurityOrigin:SecurityOrigin::create([request URL])];
-
WebCoreNSURLSessionDataTask *task = [[WebCoreNSURLSessionDataTask alloc] initWithSession:self identifier:_nextTaskIdentifier++ request:request];
_dataTasks.add(task);
return (NSURLSessionDataTask *)[task autorelease];
@@ -260,8 +244,6 @@
if (_invalidated)
return nil;
- [self updateHasSingleSecurityOrigin:SecurityOrigin::create(url)];
-
WebCoreNSURLSessionDataTask *task = [[WebCoreNSURLSessionDataTask alloc] initWithSession:self identifier:_nextTaskIdentifier++ URL:url];
_dataTasks.add(task);
return (NSURLSessionDataTask *)[task autorelease];
@@ -542,7 +524,6 @@
ASSERT_UNUSED(resource, &resource == _resource);
ASSERT(isMainThread());
[self.session task:self didReceiveCORSAccessCheckResult:resource.didPassAccessControlCheck()];
- [self.session updateHasSingleSecurityOrigin:SecurityOrigin::create(response.url())];
self.countOfBytesExpectedToReceive = response.expectedContentLength();
[self _setDefersLoading:YES];
RetainPtr<NSURLResponse> strongResponse { response.nsURLResponse() };
@@ -627,8 +608,6 @@
// current request during responseReceieved: to work around a CoreMedia bug.
if (response.httpStatusCode() != 302 && response.httpStatusCode() != 307)
self.currentRequest = [NSURLRequest requestWithURL:request.url()];
-
- [self.session updateHasSingleSecurityOrigin:SecurityOrigin::create(request.url())];
}
- (void)_resource:(PlatformMediaResource&)resource loadFinishedWithError:(NSError *)error
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
