Diff
Modified: tags/Safari-606.1.20/Source/WTF/ChangeLog (232554 => 232555)
--- tags/Safari-606.1.20/Source/WTF/ChangeLog 2018-06-06 20:13:16 UTC (rev 232554)
+++ tags/Safari-606.1.20/Source/WTF/ChangeLog 2018-06-06 20:13:34 UTC (rev 232555)
@@ -1,5 +1,9 @@
2018-06-06 Kocsen Chung <[email protected]>
+ Revert r232520. rdar://problem/40857773
+
+2018-06-06 Kocsen Chung <[email protected]>
+
Revert r232528. rdar://problem/40858098
2018-06-05 Darin Adler <[email protected]>
Modified: tags/Safari-606.1.20/Source/WTF/wtf/BlockPtr.h (232554 => 232555)
--- tags/Safari-606.1.20/Source/WTF/wtf/BlockPtr.h 2018-06-06 20:13:16 UTC (rev 232554)
+++ tags/Safari-606.1.20/Source/WTF/wtf/BlockPtr.h 2018-06-06 20:13:34 UTC (rev 232555)
@@ -97,12 +97,8 @@
new (&block->f) F { std::move(function) };
-#if defined(__OBJC__) && __has_feature(objc_arc)
- BlockPtr blockPtr { (__bridge_transfer BlockType)block };
-#else
BlockPtr blockPtr;
blockPtr.m_block = reinterpret_cast<BlockType>(block);
-#endif
return blockPtr;
}
@@ -113,20 +109,12 @@
}
BlockPtr(BlockType block)
-#if defined(__OBJC__) && __has_feature(objc_arc)
- : m_block(block)
-#else
: m_block(Block_copy(block))
-#endif
{
}
BlockPtr(const BlockPtr& other)
-#if defined(__OBJC__) && __has_feature(objc_arc)
- : m_block(other.m_block)
-#else
: m_block(Block_copy(other.m_block))
-#endif
{
}
@@ -137,22 +125,16 @@
~BlockPtr()
{
-#if !defined(__OBJC__) || !__has_feature(objc_arc)
Block_release(m_block);
-#endif
}
BlockPtr& operator=(const BlockPtr& other)
{
-#if defined(__OBJC__) && __has_feature(objc_arc)
- m_block = other.m_block;
-#else
if (this != &other) {
Block_release(m_block);
m_block = Block_copy(other.m_block);
}
-#endif
-
+
return *this;
}
@@ -160,9 +142,7 @@
{
ASSERT(this != &other);
-#if !defined(__OBJC__) || !__has_feature(objc_arc)
Block_release(m_block);
-#endif
m_block = std::exchange(other.m_block, nullptr);
return *this;
@@ -194,3 +174,4 @@
using WTF::BlockPtr;
using WTF::makeBlockPtr;
+
Modified: tags/Safari-606.1.20/Source/WTF/wtf/OSObjectPtr.h (232554 => 232555)
--- tags/Safari-606.1.20/Source/WTF/wtf/OSObjectPtr.h 2018-06-06 20:13:16 UTC (rev 232554)
+++ tags/Safari-606.1.20/Source/WTF/wtf/OSObjectPtr.h 2018-06-06 20:13:34 UTC (rev 232555)
@@ -85,13 +85,6 @@
other.m_ptr = nullptr;
}
- OSObjectPtr(T ptr)
- : m_ptr(ptr)
- {
- if (m_ptr)
- retainOSObject(m_ptr);
- }
-
OSObjectPtr& operator=(const OSObjectPtr& other)
{
OSObjectPtr ptr = other;
@@ -115,13 +108,6 @@
return *this;
}
- OSObjectPtr& operator=(T other)
- {
- OSObjectPtr ptr = other;
- swap(ptr);
- return *this;
- }
-
void swap(OSObjectPtr& other)
{
std::swap(m_ptr, other.m_ptr);
Modified: tags/Safari-606.1.20/Source/WebKit/ChangeLog (232554 => 232555)
--- tags/Safari-606.1.20/Source/WebKit/ChangeLog 2018-06-06 20:13:16 UTC (rev 232554)
+++ tags/Safari-606.1.20/Source/WebKit/ChangeLog 2018-06-06 20:13:34 UTC (rev 232555)
@@ -1,5 +1,9 @@
2018-06-06 Kocsen Chung <[email protected]>
+ Revert r232520. rdar://problem/40857773
+
+2018-06-06 Kocsen Chung <[email protected]>
+
Cherry-pick r232548. rdar://problem/40838449
REGRESSION (r232301) - Unable to enter video fullscreen
Modified: tags/Safari-606.1.20/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm (232554 => 232555)
--- tags/Safari-606.1.20/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2018-06-06 20:13:16 UTC (rev 232554)
+++ tags/Safari-606.1.20/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2018-06-06 20:13:34 UTC (rev 232555)
@@ -677,7 +677,7 @@
configuration.URLCache = nil;
if (auto& data = ""
- configuration._sourceApplicationAuditTokenData = (__bridge NSData *)data.get();
+ configuration._sourceApplicationAuditTokenData = (NSData *)data.get();
auto& sourceApplicationBundleIdentifier = globalSourceApplicationBundleIdentifier();
if (!sourceApplicationBundleIdentifier.isEmpty()) {
Modified: tags/Safari-606.1.20/Source/WebKit/NetworkProcess/mac/NetworkProcessMac.mm (232554 => 232555)
--- tags/Safari-606.1.20/Source/WebKit/NetworkProcess/mac/NetworkProcessMac.mm 2018-06-06 20:13:16 UTC (rev 232554)
+++ tags/Safari-606.1.20/Source/WebKit/NetworkProcess/mac/NetworkProcessMac.mm 2018-06-06 20:13:34 UTC (rev 232555)
@@ -97,7 +97,7 @@
}
if ([proxySettings count] > 0)
- _CFNetworkSetOverrideSystemProxySettings((__bridge CFDictionaryRef)proxySettings);
+ _CFNetworkSetOverrideSystemProxySettings((CFDictionaryRef)proxySettings);
}
void NetworkProcess::platformInitializeNetworkProcess(const NetworkProcessCreationParameters& parameters)
@@ -115,7 +115,7 @@
void NetworkProcess::allowSpecificHTTPSCertificateForHost(const CertificateInfo& certificateInfo, const String& host)
{
- [NSURLRequest setAllowsSpecificHTTPSCertificate:(__bridge NSArray *)certificateInfo.certificateChain() forHost:(NSString *)host];
+ [NSURLRequest setAllowsSpecificHTTPSCertificate:(NSArray *)certificateInfo.certificateChain() forHost:(NSString *)host];
}
void NetworkProcess::initializeSandbox(const ChildProcessInitializationParameters& parameters, SandboxInitializationParameters& sandboxParameters)
Modified: tags/Safari-606.1.20/Source/WebKit/Platform/IPC/mac/ConnectionMac.mm (232554 => 232555)
--- tags/Safari-606.1.20/Source/WebKit/Platform/IPC/mac/ConnectionMac.mm 2018-06-06 20:13:16 UTC (rev 232554)
+++ tags/Safari-606.1.20/Source/WebKit/Platform/IPC/mac/ConnectionMac.mm 2018-06-06 20:13:34 UTC (rev 232555)
@@ -268,7 +268,7 @@
return false;
default:
- WebKit::setCrashReportApplicationSpecificInformation((__bridge CFStringRef)[NSString stringWithFormat:@"Unhandled error code %x, message '%s::%s'", kr, message->messageReceiverName().data(), message->messageName().data()]);
+ WebKit::setCrashReportApplicationSpecificInformation((CFStringRef)[NSString stringWithFormat:@"Unhandled error code %x, message '%s::%s'", kr, message->messageReceiverName().data(), message->messageName().data()]);
CRASH();
}
}
@@ -501,7 +501,7 @@
if (kr != MACH_MSG_SUCCESS) {
#if !ASSERT_DISABLED
- WebKit::setCrashReportApplicationSpecificInformation((__bridge CFStringRef)[NSString stringWithFormat:@"Unhandled error code %x from mach_msg, receive port is %x", kr, machPort]);
+ WebKit::setCrashReportApplicationSpecificInformation((CFStringRef)[NSString stringWithFormat:@"Unhandled error code %x from mach_msg, receive port is %x", kr, machPort]);
#endif
ASSERT_NOT_REACHED();
return nullptr;
Modified: tags/Safari-606.1.20/Source/WebKit/Platform/mac/StringUtilities.mm (232554 => 232555)
--- tags/Safari-606.1.20/Source/WebKit/Platform/mac/StringUtilities.mm 2018-06-06 20:13:16 UTC (rev 232554)
+++ tags/Safari-606.1.20/Source/WebKit/Platform/mac/StringUtilities.mm 2018-06-06 20:13:34 UTC (rev 232555)
@@ -62,7 +62,7 @@
{
NSString *countryCode = [[[NSLocale currentLocale] objectForKey:NSLocaleCountryCode] lowercaseString];
- RetainPtr<CFPhoneNumberRef> phoneNumber = adoptCF(CFPhoneNumberCreate(kCFAllocatorDefault, (__bridge CFStringRef)originalPhoneNumber, (__bridge CFStringRef)countryCode));
+ RetainPtr<CFPhoneNumberRef> phoneNumber = adoptCF(CFPhoneNumberCreate(kCFAllocatorDefault, (CFStringRef)originalPhoneNumber, (CFStringRef)countryCode));
if (!phoneNumber)
return originalPhoneNumber;
@@ -70,7 +70,7 @@
if (!phoneNumberString)
phoneNumberString = CFPhoneNumberCopyUnformattedRepresentation(phoneNumber.get());
- return CFBridgingRelease(phoneNumberString);
+ return [(NSString *)phoneNumberString autorelease];
}
#else
Modified: tags/Safari-606.1.20/Source/WebKit/Shared/API/Cocoa/_WKRemoteObjectInterface.mm (232554 => 232555)
--- tags/Safari-606.1.20/Source/WebKit/Shared/API/Cocoa/_WKRemoteObjectInterface.mm 2018-06-06 20:13:16 UTC (rev 232554)
+++ tags/Safari-606.1.20/Source/WebKit/Shared/API/Cocoa/_WKRemoteObjectInterface.mm 2018-06-06 20:13:34 UTC (rev 232555)
@@ -162,12 +162,14 @@
static void initializeMethods(_WKRemoteObjectInterface *interface, Protocol *protocol)
{
unsigned conformingProtocolCount;
- auto conformingProtocols = protocol_copyProtocolList(interface->_protocol, &conformingProtocolCount);
+ Protocol** conformingProtocols = protocol_copyProtocolList(interface->_protocol, &conformingProtocolCount);
for (unsigned i = 0; i < conformingProtocolCount; ++i) {
- auto conformingProtocol = conformingProtocols[i];
+ Protocol* conformingProtocol = conformingProtocols[i];
+
if (conformingProtocol == @protocol(NSObject))
continue;
+
initializeMethods(interface, conformingProtocol);
}
Modified: tags/Safari-606.1.20/Source/WebKit/Shared/API/Cocoa/_WKRemoteObjectRegistry.mm (232554 => 232555)
--- tags/Safari-606.1.20/Source/WebKit/Shared/API/Cocoa/_WKRemoteObjectRegistry.mm 2018-06-06 20:13:16 UTC (rev 232554)
+++ tags/Safari-606.1.20/Source/WebKit/Shared/API/Cocoa/_WKRemoteObjectRegistry.mm 2018-06-06 20:13:34 UTC (rev 232555)
@@ -147,7 +147,7 @@
if (!replyBlock)
[NSException raise:NSInvalidArgumentException format:@"A NULL reply block was passed into a message. (%s)", sel_getName(invocation.selector)];
- const char* replyBlockSignature = _Block_signature((__bridge void*)replyBlock);
+ const char* replyBlockSignature = _Block_signature(replyBlock);
if (strcmp([NSMethodSignature signatureWithObjCTypes:replyBlockSignature].methodReturnType, "v"))
[NSException raise:NSInvalidArgumentException format:@"Return value of block argument must be 'void'. (%s)", sel_getName(invocation.selector)];
Modified: tags/Safari-606.1.20/Source/WebKit/Shared/API/c/cf/WKStringCF.mm (232554 => 232555)
--- tags/Safari-606.1.20/Source/WebKit/Shared/API/c/cf/WKStringCF.mm 2018-06-06 20:13:16 UTC (rev 232554)
+++ tags/Safari-606.1.20/Source/WebKit/Shared/API/c/cf/WKStringCF.mm 2018-06-06 20:13:34 UTC (rev 232555)
@@ -50,7 +50,7 @@
{
#if WK_API_ENABLED
// Since WKNSString is an internal class with no subclasses, we can do a simple equality check.
- if (object_getClass((__bridge NSString *)cfString) == wkNSStringClass())
+ if (object_getClass((NSString *)cfString) == wkNSStringClass())
return toAPI(static_cast<API::String*>(&[(WKNSString *)[(NSString *)cfString retain] _apiObject]));
#endif
String string(cfString);
Modified: tags/Safari-606.1.20/Source/WebKit/Shared/API/c/cf/WKURLCF.mm (232554 => 232555)
--- tags/Safari-606.1.20/Source/WebKit/Shared/API/c/cf/WKURLCF.mm 2018-06-06 20:13:16 UTC (rev 232554)
+++ tags/Safari-606.1.20/Source/WebKit/Shared/API/c/cf/WKURLCF.mm 2018-06-06 20:13:34 UTC (rev 232555)
@@ -54,7 +54,7 @@
#if WK_API_ENABLED
// Since WKNSURL is an internal class with no subclasses, we can do a simple equality check.
- if (object_getClass((__bridge NSURL *)cfURL) == wkNSURLClass())
+ if (object_getClass((NSURL *)cfURL) == wkNSURLClass())
return toAPI(static_cast<API::URL*>(&[(WKNSURL *)[(NSURL *)cfURL retain] _apiObject]));
#endif
Modified: tags/Safari-606.1.20/Source/WebKit/Shared/Authentication/cocoa/AuthenticationManagerCocoa.mm (232554 => 232555)
--- tags/Safari-606.1.20/Source/WebKit/Shared/Authentication/cocoa/AuthenticationManagerCocoa.mm 2018-06-06 20:13:16 UTC (rev 232554)
+++ tags/Safari-606.1.20/Source/WebKit/Shared/Authentication/cocoa/AuthenticationManagerCocoa.mm 2018-06-06 20:13:34 UTC (rev 232555)
@@ -83,7 +83,7 @@
auto certificate = adoptCF(SecCertificateCreateWithData(nullptr, cfData.get()));
if (!certificate)
return;
- [certificates addObject:(__bridge id)certificate.get()];
+ [certificates addObject:(id)certificate.get()];
}
}
Modified: tags/Safari-606.1.20/Source/WebKit/Shared/Cocoa/DataDetectionResult.mm (232554 => 232555)
--- tags/Safari-606.1.20/Source/WebKit/Shared/Cocoa/DataDetectionResult.mm 2018-06-06 20:13:16 UTC (rev 232554)
+++ tags/Safari-606.1.20/Source/WebKit/Shared/Cocoa/DataDetectionResult.mm 2018-06-06 20:13:34 UTC (rev 232555)
@@ -43,7 +43,7 @@
{
auto archiver = secureArchiver();
[archiver encodeObject:results.get() forKey:@"dataDetectorResults"];
- IPC::encode(encoder, (__bridge CFDataRef)archiver.get().encodedData);
+ IPC::encode(encoder, reinterpret_cast<CFDataRef>(archiver.get().encodedData));
}
bool DataDetectionResult::decode(IPC::Decoder& decoder, DataDetectionResult& result)
@@ -52,7 +52,7 @@
if (!IPC::decode(decoder, data))
return false;
- auto unarchiver = secureUnarchiverFromData((__bridge NSData *)data.get());
+ auto unarchiver = secureUnarchiverFromData((NSData *)data.get());
@try {
result.results = [unarchiver decodeObjectOfClasses:[NSSet setWithArray:@[ [NSArray class], getDDScannerResultClass()] ] forKey:@"dataDetectorResults"];
} @catch (NSException *exception) {
Modified: tags/Safari-606.1.20/Source/WebKit/Shared/Cocoa/WKNSError.mm (232554 => 232555)
--- tags/Safari-606.1.20/Source/WebKit/Shared/Cocoa/WKNSError.mm 2018-06-06 20:13:16 UTC (rev 232554)
+++ tags/Safari-606.1.20/Source/WebKit/Shared/Cocoa/WKNSError.mm 2018-06-06 20:13:34 UTC (rev 232555)
@@ -34,7 +34,7 @@
- (NSObject *)_web_createTarget
{
- return [(__bridge NSError *)static_cast<API::Error*>(&self._apiObject)->platformError().cfError() copy];
+ return [(NSError *)static_cast<API::Error*>(&self._apiObject)->platformError().cfError() copy];
}
#pragma mark NSCopying protocol implementation
Modified: tags/Safari-606.1.20/Source/WebKit/Shared/Cocoa/WKNSURLExtras.mm (232554 => 232555)
--- tags/Safari-606.1.20/Source/WebKit/Shared/Cocoa/WKNSURLExtras.mm 2018-06-06 20:13:16 UTC (rev 232554)
+++ tags/Safari-606.1.20/Source/WebKit/Shared/Cocoa/WKNSURLExtras.mm 2018-06-06 20:13:34 UTC (rev 232555)
@@ -50,7 +50,7 @@
- (String)_web_originalDataAsWTFString
{
CString originalData;
- getURLBytes((__bridge CFURLRef)self, originalData);
+ getURLBytes((CFURLRef)self, originalData);
return String::fromUTF8(originalData);
}
Modified: tags/Safari-606.1.20/Source/WebKit/Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.h (232554 => 232555)
--- tags/Safari-606.1.20/Source/WebKit/Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.h 2018-06-06 20:13:16 UTC (rev 232554)
+++ tags/Safari-606.1.20/Source/WebKit/Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.h 2018-06-06 20:13:34 UTC (rev 232555)
@@ -83,7 +83,7 @@
ChildProcessInitializationParameters parameters;
if (priorityBoostMessage)
- parameters.priorityBoostMessage = priorityBoostMessage;
+ parameters.priorityBoostMessage = adoptOSObject(xpc_retain(priorityBoostMessage));
if (!delegate.getConnectionIdentifier(parameters.connectionIdentifier))
exit(EXIT_FAILURE);
Modified: tags/Safari-606.1.20/Source/WebKit/Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.mm (232554 => 232555)
--- tags/Safari-606.1.20/Source/WebKit/Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.mm 2018-06-06 20:13:16 UTC (rev 232554)
+++ tags/Safari-606.1.20/Source/WebKit/Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.mm 2018-06-06 20:13:34 UTC (rev 232555)
@@ -59,7 +59,7 @@
typedef void (*InitializerFunction)(xpc_connection_t, xpc_object_t, xpc_object_t);
InitializerFunction initializerFunctionPtr = reinterpret_cast<InitializerFunction>(CFBundleGetFunctionPointerForName(webKitBundle, entryPointFunctionName));
if (!initializerFunctionPtr) {
- NSLog(@"Unable to find entry point in WebKit.framework with name: %@", (__bridge NSString *)entryPointFunctionName);
+ NSLog(@"Unable to find entry point in WebKit.framework with name: %@", (NSString *)entryPointFunctionName);
exit(EXIT_FAILURE);
}
Modified: tags/Safari-606.1.20/Source/WebKit/Shared/RemoteLayerTree/RemoteLayerBackingStore.mm (232554 => 232555)
--- tags/Safari-606.1.20/Source/WebKit/Shared/RemoteLayerTree/RemoteLayerBackingStore.mm 2018-06-06 20:13:16 UTC (rev 232554)
+++ tags/Safari-606.1.20/Source/WebKit/Shared/RemoteLayerTree/RemoteLayerBackingStore.mm 2018-06-06 20:13:34 UTC (rev 232555)
@@ -411,7 +411,7 @@
break;
case LayerContentsType::CAMachPort:
ASSERT(m_frontBufferSendRight);
- layer.contents = (__bridge id)adoptCF(CAMachPortCreate(m_frontBufferSendRight.leakSendRight())).get();
+ layer.contents = (id)adoptCF(CAMachPortCreate(m_frontBufferSendRight.leakSendRight())).get();
break;
}
return;
@@ -419,7 +419,7 @@
#endif
ASSERT(!acceleratesDrawing());
- layer.contents = (__bridge id)m_frontBuffer.bitmap->makeCGImageCopy().get();
+ layer.contents = (id)m_frontBuffer.bitmap->makeCGImageCopy().get();
}
RetainPtr<CGContextRef> RemoteLayerBackingStore::takeFrontContextPendingFlush()
Modified: tags/Safari-606.1.20/Source/WebKit/Shared/cf/ArgumentCodersCF.cpp (232554 => 232555)
--- tags/Safari-606.1.20/Source/WebKit/Shared/cf/ArgumentCodersCF.cpp 2018-06-06 20:13:16 UTC (rev 232554)
+++ tags/Safari-606.1.20/Source/WebKit/Shared/cf/ArgumentCodersCF.cpp 2018-06-06 20:13:34 UTC (rev 232555)
@@ -624,7 +624,7 @@
if (urlBytes.isEmpty()) {
// CFURL can't hold an empty URL, unlike NSURL.
// FIXME: This discards base URL, which seems incorrect.
- result = (__bridge CFURLRef)[NSURL URLWithString:@""];
+ result = reinterpret_cast<CFURLRef>([NSURL URLWithString:@""]);
return true;
}
#endif
Modified: tags/Safari-606.1.20/Source/WebKit/Shared/mac/ArgumentCodersMac.mm (232554 => 232555)
--- tags/Safari-606.1.20/Source/WebKit/Shared/mac/ArgumentCodersMac.mm 2018-06-06 20:13:16 UTC (rev 232554)
+++ tags/Safari-606.1.20/Source/WebKit/Shared/mac/ArgumentCodersMac.mm 2018-06-06 20:13:34 UTC (rev 232555)
@@ -243,7 +243,7 @@
#else
auto fontClass = [UIFont class];
#endif
- return ![value isKindOfClass:fontClass] || isSerializableFont((__bridge CTFontRef)value);
+ return ![value isKindOfClass:fontClass] || isSerializableFont(reinterpret_cast<CTFontRef>(value));
}
static inline RetainPtr<NSDictionary> filterUnserializableValues(NSDictionary *dictionary)
@@ -425,7 +425,7 @@
void encode(Encoder& encoder, NSNumber *number)
{
- encode(encoder, (__bridge CFNumberRef)number);
+ encode(encoder, (CFNumberRef)number);
}
bool decode(Decoder& decoder, RetainPtr<NSNumber>& result)
@@ -440,7 +440,7 @@
void encode(Encoder& encoder, NSString *string)
{
- encode(encoder, (__bridge CFStringRef)string);
+ encode(encoder, (CFStringRef)string);
}
bool decode(Decoder& decoder, RetainPtr<NSString>& result)
@@ -492,7 +492,7 @@
void encode(Encoder& encoder, NSDate *date)
{
- encode(encoder, (__bridge CFDateRef)date);
+ encode(encoder, (CFDateRef)date);
}
bool decode(Decoder& decoder, RetainPtr<NSDate>& result)
@@ -507,7 +507,7 @@
void encode(Encoder& encoder, NSData *data)
{
- encode(encoder, (__bridge CFDataRef)data);
+ encode(encoder, (CFDataRef)data);
}
bool decode(Decoder& decoder, RetainPtr<NSData>& result)
@@ -522,7 +522,7 @@
void encode(Encoder& encoder, NSURL *URL)
{
- encode(encoder, (__bridge CFURLRef)URL);
+ encode(encoder, (CFURLRef)URL);
}
bool decode(Decoder& decoder, RetainPtr<NSURL>& result)
Modified: tags/Safari-606.1.20/Source/WebKit/Shared/mac/WebCoreArgumentCodersMac.mm (232554 => 232555)
--- tags/Safari-606.1.20/Source/WebKit/Shared/mac/WebCoreArgumentCodersMac.mm 2018-06-06 20:13:16 UTC (rev 232554)
+++ tags/Safari-606.1.20/Source/WebKit/Shared/mac/WebCoreArgumentCodersMac.mm 2018-06-06 20:13:34 UTC (rev 232555)
@@ -321,7 +321,7 @@
[userInfo enumerateKeysAndObjectsUsingBlock:^(id key, id value, BOOL*) {
if ([value isKindOfClass:[NSString class]] || [value isKindOfClass:[NSURL class]] || [value isKindOfClass:[NSNumber class]])
- CFDictionarySetValue(filteredUserInfo.get(), (__bridge CFTypeRef)key, (__bridge CFTypeRef)value);
+ CFDictionarySetValue(filteredUserInfo.get(), key, value);
}];
if (NSArray *clientIdentityAndCertificates = [userInfo objectForKey:@"NSErrorClientCertificateChainKey"]) {
@@ -328,7 +328,7 @@
ASSERT([clientIdentityAndCertificates isKindOfClass:[NSArray class]]);
ASSERT(^{
for (id object in clientIdentityAndCertificates) {
- if (CFGetTypeID((__bridge CFTypeRef)object) != SecIdentityGetTypeID() && CFGetTypeID((__bridge CFTypeRef)object) != SecCertificateGetTypeID())
+ if (CFGetTypeID(object) != SecIdentityGetTypeID() && CFGetTypeID(object) != SecCertificateGetTypeID())
return false;
}
return true;
@@ -337,7 +337,7 @@
// Turn SecIdentity members into SecCertificate to strip out private key information.
id clientCertificates = [NSMutableArray arrayWithCapacity:clientIdentityAndCertificates.count];
for (id object in clientIdentityAndCertificates) {
- if (CFGetTypeID((__bridge CFTypeRef)object) != SecIdentityGetTypeID()) {
+ if (CFGetTypeID(object) != SecIdentityGetTypeID()) {
[clientCertificates addObject:object];
continue;
}
@@ -351,27 +351,27 @@
clientCertificates = nil;
break;
}
- [clientCertificates addObject:(__bridge id)certificate];
+ [clientCertificates addObject:(id)certificate];
}
- CFDictionarySetValue(filteredUserInfo.get(), CFSTR("NSErrorClientCertificateChainKey"), (__bridge CFTypeRef)clientCertificates);
+ CFDictionarySetValue(filteredUserInfo.get(), @"NSErrorClientCertificateChainKey", clientCertificates);
}
id peerCertificateChain = [userInfo objectForKey:@"NSErrorPeerCertificateChainKey"];
if (!peerCertificateChain) {
- if (SecTrustRef peerTrust = (__bridge SecTrustRef)[userInfo objectForKey:NSURLErrorFailingURLPeerTrustErrorKey]) {
+ if (SecTrustRef peerTrust = (SecTrustRef)[userInfo objectForKey:NSURLErrorFailingURLPeerTrustErrorKey]) {
CFIndex count = SecTrustGetCertificateCount(peerTrust);
peerCertificateChain = [NSMutableArray arrayWithCapacity:count];
for (CFIndex i = 0; i < count; ++i)
- [peerCertificateChain addObject:(__bridge id)SecTrustGetCertificateAtIndex(peerTrust, i)];
+ [peerCertificateChain addObject:(id)SecTrustGetCertificateAtIndex(peerTrust, i)];
}
}
ASSERT(!peerCertificateChain || [peerCertificateChain isKindOfClass:[NSArray class]]);
if (peerCertificateChain)
- CFDictionarySetValue(filteredUserInfo.get(), CFSTR("NSErrorPeerCertificateChainKey"), (__bridge CFTypeRef)peerCertificateChain);
+ CFDictionarySetValue(filteredUserInfo.get(), @"NSErrorPeerCertificateChainKey", peerCertificateChain);
#if HAVE(SEC_TRUST_SERIALIZATION)
- if (SecTrustRef peerTrust = (__bridge SecTrustRef)[userInfo objectForKey:NSURLErrorFailingURLPeerTrustErrorKey])
- CFDictionarySetValue(filteredUserInfo.get(), (__bridge CFStringRef)NSURLErrorFailingURLPeerTrustErrorKey, peerTrust);
+ if (SecTrustRef peerTrust = (SecTrustRef)[userInfo objectForKey:NSURLErrorFailingURLPeerTrustErrorKey])
+ CFDictionarySetValue(filteredUserInfo.get(), NSURLErrorFailingURLPeerTrustErrorKey, peerTrust);
#endif
IPC::encode(encoder, filteredUserInfo.get());
@@ -413,11 +413,11 @@
return false;
auto mutableUserInfo = adoptCF(CFDictionaryCreateMutableCopy(kCFAllocatorDefault, CFDictionaryGetCount(userInfo.get()) + 1, userInfo.get()));
- CFDictionarySetValue(mutableUserInfo.get(), (__bridge CFStringRef)NSUnderlyingErrorKey, (__bridge CFTypeRef)underlyingNSError.get());
+ CFDictionarySetValue(mutableUserInfo.get(), NSUnderlyingErrorKey, underlyingNSError.get());
userInfo = WTFMove(mutableUserInfo);
}
- nsError = adoptNS([[NSError alloc] initWithDomain:domain code:code userInfo:(__bridge NSDictionary *)userInfo.get()]);
+ nsError = adoptNS([[NSError alloc] initWithDomain:domain code:code userInfo:(NSDictionary *)userInfo.get()]);
return true;
}
@@ -435,7 +435,7 @@
{
auto archiver = secureArchiver();
[archiver encodeObject:space.nsSpace() forKey:@"protectionSpace"];
- IPC::encode(encoder, (__bridge CFDataRef)archiver.get().encodedData);
+ IPC::encode(encoder, reinterpret_cast<CFDataRef>(archiver.get().encodedData));
}
bool ArgumentCoder<ProtectionSpace>::decodePlatformData(Decoder& decoder, ProtectionSpace& space)
@@ -444,7 +444,7 @@
if (!IPC::decode(decoder, data))
return false;
- auto unarchiver = secureUnarchiverFromData((__bridge NSData *)data.get());
+ auto unarchiver = secureUnarchiverFromData((NSData *)data.get());
@try {
if (RetainPtr<NSURLProtectionSpace> nsSpace = [unarchiver decodeObjectOfClass:[NSURLProtectionSpace class] forKey:@"protectionSpace"])
space = ProtectionSpace(nsSpace.get());
@@ -467,7 +467,7 @@
if (NSArray *certificates = nsCredential.certificates) {
encoder << true;
- IPC::encode(encoder, (__bridge CFArrayRef)certificates);
+ IPC::encode(encoder, reinterpret_cast<CFArrayRef>(certificates));
} else
encoder << false;
@@ -479,7 +479,7 @@
auto archiver = secureArchiver();
[archiver encodeObject:nsCredential forKey:@"credential"];
- IPC::encode(encoder, (__bridge CFArrayRef)archiver.get().encodedData);
+ IPC::encode(encoder, reinterpret_cast<CFDataRef>(archiver.get().encodedData));
}
bool ArgumentCoder<Credential>::decodePlatformData(Decoder& decoder, Credential& credential)
@@ -507,7 +507,7 @@
if (!decoder.decode(persistence))
return false;
- credential = Credential(adoptNS([[NSURLCredential alloc] initWithIdentity:identity.get() certificates:(__bridge NSArray *)certificates.get() persistence:(NSURLCredentialPersistence)persistence]).get());
+ credential = Credential(adoptNS([[NSURLCredential alloc] initWithIdentity:identity.get() certificates:(NSArray *)certificates.get() persistence:(NSURLCredentialPersistence)persistence]).get());
return true;
}
@@ -515,7 +515,7 @@
if (!IPC::decode(decoder, data))
return false;
- auto unarchiver = secureUnarchiverFromData((__bridge NSData *)data.get());
+ auto unarchiver = secureUnarchiverFromData((NSData *)data.get());
@try {
if (RetainPtr<NSURLCredential> nsCredential = [unarchiver decodeObjectOfClass:[NSURLCredential class] forKey:@"credential"])
credential = Credential(nsCredential.get());
@@ -574,12 +574,11 @@
}
#if ENABLE(CONTENT_FILTERING)
-
void ArgumentCoder<ContentFilterUnblockHandler>::encode(Encoder& encoder, const ContentFilterUnblockHandler& contentFilterUnblockHandler)
{
auto archiver = secureArchiver();
contentFilterUnblockHandler.encode(archiver.get());
- IPC::encode(encoder, (__bridge CFDataRef)archiver.get().encodedData);
+ IPC::encode(encoder, reinterpret_cast<CFDataRef>(archiver.get().encodedData));
}
bool ArgumentCoder<ContentFilterUnblockHandler>::decode(Decoder& decoder, ContentFilterUnblockHandler& contentFilterUnblockHandler)
@@ -588,7 +587,7 @@
if (!IPC::decode(decoder, data))
return false;
- auto unarchiver = secureUnarchiverFromData((__bridge NSData *)data.get());
+ auto unarchiver = secureUnarchiverFromData((NSData *)data.get());
if (!ContentFilterUnblockHandler::decode(unarchiver.get(), contentFilterUnblockHandler))
return false;
@@ -595,7 +594,6 @@
[unarchiver finishDecoding];
return true;
}
-
#endif
#if ENABLE(WIRELESS_PLAYBACK_TARGET)
@@ -613,7 +611,7 @@
if ([getAVOutputContextClass() conformsToProtocol:@protocol(NSSecureCoding)])
[archiver encodeObject:target.avOutputContext() forKey:deviceContextKey()];
- IPC::encode(encoder, (__bridge CFDataRef)archiver.get().encodedData);
+ IPC::encode(encoder, reinterpret_cast<CFDataRef>(archiver.get().encodedData));
}
bool ArgumentCoder<MediaPlaybackTargetContext>::decodePlatformData(Decoder& decoder, MediaPlaybackTargetContext& target)
@@ -625,7 +623,7 @@
if (!IPC::decode(decoder, data))
return false;
- auto unarchiver = secureUnarchiverFromData((__bridge NSData *)data.get());
+ auto unarchiver = secureUnarchiverFromData((NSData *)data.get());
AVOutputContext *context = nil;
@try {
@@ -640,7 +638,6 @@
[unarchiver finishDecoding];
return true;
}
-
#endif
} // namespace IPC
Modified: tags/Safari-606.1.20/Source/WebKit/Shared/mac/WebHitTestResultData.mm (232554 => 232555)
--- tags/Safari-606.1.20/Source/WebKit/Shared/mac/WebHitTestResultData.mm 2018-06-06 20:13:16 UTC (rev 232554)
+++ tags/Safari-606.1.20/Source/WebKit/Shared/mac/WebHitTestResultData.mm 2018-06-06 20:13:34 UTC (rev 232555)
@@ -48,7 +48,7 @@
auto archiver = secureArchiver();
[archiver encodeObject:detectedDataActionContext.get() forKey:@"actionContext"];
- IPC::encode(encoder, (__bridge CFDataRef)archiver.get().encodedData);
+ IPC::encode(encoder, reinterpret_cast<CFDataRef>(archiver.get().encodedData));
encoder << detectedDataBoundingBox;
encoder << detectedDataOriginatingPageOverlay;
@@ -73,7 +73,7 @@
if (!IPC::decode(decoder, data))
return false;
- auto unarchiver = secureUnarchiverFromData((__bridge NSData *)data.get());
+ auto unarchiver = secureUnarchiverFromData((NSData *)data.get());
@try {
hitTestResultData.detectedDataActionContext = [unarchiver decodeObjectOfClass:getDDActionContextClass() forKey:@"actionContext"];
} @catch (NSException *exception) {
Modified: tags/Safari-606.1.20/Source/WebKit/UIProcess/API/C/mac/WKContextPrivateMac.mm (232554 => 232555)
--- tags/Safari-606.1.20/Source/WebKit/UIProcess/API/C/mac/WKContextPrivateMac.mm 2018-06-06 20:13:16 UTC (rev 232554)
+++ tags/Safari-606.1.20/Source/WebKit/UIProcess/API/C/mac/WKContextPrivateMac.mm 2018-06-06 20:13:34 UTC (rev 232555)
@@ -49,7 +49,7 @@
#if PLATFORM(IOS)
return false;
#else
- return WebCore::PluginBlacklist::isPluginUpdateAvailable((__bridge NSString *)adoptCF(WKStringCopyCFString(kCFAllocatorDefault, plugInBundleIdentifierRef)).get());
+ return WebCore::PluginBlacklist::isPluginUpdateAvailable((NSString *)adoptCF(WKStringCopyCFString(kCFAllocatorDefault, plugInBundleIdentifierRef)).get());
#endif
}
Modified: tags/Safari-606.1.20/Source/WebKit/UIProcess/API/Cocoa/WKBrowsingContextController.mm (232554 => 232555)
--- tags/Safari-606.1.20/Source/WebKit/UIProcess/API/Cocoa/WKBrowsingContextController.mm 2018-06-06 20:13:16 UTC (rev 232554)
+++ tags/Safari-606.1.20/Source/WebKit/UIProcess/API/Cocoa/WKBrowsingContextController.mm 2018-06-06 20:13:34 UTC (rev 232555)
@@ -296,7 +296,7 @@
- (NSArray *)certificateChain
{
if (WebFrameProxy* mainFrame = _page->mainFrame())
- return mainFrame->certificateInfo() ? (__bridge NSArray *)mainFrame->certificateInfo()->certificateInfo().certificateChain() : nil;
+ return mainFrame->certificateInfo() ? (NSArray *)mainFrame->certificateInfo()->certificateInfo().certificateChain() : nil;
return nil;
}
@@ -328,7 +328,7 @@
if (!WKFrameIsMainFrame(frame))
return;
- auto browsingContext = (__bridge WKBrowsingContextController *)clientInfo;
+ WKBrowsingContextController *browsingContext = (WKBrowsingContextController *)clientInfo;
auto loadDelegate = browsingContext->_loadDelegate.get();
if ([loadDelegate respondsToSelector:@selector(browsingContextControllerDidStartProvisionalLoad:)])
@@ -340,7 +340,7 @@
if (!WKFrameIsMainFrame(frame))
return;
- auto browsingContext = (__bridge WKBrowsingContextController *)clientInfo;
+ WKBrowsingContextController *browsingContext = (WKBrowsingContextController *)clientInfo;
auto loadDelegate = browsingContext->_loadDelegate.get();
if ([loadDelegate respondsToSelector:@selector(browsingContextControllerDidReceiveServerRedirectForProvisionalLoad:)])
@@ -352,7 +352,7 @@
if (!WKFrameIsMainFrame(frame))
return;
- auto browsingContext = (__bridge WKBrowsingContextController *)clientInfo;
+ WKBrowsingContextController *browsingContext = (WKBrowsingContextController *)clientInfo;
auto loadDelegate = browsingContext->_loadDelegate.get();
if ([loadDelegate respondsToSelector:@selector(browsingContextController:didFailProvisionalLoadWithError:)])
@@ -364,7 +364,7 @@
if (!WKFrameIsMainFrame(frame))
return;
- auto browsingContext = (__bridge WKBrowsingContextController *)clientInfo;
+ WKBrowsingContextController *browsingContext = (WKBrowsingContextController *)clientInfo;
auto loadDelegate = browsingContext->_loadDelegate.get();
if ([loadDelegate respondsToSelector:@selector(browsingContextControllerDidCommitLoad:)])
@@ -376,7 +376,7 @@
if (!WKFrameIsMainFrame(frame))
return;
- auto browsingContext = (__bridge WKBrowsingContextController *)clientInfo;
+ WKBrowsingContextController *browsingContext = (WKBrowsingContextController *)clientInfo;
auto loadDelegate = browsingContext->_loadDelegate.get();
if ([loadDelegate respondsToSelector:@selector(browsingContextControllerDidFinishLoad:)])
@@ -388,7 +388,7 @@
if (!WKFrameIsMainFrame(frame))
return;
- auto browsingContext = (__bridge WKBrowsingContextController *)clientInfo;
+ WKBrowsingContextController *browsingContext = (WKBrowsingContextController *)clientInfo;
auto loadDelegate = browsingContext->_loadDelegate.get();
if ([loadDelegate respondsToSelector:@selector(browsingContextController:didFailLoadWithError:)])
@@ -397,7 +397,7 @@
static bool canAuthenticateAgainstProtectionSpaceInFrame(WKPageRef page, WKFrameRef frame, WKProtectionSpaceRef protectionSpace, const void *clientInfo)
{
- auto browsingContext = (__bridge WKBrowsingContextController *)clientInfo;
+ WKBrowsingContextController *browsingContext = (WKBrowsingContextController *)clientInfo;
auto loadDelegate = browsingContext->_loadDelegate.get();
if ([loadDelegate respondsToSelector:@selector(browsingContextController:canAuthenticateAgainstProtectionSpace:)])
@@ -408,7 +408,7 @@
static void didReceiveAuthenticationChallengeInFrame(WKPageRef page, WKFrameRef frame, WKAuthenticationChallengeRef authenticationChallenge, const void *clientInfo)
{
- auto browsingContext = (__bridge WKBrowsingContextController *)clientInfo;
+ WKBrowsingContextController *browsingContext = (WKBrowsingContextController *)clientInfo;
auto loadDelegate = browsingContext->_loadDelegate.get();
if ([loadDelegate respondsToSelector:@selector(browsingContextController:didReceiveAuthenticationChallenge:)])
@@ -417,7 +417,7 @@
static void didStartProgress(WKPageRef page, const void* clientInfo)
{
- auto browsingContext = (__bridge WKBrowsingContextController *)clientInfo;
+ WKBrowsingContextController *browsingContext = (WKBrowsingContextController *)clientInfo;
auto loadDelegate = browsingContext->_loadDelegate.get();
if ([loadDelegate respondsToSelector:@selector(browsingContextControllerDidStartProgress:)])
@@ -426,7 +426,7 @@
static void didChangeProgress(WKPageRef page, const void* clientInfo)
{
- auto browsingContext = (__bridge WKBrowsingContextController *)clientInfo;
+ WKBrowsingContextController *browsingContext = (WKBrowsingContextController *)clientInfo;
auto loadDelegate = browsingContext->_loadDelegate.get();
if ([loadDelegate respondsToSelector:@selector(browsingContextController:estimatedProgressChangedTo:)])
@@ -435,7 +435,7 @@
static void didFinishProgress(WKPageRef page, const void* clientInfo)
{
- auto browsingContext = (__bridge WKBrowsingContextController *)clientInfo;
+ WKBrowsingContextController *browsingContext = (WKBrowsingContextController *)clientInfo;
auto loadDelegate = browsingContext->_loadDelegate.get();
if ([loadDelegate respondsToSelector:@selector(browsingContextControllerDidFinishProgress:)])
@@ -444,7 +444,7 @@
static void didChangeBackForwardList(WKPageRef page, WKBackForwardListItemRef addedItem, WKArrayRef removedItems, const void *clientInfo)
{
- auto browsingContext = (__bridge WKBrowsingContextController *)clientInfo;
+ WKBrowsingContextController *browsingContext = (WKBrowsingContextController *)clientInfo;
auto loadDelegate = browsingContext->_loadDelegate.get();
if (![loadDelegate respondsToSelector:@selector(browsingContextControllerDidChangeBackForwardList:addedItem:removedItems:)])
@@ -457,7 +457,7 @@
static void processDidCrash(WKPageRef page, const void* clientInfo)
{
- auto browsingContext = (__bridge WKBrowsingContextController *)clientInfo;
+ WKBrowsingContextController *browsingContext = (WKBrowsingContextController *)clientInfo;
auto loadDelegate = browsingContext->_loadDelegate.get();
if ([loadDelegate respondsToSelector:@selector(browsingContextControllerWebProcessDidCrash:)])
@@ -470,7 +470,7 @@
memset(&loaderClient, 0, sizeof(loaderClient));
loaderClient.base.version = 4;
- loaderClient.base.clientInfo = (__bridge void*)browsingContext;
+ loaderClient.base.clientInfo = browsingContext;
loaderClient.didStartProvisionalLoadForFrame = didStartProvisionalLoadForFrame;
loaderClient.didReceiveServerRedirectForProvisionalLoadForFrame = didReceiveServerRedirectForProvisionalLoadForFrame;
loaderClient.didFailProvisionalLoadWithErrorForFrame = didFailProvisionalLoadWithErrorForFrame;
@@ -520,11 +520,11 @@
memset(&policyClient, 0, sizeof(policyClient));
policyClient.base.version = 2;
- policyClient.base.clientInfo = (__bridge void*)browsingContext;
+ policyClient.base.clientInfo = browsingContext;
policyClient.decidePolicyForNavigationAction = [](WKPageRef page, WKFrameRef frame, WKFrameNavigationType navigationType, WKEventModifiers modifiers, WKEventMouseButton mouseButton, WKFrameRef originatingFrame, WKURLRequestRef originalRequest, WKURLRequestRef request, WKFramePolicyListenerRef listener, WKTypeRef userData, const void* clientInfo)
{
- auto browsingContext = (__bridge WKBrowsingContextController *)clientInfo;
+ WKBrowsingContextController *browsingContext = (WKBrowsingContextController *)clientInfo;
auto policyDelegate = browsingContext->_policyDelegate.get();
if ([policyDelegate respondsToSelector:@selector(browsingContextController:decidePolicyForNavigationAction:decisionHandler:)]) {
@@ -549,7 +549,7 @@
policyClient.decidePolicyForNewWindowAction = [](WKPageRef page, WKFrameRef frame, WKFrameNavigationType navigationType, WKEventModifiers modifiers, WKEventMouseButton mouseButton, WKURLRequestRef request, WKStringRef frameName, WKFramePolicyListenerRef listener, WKTypeRef userData, const void* clientInfo)
{
- auto browsingContext = (__bridge WKBrowsingContextController *)clientInfo;
+ WKBrowsingContextController *browsingContext = (WKBrowsingContextController *)clientInfo;
auto policyDelegate = browsingContext->_policyDelegate.get();
if ([policyDelegate respondsToSelector:@selector(browsingContextController:decidePolicyForNewWindowAction:decisionHandler:)]) {
@@ -569,7 +569,7 @@
policyClient.decidePolicyForResponse = [](WKPageRef page, WKFrameRef frame, WKURLResponseRef response, WKURLRequestRef request, bool canShowMIMEType, WKFramePolicyListenerRef listener, WKTypeRef userData, const void* clientInfo)
{
- auto browsingContext = (__bridge WKBrowsingContextController *)clientInfo;
+ WKBrowsingContextController *browsingContext = (WKBrowsingContextController *)clientInfo;
auto policyDelegate = browsingContext->_policyDelegate.get();
if ([policyDelegate respondsToSelector:@selector(browsingContextController:decidePolicyForResponseAction:decisionHandler:)]) {
Modified: tags/Safari-606.1.20/Source/WebKit/UIProcess/API/Cocoa/WKBrowsingContextGroup.mm (232554 => 232555)
--- tags/Safari-606.1.20/Source/WebKit/UIProcess/API/Cocoa/WKBrowsingContextGroup.mm 2018-06-06 20:13:16 UTC (rev 232554)
+++ tags/Safari-606.1.20/Source/WebKit/UIProcess/API/Cocoa/WKBrowsingContextGroup.mm 2018-06-06 20:13:34 UTC (rev 232555)
@@ -124,7 +124,7 @@
for (id entry in array) {
if ([entry isKindOfClass:[NSString class]])
- strings.uncheckedAppend(adoptRef(toImpl(WKStringCreateWithCFString((__bridge CFStringRef)entry))));
+ strings.uncheckedAppend(adoptRef(toImpl(WKStringCreateWithCFString((CFStringRef)entry))));
}
return toAPI(&API::Array::create(WTFMove(strings)).leakRef());
@@ -135,8 +135,8 @@
if (!source)
CRASH();
- WKRetainPtr<WKStringRef> wkSource = adoptWK(WKStringCreateWithCFString((__bridge CFStringRef)source));
- WKRetainPtr<WKURLRef> wkBaseURL = adoptWK(WKURLCreateWithCFURL((__bridge CFURLRef)baseURL));
+ WKRetainPtr<WKStringRef> wkSource = adoptWK(WKStringCreateWithCFString((CFStringRef)source));
+ WKRetainPtr<WKURLRef> wkBaseURL = adoptWK(WKURLCreateWithCFURL((CFURLRef)baseURL));
auto wkWhitelist = createWKArray(whitelist);
auto wkBlacklist = createWKArray(blacklist);
WKUserContentInjectedFrames injectedFrames = mainFrameOnly ? kWKInjectInTopFrameOnly : kWKInjectInAllFrames;
@@ -154,8 +154,8 @@
if (!source)
CRASH();
- WKRetainPtr<WKStringRef> wkSource = adoptWK(WKStringCreateWithCFString((__bridge CFStringRef)source));
- WKRetainPtr<WKURLRef> wkBaseURL = adoptWK(WKURLCreateWithCFURL((__bridge CFURLRef)baseURL));
+ WKRetainPtr<WKStringRef> wkSource = adoptWK(WKStringCreateWithCFString((CFStringRef)source));
+ WKRetainPtr<WKURLRef> wkBaseURL = adoptWK(WKURLCreateWithCFURL((CFURLRef)baseURL));
auto wkWhitelist = createWKArray(whitelist);
auto wkBlacklist = createWKArray(blacklist);
WKUserContentInjectedFrames injectedFrames = mainFrameOnly ? kWKInjectInTopFrameOnly : kWKInjectInAllFrames;
Modified: tags/Safari-606.1.20/Source/WebKit/UIProcess/API/Cocoa/WKConnection.mm (232554 => 232555)
--- tags/Safari-606.1.20/Source/WebKit/UIProcess/API/Cocoa/WKConnection.mm 2018-06-06 20:13:16 UTC (rev 232554)
+++ tags/Safari-606.1.20/Source/WebKit/UIProcess/API/Cocoa/WKConnection.mm 2018-06-06 20:13:34 UTC (rev 232555)
@@ -51,7 +51,7 @@
static void didReceiveMessage(WKConnectionRef, WKStringRef messageName, WKTypeRef messageBody, const void* clientInfo)
{
- auto connection = (__bridge WKConnection *)clientInfo;
+ WKConnection *connection = (WKConnection *)clientInfo;
auto delegate = connection->_delegate.get();
if ([delegate respondsToSelector:@selector(connection:didReceiveMessageWithName:body:)]) {
@@ -63,7 +63,7 @@
static void didClose(WKConnectionRef, const void* clientInfo)
{
- auto connection = (__bridge WKConnection *)clientInfo;
+ WKConnection *connection = (WKConnection *)clientInfo;
auto delegate = connection->_delegate.get();
if ([delegate respondsToSelector:@selector(connectionDidClose:)])
@@ -76,7 +76,7 @@
memset(&client, 0, sizeof(client));
client.base.version = 0;
- client.base.clientInfo = (__bridge void*)wrapper;
+ client.base.clientInfo = wrapper;
client.didReceiveMessage = didReceiveMessage;
client.didClose = didClose;
Modified: tags/Safari-606.1.20/Source/WebKit/UIProcess/API/Cocoa/WKProcessGroup.mm (232554 => 232555)
--- tags/Safari-606.1.20/Source/WebKit/UIProcess/API/Cocoa/WKProcessGroup.mm 2018-06-06 20:13:16 UTC (rev 232554)
+++ tags/Safari-606.1.20/Source/WebKit/UIProcess/API/Cocoa/WKProcessGroup.mm 2018-06-06 20:13:34 UTC (rev 232555)
@@ -66,7 +66,7 @@
static void didCreateConnection(WKContextRef, WKConnectionRef connectionRef, const void* clientInfo)
{
- auto processGroup = (__bridge WKProcessGroup *)clientInfo;
+ WKProcessGroup *processGroup = (WKProcessGroup *)clientInfo;
auto delegate = processGroup->_delegate.get();
if ([delegate respondsToSelector:@selector(processGroup:didCreateConnectionToWebProcessPlugIn:)])
@@ -87,7 +87,7 @@
static WKTypeRef getInjectedBundleInitializationUserData(WKContextRef, const void* clientInfo)
{
- auto processGroup = (__bridge WKProcessGroup *)clientInfo;
+ WKProcessGroup *processGroup = (WKProcessGroup *)clientInfo;
auto delegate = processGroup->_delegate.get();
if ([delegate respondsToSelector:@selector(processGroupWillCreateConnectionToWebProcessPlugIn:)]) {
@@ -105,7 +105,7 @@
memset(&injectedBundleClient, 0, sizeof(injectedBundleClient));
injectedBundleClient.base.version = 1;
- injectedBundleClient.base.clientInfo = (__bridge void*)processGroup;
+ injectedBundleClient.base.clientInfo = processGroup;
injectedBundleClient.getInjectedBundleInitializationUserData = getInjectedBundleInitializationUserData;
WKContextSetInjectedBundleClient(contextRef, &injectedBundleClient.base);
@@ -223,7 +223,7 @@
- (void)_setAllowsSpecificHTTPSCertificate:(NSArray *)certificateChain forHost:(NSString *)host
{
- _processPool->allowSpecificHTTPSCertificateForHost(WebCertificateInfo::create(WebCore::CertificateInfo((__bridge CFArrayRef)certificateChain)).ptr(), host);
+ _processPool->allowSpecificHTTPSCertificateForHost(WebCertificateInfo::create(WebCore::CertificateInfo((CFArrayRef)certificateChain)).ptr(), host);
}
#if PLATFORM(IOS)
Modified: tags/Safari-606.1.20/Source/WebKit/UIProcess/API/Cocoa/WKProcessPool.mm (232554 => 232555)
--- tags/Safari-606.1.20/Source/WebKit/UIProcess/API/Cocoa/WKProcessPool.mm 2018-06-06 20:13:16 UTC (rev 232554)
+++ tags/Safari-606.1.20/Source/WebKit/UIProcess/API/Cocoa/WKProcessPool.mm 2018-06-06 20:13:34 UTC (rev 232555)
@@ -179,7 +179,7 @@
- (void)_setAllowsSpecificHTTPSCertificate:(NSArray *)certificateChain forHost:(NSString *)host
{
- _processPool->allowSpecificHTTPSCertificateForHost(WebKit::WebCertificateInfo::create(WebCore::CertificateInfo((__bridge CFArrayRef)certificateChain)).ptr(), host);
+ _processPool->allowSpecificHTTPSCertificateForHost(WebKit::WebCertificateInfo::create(WebCore::CertificateInfo((CFArrayRef)certificateChain)).ptr(), host);
}
- (void)_registerURLSchemeServiceWorkersCanHandle:(NSString *)scheme
Modified: tags/Safari-606.1.20/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm (232554 => 232555)
--- tags/Safari-606.1.20/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm 2018-06-06 20:13:16 UTC (rev 232554)
+++ tags/Safari-606.1.20/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm 2018-06-06 20:13:34 UTC (rev 232555)
@@ -302,12 +302,12 @@
- (void)_setProxyConfiguration:(NSDictionary *)configuration
{
- _websiteDataStore->websiteDataStore().setProxyConfiguration((__bridge CFDictionaryRef)configuration);
+ _websiteDataStore->websiteDataStore().setProxyConfiguration((CFDictionaryRef)configuration);
}
- (NSDictionary *)_proxyConfiguration
{
- return (__bridge NSDictionary *)_websiteDataStore->websiteDataStore().proxyConfiguration();
+ return (NSDictionary *)_websiteDataStore->websiteDataStore().proxyConfiguration();
}
- (void)_resourceLoadStatisticsSetShouldSubmitTelemetry:(BOOL)value
Modified: tags/Safari-606.1.20/Source/WebKit/UIProcess/API/Cocoa/_WKThumbnailView.mm (232554 => 232555)
--- tags/Safari-606.1.20/Source/WebKit/UIProcess/API/Cocoa/_WKThumbnailView.mm 2018-06-06 20:13:16 UTC (rev 232554)
+++ tags/Safari-606.1.20/Source/WebKit/UIProcess/API/Cocoa/_WKThumbnailView.mm 2018-06-06 20:13:34 UTC (rev 232555)
@@ -197,7 +197,7 @@
_waitingForSnapshot = NO;
self.layer.sublayers = @[];
self.layer.contentsGravity = kCAGravityResizeAspectFill;
- self.layer.contents = (__bridge id)image;
+ self.layer.contents = (id)image;
// If we got a scale change while snapshotting, we'll take another snapshot once the first one returns.
if (_snapshotWasDeferred) {
Modified: tags/Safari-606.1.20/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentFilter.mm (232554 => 232555)
--- tags/Safari-606.1.20/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentFilter.mm 2018-06-06 20:13:16 UTC (rev 232554)
+++ tags/Safari-606.1.20/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentFilter.mm 2018-06-06 20:13:34 UTC (rev 232555)
@@ -28,7 +28,6 @@
#if WK_API_ENABLED
-#include "WKContentRuleListInternal.h"
#include "WebCompiledContentRuleList.h"
#include <WebCore/ContentExtensionCompiler.h>
#include <WebCore/ContentExtensionError.h>
Modified: tags/Safari-606.1.20/Source/WebKit/UIProcess/Authentication/mac/WebCredentialMac.mm (232554 => 232555)
--- tags/Safari-606.1.20/Source/WebKit/UIProcess/Authentication/mac/WebCredentialMac.mm 2018-06-06 20:13:16 UTC (rev 232554)
+++ tags/Safari-606.1.20/Source/WebKit/UIProcess/Authentication/mac/WebCredentialMac.mm 2018-06-06 20:13:34 UTC (rev 232555)
@@ -67,7 +67,7 @@
#endif
ASSERT(certificateInfo.type() == CertificateInfo::Type::CertificateChain);
CFIndex chainCount = CFArrayGetCount(certificateInfo.certificateChain());
- return chainCount > 1 ? [(__bridge NSArray *)certificateInfo.certificateChain() subarrayWithRange:NSMakeRange(1, chainCount - 1)] : nil;
+ return chainCount > 1 ? [(NSArray *)certificateInfo.certificateChain() subarrayWithRange:NSMakeRange(1, chainCount - 1)] : nil;
}
WebCredential::WebCredential(WebCertificateInfo* certificateInfo)
Modified: tags/Safari-606.1.20/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm (232554 => 232555)
--- tags/Safari-606.1.20/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2018-06-06 20:13:16 UTC (rev 232554)
+++ tags/Safari-606.1.20/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2018-06-06 20:13:34 UTC (rev 232555)
@@ -479,7 +479,7 @@
String WebProcessPool::legacyPlatformDefaultNetworkCacheDirectory()
{
- NSString *cachePath = CFBridgingRelease(_CFURLCacheCopyCacheDirectory([[NSURLCache sharedURLCache] _CFURLCache]));
+ RetainPtr<NSString> cachePath = adoptNS((NSString *)_CFURLCacheCopyCacheDirectory([[NSURLCache sharedURLCache] _CFURLCache]));
if (!cachePath)
cachePath = @"~/Library/Caches/com.apple.WebKit.WebProcess";
@@ -589,7 +589,8 @@
static dispatch_once_t once;
dispatch_once(&once, ^{
NSString *identifier = [NSString stringWithFormat:@"%@.PrivateBrowsing", [[NSBundle mainBundle] bundleIdentifier]];
- session = createPrivateStorageSession((__bridge CFStringRef)identifier);
+
+ session = createPrivateStorageSession((CFStringRef)identifier);
});
return session;
Modified: tags/Safari-606.1.20/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm (232554 => 232555)
--- tags/Safari-606.1.20/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm 2018-06-06 20:13:16 UTC (rev 232554)
+++ tags/Safari-606.1.20/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm 2018-06-06 20:13:34 UTC (rev 232555)
@@ -3895,7 +3895,7 @@
// FIXME: need to support NSRTFDPboardType
if ([type isEqual:WebCore::legacyTIFFPasteboardType()] && m_promisedImage) {
- [pasteboard setData:(__bridge NSData *)m_promisedImage->tiffRepresentation() forType:WebCore::legacyTIFFPasteboardType()];
+ [pasteboard setData:(NSData *)m_promisedImage->tiffRepresentation() forType:WebCore::legacyTIFFPasteboardType()];
m_promisedImage = nullptr;
}
}
Modified: tags/Safari-606.1.20/Source/WebKit/UIProcess/Plugins/mac/PluginInfoStoreMac.mm (232554 => 232555)
--- tags/Safari-606.1.20/Source/WebKit/UIProcess/Plugins/mac/PluginInfoStoreMac.mm 2018-06-06 20:13:16 UTC (rev 232554)
+++ tags/Safari-606.1.20/Source/WebKit/UIProcess/Plugins/mac/PluginInfoStoreMac.mm 2018-06-06 20:13:34 UTC (rev 232555)
@@ -60,9 +60,9 @@
Vector<String> pluginPaths;
RetainPtr<CFStringRef> directoryCFString = directory.createCFString();
- NSArray *filenames = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:(__bridge NSString *)directoryCFString.get() error:nil];
+ NSArray *filenames = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:(NSString *)directoryCFString.get() error:nil];
for (NSString *filename in filenames)
- pluginPaths.append([(__bridge NSString *)directoryCFString.get() stringByAppendingPathComponent:filename]);
+ pluginPaths.append([(NSString *)directoryCFString.get() stringByAppendingPathComponent:filename]);
return pluginPaths;
}
Modified: tags/Safari-606.1.20/Source/WebKit/UIProcess/RemoteLayerTree/RemoteLayerTreeHost.mm (232554 => 232555)
--- tags/Safari-606.1.20/Source/WebKit/UIProcess/RemoteLayerTree/RemoteLayerTreeHost.mm 2018-06-06 20:13:16 UTC (rev 232554)
+++ tags/Safari-606.1.20/Source/WebKit/UIProcess/RemoteLayerTree/RemoteLayerTreeHost.mm 2018-06-06 20:13:34 UTC (rev 232555)
@@ -294,7 +294,7 @@
static void recursivelyMapIOSurfaceBackingStore(CALayer *layer)
{
if (layer.contents && CFGetTypeID(layer.contents) == CAMachPortGetTypeID()) {
- MachSendRight port = MachSendRight::create(CAMachPortGetPort((__bridge CAMachPortRef)layer.contents));
+ MachSendRight port = MachSendRight::create(CAMachPortGetPort((CAMachPortRef)layer.contents));
auto surface = WebCore::IOSurface::createFromSendRight(WTFMove(port), sRGBColorSpaceRef());
layer.contents = surface ? surface->asLayerContents() : nil;
}
Modified: tags/Safari-606.1.20/Source/WebKit/UIProcess/mac/ViewGestureControllerMac.mm (232554 => 232555)
--- tags/Safari-606.1.20/Source/WebKit/UIProcess/mac/ViewGestureControllerMac.mm 2018-06-06 20:13:16 UTC (rev 232554)
+++ tags/Safari-606.1.20/Source/WebKit/UIProcess/mac/ViewGestureControllerMac.mm 2018-06-06 20:13:34 UTC (rev 232555)
@@ -615,22 +615,22 @@
m_swipeShadowLayer = adoptNS([[CAGradientLayer alloc] init]);
[m_swipeShadowLayer setName:@"Gesture Swipe Shadow Layer"];
[m_swipeShadowLayer setColors:@[
- (__bridge id)adoptCF(CGColorCreateGenericGray(0, 1.)).get(),
- (__bridge id)adoptCF(CGColorCreateGenericGray(0, 0.99)).get(),
- (__bridge id)adoptCF(CGColorCreateGenericGray(0, 0.98)).get(),
- (__bridge id)adoptCF(CGColorCreateGenericGray(0, 0.95)).get(),
- (__bridge id)adoptCF(CGColorCreateGenericGray(0, 0.92)).get(),
- (__bridge id)adoptCF(CGColorCreateGenericGray(0, 0.82)).get(),
- (__bridge id)adoptCF(CGColorCreateGenericGray(0, 0.71)).get(),
- (__bridge id)adoptCF(CGColorCreateGenericGray(0, 0.46)).get(),
- (__bridge id)adoptCF(CGColorCreateGenericGray(0, 0.35)).get(),
- (__bridge id)adoptCF(CGColorCreateGenericGray(0, 0.25)).get(),
- (__bridge id)adoptCF(CGColorCreateGenericGray(0, 0.17)).get(),
- (__bridge id)adoptCF(CGColorCreateGenericGray(0, 0.11)).get(),
- (__bridge id)adoptCF(CGColorCreateGenericGray(0, 0.07)).get(),
- (__bridge id)adoptCF(CGColorCreateGenericGray(0, 0.04)).get(),
- (__bridge id)adoptCF(CGColorCreateGenericGray(0, 0.01)).get(),
- (__bridge id)adoptCF(CGColorCreateGenericGray(0, 0.)).get(),
+ (id)adoptCF(CGColorCreateGenericGray(0, 1.)).get(),
+ (id)adoptCF(CGColorCreateGenericGray(0, 0.99)).get(),
+ (id)adoptCF(CGColorCreateGenericGray(0, 0.98)).get(),
+ (id)adoptCF(CGColorCreateGenericGray(0, 0.95)).get(),
+ (id)adoptCF(CGColorCreateGenericGray(0, 0.92)).get(),
+ (id)adoptCF(CGColorCreateGenericGray(0, 0.82)).get(),
+ (id)adoptCF(CGColorCreateGenericGray(0, 0.71)).get(),
+ (id)adoptCF(CGColorCreateGenericGray(0, 0.46)).get(),
+ (id)adoptCF(CGColorCreateGenericGray(0, 0.35)).get(),
+ (id)adoptCF(CGColorCreateGenericGray(0, 0.25)).get(),
+ (id)adoptCF(CGColorCreateGenericGray(0, 0.17)).get(),
+ (id)adoptCF(CGColorCreateGenericGray(0, 0.11)).get(),
+ (id)adoptCF(CGColorCreateGenericGray(0, 0.07)).get(),
+ (id)adoptCF(CGColorCreateGenericGray(0, 0.04)).get(),
+ (id)adoptCF(CGColorCreateGenericGray(0, 0.01)).get(),
+ (id)adoptCF(CGColorCreateGenericGray(0, 0.)).get(),
]];
[m_swipeShadowLayer setLocations:@[
@0,
Modified: tags/Safari-606.1.20/Source/WebKit/UIProcess/mac/WKFullScreenWindowController.mm (232554 => 232555)
--- tags/Safari-606.1.20/Source/WebKit/UIProcess/mac/WKFullScreenWindowController.mm 2018-06-06 20:13:16 UTC (rev 232554)
+++ tags/Safari-606.1.20/Source/WebKit/UIProcess/mac/WKFullScreenWindowController.mm 2018-06-06 20:13:34 UTC (rev 232555)
@@ -249,7 +249,7 @@
[_webViewPlaceholder setAction:@selector(cancelOperation:)];
}
[_webViewPlaceholder setTarget:nil];
- [_webViewPlaceholder setContents:(__bridge id)webViewContents.get()];
+ [_webViewPlaceholder setContents:(id)webViewContents.get()];
self.savedConstraints = _webView.superview.constraints;
[self _replaceView:_webView with:_webViewPlaceholder.get()];
Modified: tags/Safari-606.1.20/Source/WebKit/UIProcess/mac/WebPopupMenuProxyMac.mm (232554 => 232555)
--- tags/Safari-606.1.20/Source/WebKit/UIProcess/mac/WebPopupMenuProxyMac.mm 2018-06-06 20:13:16 UTC (rev 232554)
+++ tags/Safari-606.1.20/Source/WebKit/UIProcess/mac/WebPopupMenuProxyMac.mm 2018-06-06 20:13:34 UTC (rev 232555)
@@ -102,7 +102,7 @@
ASSERT(hasProcessPrivilege(ProcessPrivilege::CanCommunicateWithWindowServer));
NSFont *font;
if (data.fontInfo.fontAttributeDictionary) {
- NSFontDescriptor *fontDescriptor = [NSFontDescriptor fontDescriptorWithFontAttributes:(__bridge NSDictionary *)data.fontInfo.fontAttributeDictionary.get()];
+ NSFontDescriptor *fontDescriptor = [NSFontDescriptor fontDescriptorWithFontAttributes:(NSDictionary *)data.fontInfo.fontAttributeDictionary.get()];
font = [NSFont fontWithDescriptor:fontDescriptor size:((pageScaleFactor != 1) ? [fontDescriptor pointSize] * pageScaleFactor : 0)];
} else
font = [NSFont menuFontOfSize:0];
Modified: tags/Safari-606.1.20/Source/WebKit/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugIn.mm (232554 => 232555)
--- tags/Safari-606.1.20/Source/WebKit/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugIn.mm 2018-06-06 20:13:16 UTC (rev 232554)
+++ tags/Safari-606.1.20/Source/WebKit/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugIn.mm 2018-06-06 20:13:34 UTC (rev 232555)
@@ -54,7 +54,7 @@
static void didCreatePage(WKBundleRef bundle, WKBundlePageRef page, const void* clientInfo)
{
- auto plugInController = (__bridge WKWebProcessPlugInController *)clientInfo;
+ WKWebProcessPlugInController *plugInController = (WKWebProcessPlugInController *)clientInfo;
id <WKWebProcessPlugIn> principalClassInstance = plugInController->_principalClassInstance.get();
if ([principalClassInstance respondsToSelector:@selector(webProcessPlugIn:didCreateBrowserContextController:)])
@@ -63,7 +63,7 @@
static void willDestroyPage(WKBundleRef bundle, WKBundlePageRef page, const void* clientInfo)
{
- auto plugInController = (__bridge WKWebProcessPlugInController *)clientInfo;
+ WKWebProcessPlugInController *plugInController = (WKWebProcessPlugInController *)clientInfo;
id <WKWebProcessPlugIn> principalClassInstance = plugInController->_principalClassInstance.get();
if ([principalClassInstance respondsToSelector:@selector(webProcessPlugIn:willDestroyBrowserContextController:)])
@@ -76,7 +76,7 @@
memset(&bundleClient, 0, sizeof(bundleClient));
bundleClient.base.version = 1;
- bundleClient.base.clientInfo = (__bridge void*)plugInController;
+ bundleClient.base.clientInfo = plugInController;
bundleClient.didCreatePage = didCreatePage;
bundleClient.willDestroyPage = willDestroyPage;
Modified: tags/Safari-606.1.20/Source/WebKit/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm (232554 => 232555)
--- tags/Safari-606.1.20/Source/WebKit/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm 2018-06-06 20:13:16 UTC (rev 232554)
+++ tags/Safari-606.1.20/Source/WebKit/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm 2018-06-06 20:13:34 UTC (rev 232555)
@@ -84,7 +84,7 @@
static void didStartProvisionalLoadForFrame(WKBundlePageRef page, WKBundleFrameRef frame, WKTypeRef* userDataRef, const void *clientInfo)
{
- auto pluginContextController = (__bridge WKWebProcessPlugInBrowserContextController *)clientInfo;
+ WKWebProcessPlugInBrowserContextController *pluginContextController = (WKWebProcessPlugInBrowserContextController *)clientInfo;
auto loadDelegate = pluginContextController->_loadDelegate.get();
if ([loadDelegate respondsToSelector:@selector(webProcessPlugInBrowserContextController:didStartProvisionalLoadForFrame:)])
@@ -93,7 +93,7 @@
static void didReceiveServerRedirectForProvisionalLoadForFrame(WKBundlePageRef page, WKBundleFrameRef frame, WKTypeRef *userDataRef, const void *clientInfo)
{
- auto pluginContextController = (__bridge WKWebProcessPlugInBrowserContextController *)clientInfo;
+ WKWebProcessPlugInBrowserContextController *pluginContextController = (WKWebProcessPlugInBrowserContextController *)clientInfo;
auto loadDelegate = pluginContextController->_loadDelegate.get();
if ([loadDelegate respondsToSelector:@selector(webProcessPlugInBrowserContextController:didReceiveServerRedirectForProvisionalLoadForFrame:)])
@@ -102,7 +102,7 @@
static void didFinishLoadForFrame(WKBundlePageRef page, WKBundleFrameRef frame, WKTypeRef* userData, const void *clientInfo)
{
- auto pluginContextController = (__bridge WKWebProcessPlugInBrowserContextController *)clientInfo;
+ WKWebProcessPlugInBrowserContextController *pluginContextController = (WKWebProcessPlugInBrowserContextController *)clientInfo;
auto loadDelegate = pluginContextController->_loadDelegate.get();
if ([loadDelegate respondsToSelector:@selector(webProcessPlugInBrowserContextController:didFinishLoadForFrame:)])
@@ -111,7 +111,7 @@
static void globalObjectIsAvailableForFrame(WKBundlePageRef page, WKBundleFrameRef frame, WKBundleScriptWorldRef scriptWorld, const void* clientInfo)
{
- auto pluginContextController = (__bridge WKWebProcessPlugInBrowserContextController *)clientInfo;
+ WKWebProcessPlugInBrowserContextController *pluginContextController = (WKWebProcessPlugInBrowserContextController *)clientInfo;
auto loadDelegate = pluginContextController->_loadDelegate.get();
if ([loadDelegate respondsToSelector:@selector(webProcessPlugInBrowserContextController:globalObjectIsAvailableForFrame:inScriptWorld:)])
@@ -120,7 +120,7 @@
static void didRemoveFrameFromHierarchy(WKBundlePageRef page, WKBundleFrameRef frame, WKTypeRef* userData, const void* clientInfo)
{
- auto pluginContextController = (__bridge WKWebProcessPlugInBrowserContextController *)clientInfo;
+ WKWebProcessPlugInBrowserContextController *pluginContextController = (WKWebProcessPlugInBrowserContextController *)clientInfo;
auto loadDelegate = pluginContextController->_loadDelegate.get();
if ([loadDelegate respondsToSelector:@selector(webProcessPlugInBrowserContextController:didRemoveFrameFromHierarchy:)])
@@ -129,7 +129,7 @@
static void didCommitLoadForFrame(WKBundlePageRef page, WKBundleFrameRef frame, WKTypeRef* userData, const void *clientInfo)
{
- auto pluginContextController = (__bridge WKWebProcessPlugInBrowserContextController *)clientInfo;
+ WKWebProcessPlugInBrowserContextController *pluginContextController = (WKWebProcessPlugInBrowserContextController *)clientInfo;
auto loadDelegate = pluginContextController->_loadDelegate.get();
if ([loadDelegate respondsToSelector:@selector(webProcessPlugInBrowserContextController:didCommitLoadForFrame:)])
@@ -138,7 +138,7 @@
static void didFinishDocumentLoadForFrame(WKBundlePageRef page, WKBundleFrameRef frame, WKTypeRef* userData, const void *clientInfo)
{
- auto pluginContextController = (__bridge WKWebProcessPlugInBrowserContextController *)clientInfo;
+ WKWebProcessPlugInBrowserContextController *pluginContextController = (WKWebProcessPlugInBrowserContextController *)clientInfo;
auto loadDelegate = pluginContextController->_loadDelegate.get();
if ([loadDelegate respondsToSelector:@selector(webProcessPlugInBrowserContextController:didFinishDocumentLoadForFrame:)])
@@ -147,7 +147,7 @@
static void didFailProvisionalLoadWithErrorForFrame(WKBundlePageRef page, WKBundleFrameRef frame, WKErrorRef wkError, WKTypeRef* userData, const void *clientInfo)
{
- auto pluginContextController = (__bridge WKWebProcessPlugInBrowserContextController *)clientInfo;
+ WKWebProcessPlugInBrowserContextController *pluginContextController = (WKWebProcessPlugInBrowserContextController *)clientInfo;
auto loadDelegate = pluginContextController->_loadDelegate.get();
if ([loadDelegate respondsToSelector:@selector(webProcessPlugInBrowserContextController:didFailProvisionalLoadWithErrorForFrame:error:)])
@@ -156,7 +156,7 @@
static void didFailLoadWithErrorForFrame(WKBundlePageRef page, WKBundleFrameRef frame, WKErrorRef wkError, WKTypeRef* userData, const void *clientInfo)
{
- auto pluginContextController = (__bridge WKWebProcessPlugInBrowserContextController *)clientInfo;
+ WKWebProcessPlugInBrowserContextController *pluginContextController = (WKWebProcessPlugInBrowserContextController *)clientInfo;
auto loadDelegate = pluginContextController->_loadDelegate.get();
if ([loadDelegate respondsToSelector:@selector(webProcessPlugInBrowserContextController:didFailLoadWithErrorForFrame:error:)])
@@ -165,7 +165,7 @@
static void didSameDocumentNavigationForFrame(WKBundlePageRef page, WKBundleFrameRef frame, WKSameDocumentNavigationType type, WKTypeRef* userData, const void *clientInfo)
{
- auto pluginContextController = (__bridge WKWebProcessPlugInBrowserContextController *)clientInfo;
+ WKWebProcessPlugInBrowserContextController *pluginContextController = (WKWebProcessPlugInBrowserContextController *)clientInfo;
auto loadDelegate = pluginContextController->_loadDelegate.get();
if ([loadDelegate respondsToSelector:@selector(webProcessPlugInBrowserContextController:didSameDocumentNavigation:forFrame:)])
@@ -179,7 +179,7 @@
static void didLayoutForFrame(WKBundlePageRef page, WKBundleFrameRef frame, const void* clientInfo)
{
- auto pluginContextController = (__bridge WKWebProcessPlugInBrowserContextController *)clientInfo;
+ WKWebProcessPlugInBrowserContextController *pluginContextController = (WKWebProcessPlugInBrowserContextController *)clientInfo;
auto loadDelegate = pluginContextController->_loadDelegate.get();
if ([loadDelegate respondsToSelector:@selector(webProcessPlugInBrowserContextController:didLayoutForFrame:)])
@@ -188,7 +188,7 @@
static void didReachLayoutMilestone(WKBundlePageRef page, WKLayoutMilestones milestones, WKTypeRef* userData, const void *clientInfo)
{
- auto pluginContextController = (__bridge WKWebProcessPlugInBrowserContextController *)clientInfo;
+ WKWebProcessPlugInBrowserContextController *pluginContextController = (WKWebProcessPlugInBrowserContextController *)clientInfo;
auto loadDelegate = pluginContextController->_loadDelegate.get();
if ([loadDelegate respondsToSelector:@selector(webProcessPlugInBrowserContextController:renderingProgressDidChange:)])
@@ -197,7 +197,7 @@
static void didFirstVisuallyNonEmptyLayoutForFrame(WKBundlePageRef page, WKBundleFrameRef frame, WKTypeRef* userData, const void *clientInfo)
{
- auto pluginContextController = (__bridge WKWebProcessPlugInBrowserContextController *)clientInfo;
+ WKWebProcessPlugInBrowserContextController *pluginContextController = (WKWebProcessPlugInBrowserContextController *)clientInfo;
auto loadDelegate = pluginContextController->_loadDelegate.get();
if ([loadDelegate respondsToSelector:@selector(webProcessPlugInBrowserContextController:didFirstVisuallyNonEmptyLayoutForFrame:)])
@@ -206,7 +206,7 @@
static void didHandleOnloadEventsForFrame(WKBundlePageRef page, WKBundleFrameRef frame, const void* clientInfo)
{
- auto pluginContextController = (__bridge WKWebProcessPlugInBrowserContextController *)clientInfo;
+ WKWebProcessPlugInBrowserContextController *pluginContextController = (WKWebProcessPlugInBrowserContextController *)clientInfo;
auto loadDelegate = pluginContextController->_loadDelegate.get();
if ([loadDelegate respondsToSelector:@selector(webProcessPlugInBrowserContextController:didHandleOnloadEventsForFrame:)])
@@ -215,7 +215,7 @@
static WKStringRef userAgentForURL(WKBundleFrameRef frame, WKURLRef url, const void* clientInfo)
{
- auto pluginContextController = (__bridge WKWebProcessPlugInBrowserContextController *)clientInfo;
+ WKWebProcessPlugInBrowserContextController *pluginContextController = (WKWebProcessPlugInBrowserContextController *)clientInfo;
auto loadDelegate = pluginContextController->_loadDelegate.get();
if ([loadDelegate respondsToSelector:@selector(webProcessPlugInBrowserContextController:frame:userAgentForURL:)]) {
@@ -224,7 +224,8 @@
if (!string)
return nullptr;
- return WKStringCreateWithCFString((__bridge CFStringRef)string);
+ WKStringRef wkString = WKStringCreateWithCFString((CFStringRef)string);
+ return wkString;
}
return nullptr;
@@ -236,7 +237,7 @@
memset(&client, 0, sizeof(client));
client.base.version = 8;
- client.base.clientInfo = (__bridge void*)contextController;
+ client.base.clientInfo = contextController;
client.didStartProvisionalLoadForFrame = didStartProvisionalLoadForFrame;
client.didReceiveServerRedirectForProvisionalLoadForFrame = didReceiveServerRedirectForProvisionalLoadForFrame;
client.didCommitLoadForFrame = didCommitLoadForFrame;
@@ -259,7 +260,7 @@
static WKURLRequestRef willSendRequestForFrame(WKBundlePageRef, WKBundleFrameRef frame, uint64_t resourceIdentifier, WKURLRequestRef request, WKURLResponseRef redirectResponse, const void* clientInfo)
{
- auto pluginContextController = (__bridge WKWebProcessPlugInBrowserContextController *)clientInfo;
+ WKWebProcessPlugInBrowserContextController *pluginContextController = (WKWebProcessPlugInBrowserContextController *)clientInfo;
auto loadDelegate = pluginContextController->_loadDelegate.get();
if ([loadDelegate respondsToSelector:@selector(webProcessPlugInBrowserContextController:frame:willSendRequestForResource:request:redirectResponse:)]) {
@@ -284,7 +285,7 @@
static void didInitiateLoadForResource(WKBundlePageRef, WKBundleFrameRef frame, uint64_t resourceIdentifier, WKURLRequestRef request, bool pageIsProvisionallyLoading, const void* clientInfo)
{
- auto pluginContextController = (__bridge WKWebProcessPlugInBrowserContextController *)clientInfo;
+ WKWebProcessPlugInBrowserContextController *pluginContextController = (WKWebProcessPlugInBrowserContextController *)clientInfo;
auto loadDelegate = pluginContextController->_loadDelegate.get();
if ([loadDelegate respondsToSelector:@selector(webProcessPlugInBrowserContextController:frame:didInitiateLoadForResource:request:pageIsProvisionallyLoading:)]) {
@@ -297,7 +298,7 @@
static void didFinishLoadForResource(WKBundlePageRef, WKBundleFrameRef frame, uint64_t resourceIdentifier, const void* clientInfo)
{
- auto pluginContextController = (__bridge WKWebProcessPlugInBrowserContextController *)clientInfo;
+ WKWebProcessPlugInBrowserContextController *pluginContextController = (WKWebProcessPlugInBrowserContextController *)clientInfo;
auto loadDelegate = pluginContextController->_loadDelegate.get();
if ([loadDelegate respondsToSelector:@selector(webProcessPlugInBrowserContextController:frame:didFinishLoadForResource:)]) {
@@ -309,7 +310,7 @@
static void didFailLoadForResource(WKBundlePageRef, WKBundleFrameRef frame, uint64_t resourceIdentifier, WKErrorRef error, const void* clientInfo)
{
- auto pluginContextController = (__bridge WKWebProcessPlugInBrowserContextController *)clientInfo;
+ WKWebProcessPlugInBrowserContextController *pluginContextController = (WKWebProcessPlugInBrowserContextController *)clientInfo;
auto loadDelegate = pluginContextController->_loadDelegate.get();
if ([loadDelegate respondsToSelector:@selector(webProcessPlugInBrowserContextController:frame:didFailLoadForResource:error:)]) {
@@ -326,7 +327,7 @@
memset(&client, 0, sizeof(client));
client.base.version = 1;
- client.base.clientInfo = (__bridge void*) contextController;
+ client.base.clientInfo = contextController;
client.willSendRequestForFrame = willSendRequestForFrame;
client.didInitiateLoadForResource = didInitiateLoadForResource;
client.didFinishLoadForResource = didFinishLoadForResource;
Modified: tags/Safari-606.1.20/Source/WebKit/WebProcess/InjectedBundle/mac/InjectedBundleMac.mm (232554 => 232555)
--- tags/Safari-606.1.20/Source/WebKit/WebProcess/InjectedBundle/mac/InjectedBundleMac.mm 2018-06-06 20:13:16 UTC (rev 232554)
+++ tags/Safari-606.1.20/Source/WebKit/WebProcess/InjectedBundle/mac/InjectedBundleMac.mm 2018-06-06 20:13:34 UTC (rev 232555)
@@ -73,7 +73,7 @@
return false;
}
- m_platformBundle = [[NSBundle alloc] initWithURL:(__bridge NSURL *)bundleURL.get()];
+ m_platformBundle = [[NSBundle alloc] initWithURL:(NSURL *)bundleURL.get()];
if (!m_platformBundle) {
WTFLogAlways("InjectedBundle::load failed - Could not create the bundle.\n");
return false;
Modified: tags/Safari-606.1.20/Source/WebKit/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm (232554 => 232555)
--- tags/Safari-606.1.20/Source/WebKit/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm 2018-06-06 20:13:16 UTC (rev 232554)
+++ tags/Safari-606.1.20/Source/WebKit/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm 2018-06-06 20:13:34 UTC (rev 232555)
@@ -167,7 +167,7 @@
if (!convertPoint(m_currentMouseEvent->data.mouse.pluginX, m_currentMouseEvent->data.mouse.pluginY, NPCoordinateSpacePlugin, screenX, screenY, NPCoordinateSpaceScreen))
ASSERT_NOT_REACHED();
- _NSPopUpCarbonMenu3((__bridge NSMenu *)npMenu, nil, nil, NSMakePoint(screenX, screenY), -1, nil, 0, nil, NSPopUpMenuTypeContext, nil);
+ _NSPopUpCarbonMenu3(reinterpret_cast<NSMenu *>(npMenu), nil, nil, NSMakePoint(screenX, screenY), -1, nil, 0, nil, NSPopUpMenuTypeContext, nil);
return NPERR_NO_ERROR;
}
Modified: tags/Safari-606.1.20/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.h (232554 => 232555)
--- tags/Safari-606.1.20/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.h 2018-06-06 20:13:16 UTC (rev 232554)
+++ tags/Safari-606.1.20/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.h 2018-06-06 20:13:34 UTC (rev 232555)
@@ -249,10 +249,8 @@
WebCore::IntSize pdfDocumentSize() const { return m_pdfDocumentSize; }
void setPDFDocumentSize(WebCore::IntSize size) { m_pdfDocumentSize = size; }
-#ifdef __OBJC__
NSData *liveData() const;
- NSData *rawData() const { return (__bridge NSData *)m_data.get(); }
-#endif
+ NSData *rawData() const { return (NSData *)m_data.get(); }
WebFrame* webFrame() const { return m_frame; }
Modified: tags/Safari-606.1.20/Source/WebKit/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm (232554 => 232555)
--- tags/Safari-606.1.20/Source/WebKit/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm 2018-06-06 20:13:16 UTC (rev 232554)
+++ tags/Safari-606.1.20/Source/WebKit/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm 2018-06-06 20:13:34 UTC (rev 232555)
@@ -154,7 +154,7 @@
SharedMemory::Handle archiveHandle;
size_t archiveSize = 0;
if (data) {
- auto archiveBuffer = SharedBuffer::create((__bridge NSData *)data.get());
+ RefPtr<SharedBuffer> archiveBuffer = SharedBuffer::create((NSData *)data.get());
RefPtr<SharedMemory> archiveSharedMemoryBuffer = SharedMemory::allocate(archiveBuffer->size());
if (!archiveSharedMemoryBuffer)
return;
Modified: tags/Safari-606.1.20/Source/WebKit/WebProcess/WebPage/RemoteLayerTree/PlatformCALayerRemoteCustom.mm (232554 => 232555)
--- tags/Safari-606.1.20/Source/WebKit/WebProcess/WebPage/RemoteLayerTree/PlatformCALayerRemoteCustom.mm 2018-06-06 20:13:16 UTC (rev 232554)
+++ tags/Safari-606.1.20/Source/WebKit/WebProcess/WebPage/RemoteLayerTree/PlatformCALayerRemoteCustom.mm 2018-06-06 20:13:34 UTC (rev 232555)
@@ -137,12 +137,12 @@
CFTypeRef PlatformCALayerRemoteCustom::contents() const
{
- return (__bridge CFTypeRef)[m_platformLayer contents];
+ return [m_platformLayer contents];
}
void PlatformCALayerRemoteCustom::setContents(CFTypeRef contents)
{
- [m_platformLayer setContents:(__bridge id)contents];
+ [m_platformLayer setContents:(id)contents];
}
void PlatformCALayerRemoteCustom::setNeedsDisplayInRect(const FloatRect& rect)
Modified: tags/Safari-606.1.20/Source/WebKit/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm (232554 => 232555)
--- tags/Safari-606.1.20/Source/WebKit/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2018-06-06 20:13:16 UTC (rev 232554)
+++ tags/Safari-606.1.20/Source/WebKit/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2018-06-06 20:13:34 UTC (rev 232555)
@@ -845,7 +845,7 @@
RetainPtr<CABasicAnimation> shadowPositionAnimation = transientZoomSnapAnimationForKeyPath("position");
[shadowPositionAnimation setToValue:[NSValue valueWithPoint:shadowLayerPositionForFrame(frameView, constrainedOrigin)]];
RetainPtr<CABasicAnimation> shadowPathAnimation = transientZoomSnapAnimationForKeyPath("shadowPath");
- [shadowPathAnimation setToValue:(__bridge id)shadowPath.get()];
+ [shadowPathAnimation setToValue:(id)shadowPath.get()];
[shadowCALayer addAnimation:shadowBoundsAnimation.get() forKey:@"transientZoomCommitShadowBounds"];
[shadowCALayer addAnimation:shadowPositionAnimation.get() forKey:@"transientZoomCommitShadowPosition"];
Modified: tags/Safari-606.1.20/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm (232554 => 232555)
--- tags/Safari-606.1.20/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm 2018-06-06 20:13:16 UTC (rev 232554)
+++ tags/Safari-606.1.20/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm 2018-06-06 20:13:34 UTC (rev 232555)
@@ -734,7 +734,7 @@
layer->setSize(image->size());
layer->setPosition(FloatPoint(0, -image->size().height()));
- layer->platformLayer().contents = (__bridge id)image->bitmap().makeCGImageCopy().get();
+ layer->platformLayer().contents = (id)image->bitmap().makeCGImageCopy().get();
}
void WebPage::setBottomOverhangImage(WebImage* image)
@@ -748,7 +748,7 @@
return;
layer->setSize(image->size());
- layer->platformLayer().contents = (__bridge id)image->bitmap().makeCGImageCopy().get();
+ layer->platformLayer().contents = (id)image->bitmap().makeCGImageCopy().get();
}
void WebPage::updateHeaderAndFooterLayersForDeviceScaleChange(float scaleFactor)
