Title: [206673] branches/safari-602.2.14.1-branch/Source/WebCore
- Revision
- 206673
- Author
- [email protected]
- Date
- 2016-09-30 14:30:54 -0700 (Fri, 30 Sep 2016)
Log Message
Merge r205992. rdar://problem/28567561
Modified Paths
Diff
Modified: branches/safari-602.2.14.1-branch/Source/WebCore/ChangeLog (206672 => 206673)
--- branches/safari-602.2.14.1-branch/Source/WebCore/ChangeLog 2016-09-30 21:30:50 UTC (rev 206672)
+++ branches/safari-602.2.14.1-branch/Source/WebCore/ChangeLog 2016-09-30 21:30:54 UTC (rev 206673)
@@ -1,5 +1,15 @@
2016-09-30 Babak Shafiei <[email protected]>
+ Merge r205992. rdar://problem/28567561
+
+ 2016-09-15 Anders Carlsson <[email protected]>
+
+ Fix build.
+
+ * platform/spi/cocoa/PassKitSPI.h:
+
+2016-09-30 Babak Shafiei <[email protected]>
+
Merge r205980. rdar://problem/28567561
2016-09-14 Anders Carlsson <[email protected]>
Modified: branches/safari-602.2.14.1-branch/Source/WebCore/platform/spi/cocoa/PassKitSPI.h (206672 => 206673)
--- branches/safari-602.2.14.1-branch/Source/WebCore/platform/spi/cocoa/PassKitSPI.h 2016-09-30 21:30:50 UTC (rev 206672)
+++ branches/safari-602.2.14.1-branch/Source/WebCore/platform/spi/cocoa/PassKitSPI.h 2016-09-30 21:30:54 UTC (rev 206673)
@@ -223,5 +223,20 @@
NS_ASSUME_NONNULL_END
+#if PLATFORM(MAC) && (!USE(APPLE_INTERNAL_SDK) || !__has_include(<PassKitCore/PKApplePayButton.h>))
+typedef NS_ENUM(NSInteger, PKPaymentButtonStyle) {
+ PKPaymentButtonStyleWhite = 0,
+ PKPaymentButtonStyleWhiteOutline,
+ PKPaymentButtonStyleBlack
+};
+
+typedef NS_ENUM(NSInteger, PKPaymentButtonType) {
+ PKPaymentButtonTypePlain = 0,
+ PKPaymentButtonTypeBuy,
+ PKPaymentButtonTypeSetUp,
+ PKPaymentButtonTypeInStore,
+};
+#endif
+
extern "C"
void PKDrawApplePayButton(_Nonnull CGContextRef, CGRect drawRect, CGFloat scale, PKPaymentButtonType, PKPaymentButtonStyle, NSString * _Nullable languageCode);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
