Diff
Modified: trunk/Source/WebCore/ChangeLog (250521 => 250522)
--- trunk/Source/WebCore/ChangeLog 2019-09-30 18:49:19 UTC (rev 250521)
+++ trunk/Source/WebCore/ChangeLog 2019-09-30 19:10:57 UTC (rev 250522)
@@ -1,3 +1,21 @@
+2019-09-27 Keith Rollin <[email protected]>
+
+ Coalesce or remove PLATFORM(MAC) || PLATFORM(IOS_FAMILY)
+ https://bugs.webkit.org/show_bug.cgi?id=202119
+ <rdar://problem/55638792>
+
+ Unreviewed, address post landing review comments for r248533 from
+ Darin Adler.
+
+ No new tests -- no new or changed functionality.
+
+ * Modules/applepay/cocoa/PaymentContactCocoa.mm:
+ (WebCore::convert):
+ (WebCore::subLocality): Deleted.
+ (WebCore::setSubLocality): Deleted.
+ (WebCore::subAdministrativeArea): Deleted.
+ (WebCore::setSubAdministrativeArea): Deleted.
+
2019-09-30 Antti Koivisto <[email protected]>
RenderLineBreak should use LineLayoutTraversal
Modified: trunk/Source/WebCore/Modules/applepay/cocoa/PaymentContactCocoa.mm (250521 => 250522)
--- trunk/Source/WebCore/Modules/applepay/cocoa/PaymentContactCocoa.mm 2019-09-30 18:49:19 UTC (rev 250521)
+++ trunk/Source/WebCore/Modules/applepay/cocoa/PaymentContactCocoa.mm 2019-09-30 19:10:57 UTC (rev 250522)
@@ -40,26 +40,6 @@
namespace WebCore {
-static NSString *subLocality(CNPostalAddress *address)
-{
- return address.subLocality;
-}
-
-static void setSubLocality(CNMutablePostalAddress *address, NSString *subLocality)
-{
- address.subLocality = subLocality;
-}
-
-static NSString *subAdministrativeArea(CNPostalAddress *address)
-{
- return address.subAdministrativeArea;
-}
-
-static void setSubAdministrativeArea(CNMutablePostalAddress *address, NSString *subAdministrativeArea)
-{
- address.subAdministrativeArea = subAdministrativeArea;
-}
-
static RetainPtr<PKContact> convert(unsigned version, const ApplePayPaymentContact& contact)
{
auto result = adoptNS([PAL::allocPKContactInstance() init]);
@@ -113,13 +93,13 @@
[address setStreet:builder.toString()];
if (!contact.subLocality.isEmpty())
- setSubLocality(address.get(), contact.subLocality);
+ [address setSubLocality:contact.subLocality];
if (!contact.locality.isEmpty())
[address setCity:contact.locality];
if (!contact.postalCode.isEmpty())
[address setPostalCode:contact.postalCode];
if (!contact.subAdministrativeArea.isEmpty())
- setSubAdministrativeArea(address.get(), contact.subAdministrativeArea);
+ [address setSubAdministrativeArea:contact.subAdministrativeArea];
if (!contact.administrativeArea.isEmpty())
[address setState:contact.administrativeArea];
if (!contact.country.isEmpty())
@@ -161,10 +141,10 @@
Vector<String> addressLines = String(postalAddress.street).split('\n');
result.addressLines = WTFMove(addressLines);
}
- result.subLocality = subLocality(postalAddress);
+ result.subLocality = postalAddress.subLocality;
result.locality = postalAddress.city;
result.postalCode = postalAddress.postalCode;
- result.subAdministrativeArea = subAdministrativeArea(postalAddress);
+ result.subAdministrativeArea = postalAddress.subAdministrativeArea;
result.administrativeArea = postalAddress.state;
result.country = postalAddress.country;
result.countryCode = postalAddress.ISOCountryCode;
Modified: trunk/Source/WebCore/PAL/ChangeLog (250521 => 250522)
--- trunk/Source/WebCore/PAL/ChangeLog 2019-09-30 18:49:19 UTC (rev 250521)
+++ trunk/Source/WebCore/PAL/ChangeLog 2019-09-30 19:10:57 UTC (rev 250522)
@@ -1,3 +1,16 @@
+2019-09-27 Keith Rollin <[email protected]>
+
+ Coalesce or remove PLATFORM(MAC) || PLATFORM(IOS_FAMILY)
+ https://bugs.webkit.org/show_bug.cgi?id=202119
+ <rdar://problem/55638792>
+
+ Unreviewed, address post landing review comments for r248533 from
+ Darin Adler.
+
+ * pal/spi/cf/CFNetworkSPI.h:
+ * pal/spi/cocoa/NEFilterSourceSPI.h:
+ * pal/spi/mac/AVFoundationSPI.h:
+
2019-09-24 Keith Rollin <[email protected]>
Remove some support for < iOS 13
Modified: trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h (250521 => 250522)
--- trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h 2019-09-30 18:49:19 UTC (rev 250521)
+++ trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h 2019-09-30 19:10:57 UTC (rev 250522)
@@ -218,7 +218,6 @@
#endif
@end
-#if PLATFORM(COCOA)
@interface NSURLSessionTaskTransactionMetrics ()
@property (copy, readonly) NSString* _remoteAddressAndPort;
@property (copy, readonly) NSUUID* _connectionIdentifier;
@@ -227,7 +226,6 @@
@property (assign, readonly) int64_t _responseBodyBytesReceived;
@property (assign, readonly) int64_t _responseBodyBytesDecoded;
@end
-#endif
#if HAVE(CFNETWORK_NEGOTIATED_SSL_PROTOCOL_CIPHER)
@interface NSURLSessionTaskTransactionMetrics ()
Modified: trunk/Source/WebCore/PAL/pal/spi/cocoa/NEFilterSourceSPI.h (250521 => 250522)
--- trunk/Source/WebCore/PAL/pal/spi/cocoa/NEFilterSourceSPI.h 2019-09-30 18:49:19 UTC (rev 250521)
+++ trunk/Source/WebCore/PAL/pal/spi/cocoa/NEFilterSourceSPI.h 2019-09-30 19:10:57 UTC (rev 250522)
@@ -69,10 +69,8 @@
- (void)receivedData:(NSData *)data decisionHandler:(NEFilterSourceDecisionHandler)decisionHandler;
- (void)finishedLoadingWithDecisionHandler:(NEFilterSourceDecisionHandler)decisionHandler;
- (void)remediateWithDecisionHandler:(NEFilterSourceDecisionHandler)decisionHandler;
-#if PLATFORM(COCOA)
@property (copy) NSString *sourceAppIdentifier;
@property (assign) pid_t sourceAppPid;
-#endif
@end
#endif // !USE(APPLE_INTERNAL_SDK)
Modified: trunk/Source/WebCore/PAL/pal/spi/mac/AVFoundationSPI.h (250521 => 250522)
--- trunk/Source/WebCore/PAL/pal/spi/mac/AVFoundationSPI.h 2019-09-30 18:49:19 UTC (rev 250521)
+++ trunk/Source/WebCore/PAL/pal/spi/mac/AVFoundationSPI.h 2019-09-30 19:10:57 UTC (rev 250522)
@@ -54,7 +54,6 @@
#import <AVFoundation/AVPlayerItem.h>
#import <AVFoundation/AVPlayerLayer.h>
-#if PLATFORM(COCOA)
NS_ASSUME_NONNULL_BEGIN
@interface AVPlayerItem ()
@property (nonatomic, readonly) NSTimeInterval seekableTimeRangesLastModifiedTime NS_AVAILABLE(10_13, 11_0);
@@ -61,7 +60,6 @@
@property (nonatomic, readonly) NSTimeInterval liveUpdateInterval;
@end
NS_ASSUME_NONNULL_END
-#endif // PLATFORM(COCOA)
#if ENABLE(WIRELESS_PLAYBACK_TARGET) || PLATFORM(IOS_FAMILY)
