Title: [202691] tags/Safari-602.1.39/Source/WebKit/mac
- Revision
- 202691
- Author
- bshaf...@apple.com
- Date
- 2016-06-30 11:18:32 -0700 (Thu, 30 Jun 2016)
Log Message
Merged r202685. rdar://problem/27092107
Modified Paths
Diff
Modified: tags/Safari-602.1.39/Source/WebKit/mac/ChangeLog (202690 => 202691)
--- tags/Safari-602.1.39/Source/WebKit/mac/ChangeLog 2016-06-30 18:15:47 UTC (rev 202690)
+++ tags/Safari-602.1.39/Source/WebKit/mac/ChangeLog 2016-06-30 18:18:32 UTC (rev 202691)
@@ -1,3 +1,22 @@
+2016-06-30 Babak Shafiei <bshaf...@apple.com>
+
+ Merge r202685.
+
+ 2016-06-30 Anders Carlsson <ander...@apple.com>
+
+ Mail crashes on launch at WebCore::PaymentCoordinator::~PaymentCoordinator() + 20
+ https://bugs.webkit.org/show_bug.cgi?id=159306
+ rdar://problem/27092107
+
+ Reviewed by Tim Horton.
+
+ * WebView/WebView.mm:
+ (-[WebView initSimpleHTMLDocumentWithStyle:frame:preferences:groupName:]):
+ Create a WebPaymentCoordinatorClient. Remove an unneeded #import.
+
+ (-[WebView _commonInitializationWithFrameName:groupName:]):
+ Remove an unneeded #import.
+
2016-06-27 Anders Carlsson <ander...@apple.com>
WebKit::WebPaymentCoordinator leak
Modified: tags/Safari-602.1.39/Source/WebKit/mac/WebView/WebView.mm (202690 => 202691)
--- tags/Safari-602.1.39/Source/WebKit/mac/WebView/WebView.mm 2016-06-30 18:15:47 UTC (rev 202690)
+++ tags/Safari-602.1.39/Source/WebKit/mac/WebView/WebView.mm 2016-06-30 18:18:32 UTC (rev 202691)
@@ -1013,10 +1013,6 @@
pageConfiguration.paymentCoordinatorClient = new WebPaymentCoordinatorClient();
#endif
-#if USE(APPLE_INTERNAL_SDK)
-#import <WebKitAdditions/WebViewInitialization.mm>
-#endif
-
pageConfiguration.alternativeTextClient = new WebAlternativeTextClient(self);
pageConfiguration.loaderClientForMainFrame = new WebFrameLoaderClient;
pageConfiguration.progressTrackerClient = new WebProgressTrackerClient(self);
@@ -1256,8 +1252,8 @@
pageConfiguration.dragClient = new WebDragClient(self);
#endif
-#if USE(APPLE_INTERNAL_SDK)
-#import <WebKitAdditions/WebViewInitialization.mm>
+#if ENABLE(APPLE_PAY)
+ pageConfiguration.paymentCoordinatorClient = new WebPaymentCoordinatorClient();
#endif
pageConfiguration.inspectorClient = new WebInspectorClient(self);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
