Changeset 202685 in webkit

Timestamp:

Jun 30, 2016 10:47:20 AM (8 years ago)

Author:

andersca@apple.com

Message:

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.

Location:

trunk/Source/WebKit/mac

Files:

• ChangeLog (modified) (1 diff)
• WebView/WebView.mm (modified) (2 diffs)

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2016-06-30  Anders Carlsson  <andersca@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  <andersca@apple.com>
 

trunk/Source/WebKit/mac/WebView/WebView.mm

@@ -1014 +1014 @@
 #endif
 
-#if USE(APPLE_INTERNAL_SDK)
-#import <WebKitAdditions/WebViewInitialization.mm>
-#endif
-
     pageConfiguration.alternativeTextClient = new WebAlternativeTextClient(self);
     pageConfiguration.loaderClientForMainFrame = new WebFrameLoaderClient;
@@ -1257 +1253 @@
 #endif
 
-#if USE(APPLE_INTERNAL_SDK)
-#import <WebKitAdditions/WebViewInitialization.mm>
+#if ENABLE(APPLE_PAY)
+    pageConfiguration.paymentCoordinatorClient = new WebPaymentCoordinatorClient();
 #endif