Title: [186187] tags/Safari-601.1.38/Source
- Revision
- 186187
- Author
- bshaf...@apple.com
- Date
- 2015-07-01 12:33:54 -0700 (Wed, 01 Jul 2015)
Log Message
Roll out r185939. rdar://problem/21637235
Modified Paths
Diff
Modified: tags/Safari-601.1.38/Source/WebCore/ChangeLog (186186 => 186187)
--- tags/Safari-601.1.38/Source/WebCore/ChangeLog 2015-07-01 19:32:33 UTC (rev 186186)
+++ tags/Safari-601.1.38/Source/WebCore/ChangeLog 2015-07-01 19:33:54 UTC (rev 186187)
@@ -1,5 +1,9 @@
2015-07-01 Babak Shafiei <bshaf...@apple.com>
+ Roll out r185939.
+
+2015-07-01 Babak Shafiei <bshaf...@apple.com>
+
Roll out r185951.
2015-06-30 Zalan Bujtas <za...@apple.com>
Modified: tags/Safari-601.1.38/Source/WebCore/WebCore.xcodeproj/project.pbxproj (186186 => 186187)
--- tags/Safari-601.1.38/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-07-01 19:32:33 UTC (rev 186186)
+++ tags/Safari-601.1.38/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-07-01 19:33:54 UTC (rev 186187)
@@ -1350,7 +1350,7 @@
339B5B63131DAA3200F48D02 /* CookiesStrategy.h in Headers */ = {isa = PBXBuildFile; fileRef = 339B5B62131DAA3200F48D02 /* CookiesStrategy.h */; settings = {ATTRIBUTES = (Private, ); }; };
33D0212D131DB37B004091A8 /* CookieStorage.h in Headers */ = {isa = PBXBuildFile; fileRef = E13F01EA1270E10D00DFBA71 /* CookieStorage.h */; settings = {ATTRIBUTES = (Private, ); }; };
3571883EEF618793751E4089 /* RenderMathMLMenclose.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3662F984047CEDBE5DDDAFAA /* RenderMathMLMenclose.cpp */; };
- 3717833A1AACDCF7000910E3 /* SecuritySPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 371783391AACDCF7000910E3 /* SecuritySPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 3717833A1AACDCF7000910E3 /* SecuritySPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 371783391AACDCF7000910E3 /* SecuritySPI.h */; };
3717D7E817ECC591003C276D /* extract-localizable-strings.pl in Copy Scripts */ = {isa = PBXBuildFile; fileRef = 3717D7E517ECC3A6003C276D /* extract-localizable-strings.pl */; };
371A67CB11C6C7DB00047B8B /* HyphenationCF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 371A67CA11C6C7DB00047B8B /* HyphenationCF.cpp */; };
371E65CC13661EDC00BEEDB0 /* PageSerializer.h in Headers */ = {isa = PBXBuildFile; fileRef = 371E65CB13661EDC00BEEDB0 /* PageSerializer.h */; };
Modified: tags/Safari-601.1.38/Source/WebCore/platform/spi/cocoa/SecuritySPI.h (186186 => 186187)
--- tags/Safari-601.1.38/Source/WebCore/platform/spi/cocoa/SecuritySPI.h 2015-07-01 19:32:33 UTC (rev 186186)
+++ tags/Safari-601.1.38/Source/WebCore/platform/spi/cocoa/SecuritySPI.h 2015-07-01 19:33:54 UTC (rev 186187)
@@ -28,19 +28,8 @@
#if USE(APPLE_INTERNAL_SDK)
#include <Security/SecCertificatePriv.h>
-
-#if PLATFORM(IOS)
-#include <Security/SecTask.h>
-#endif
-
#else
-#if PLATFORM(IOS)
-EXTERN_C SecTaskRef SecTaskCreateFromSelf(CFAllocatorRef);
-EXTERN_C CFTypeRef SecTaskCopyValueForEntitlement(SecTaskRef, CFStringRef entitlement, CFErrorRef *);
-#endif
-
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000)
typedef uint32_t SecSignatureHashAlgorithm;
enum {
kSecSignatureHashAlgorithmUnknown = 0,
@@ -54,10 +43,10 @@
kSecSignatureHashAlgorithmSHA512 = 8
};
-EXTERN_C SecSignatureHashAlgorithm SecCertificateGetSignatureHashAlgorithm(SecCertificateRef);
-
#endif
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000)
+EXTERN_C SecSignatureHashAlgorithm SecCertificateGetSignatureHashAlgorithm(SecCertificateRef certificate);
#endif
#endif // SecuritySPI_h
Modified: tags/Safari-601.1.38/Source/WebKit2/ChangeLog (186186 => 186187)
--- tags/Safari-601.1.38/Source/WebKit2/ChangeLog 2015-07-01 19:32:33 UTC (rev 186186)
+++ tags/Safari-601.1.38/Source/WebKit2/ChangeLog 2015-07-01 19:33:54 UTC (rev 186187)
@@ -1,3 +1,7 @@
+2015-07-01 Babak Shafiei <bshaf...@apple.com>
+
+ Roll out r185939.
+
2015-06-30 Babak Shafiei <bshaf...@apple.com>
Roll out r186148.
Modified: tags/Safari-601.1.38/Source/WebKit2/UIProcess/ApplicationStateTracker.mm (186186 => 186187)
--- tags/Safari-601.1.38/Source/WebKit2/UIProcess/ApplicationStateTracker.mm 2015-07-01 19:32:33 UTC (rev 186186)
+++ tags/Safari-601.1.38/Source/WebKit2/UIProcess/ApplicationStateTracker.mm 2015-07-01 19:33:54 UTC (rev 186187)
@@ -31,7 +31,6 @@
#import "AssertionServicesSPI.h"
#import "UIKitSPI.h"
#import <UIKit/UIApplication.h>
-#import <WebCore/SecuritySPI.h>
#import <wtf/NeverDestroyed.h>
#import <wtf/ObjcRuntimeExtras.h>
@@ -44,33 +43,12 @@
return applicationStateTracker;
}
-static bool hasEntitlement(NSString *entitlement)
-{
-#if PLATFORM(IOS_SIMULATOR)
- // The simulator doesn't support entitlements.
- return true;
-#else
- auto task = adoptCF(SecTaskCreateFromSelf(CFAllocatorGetDefault()));
- if (!task)
- return false;
-
- auto value = adoptCF(SecTaskCopyValueForEntitlement(task.get(), (__bridge CFStringRef)entitlement, nullptr));
- if (!value)
- return false;
-
- if (CFGetTypeID(value.get()) != CFBooleanGetTypeID())
- return false;
-
- return CFBooleanGetValue(static_cast<CFBooleanRef>(value.get()));
-#endif
-}
-
static bool isViewService()
{
if (_UIApplicationIsExtension())
return true;
- if (hasEntitlement(@"com.apple.UIKit.vends-view-services"))
+ if ([[NSBundle mainBundle].bundleIdentifier isEqualToString:@"com.apple.SafariViewService"])
return true;
return false;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
