Diff
Modified: trunk/Source/WebCore/ChangeLog (202569 => 202570)
--- trunk/Source/WebCore/ChangeLog 2016-06-28 15:36:13 UTC (rev 202569)
+++ trunk/Source/WebCore/ChangeLog 2016-06-28 16:45:12 UTC (rev 202570)
@@ -1,3 +1,20 @@
+2016-06-27 Anders Carlsson <[email protected]>
+
+ WebKit::WebPaymentCoordinator leak
+ https://bugs.webkit.org/show_bug.cgi?id=159168
+ rdar://problem/26929772
+
+ Reviewed by Beth Dakin.
+
+ * Modules/applepay/PaymentCoordinator.cpp:
+ (WebCore::PaymentCoordinator::~PaymentCoordinator):
+ Call paymentCoordinatorDestroyed().
+
+ * Modules/applepay/PaymentCoordinatorClient.h:
+ Rename mainFrameDestroyed to paymentCoordinatorDestroyed().
+
+ * loader/EmptyClients.cpp:
+
2016-06-28 Frederic Wang <[email protected]>
Remove anonymous in renderName for all MathML renderers but RenderMathMLOperator
Modified: trunk/Source/WebCore/Modules/applepay/PaymentCoordinator.cpp (202569 => 202570)
--- trunk/Source/WebCore/Modules/applepay/PaymentCoordinator.cpp 2016-06-28 15:36:13 UTC (rev 202569)
+++ trunk/Source/WebCore/Modules/applepay/PaymentCoordinator.cpp 2016-06-28 16:45:12 UTC (rev 202570)
@@ -41,6 +41,7 @@
PaymentCoordinator::~PaymentCoordinator()
{
+ m_client.paymentCoordinatorDestroyed();
}
bool PaymentCoordinator::supportsVersion(unsigned version)
Modified: trunk/Source/WebCore/Modules/applepay/PaymentCoordinatorClient.h (202569 => 202570)
--- trunk/Source/WebCore/Modules/applepay/PaymentCoordinatorClient.h 2016-06-28 15:36:13 UTC (rev 202569)
+++ trunk/Source/WebCore/Modules/applepay/PaymentCoordinatorClient.h 2016-06-28 16:45:12 UTC (rev 202570)
@@ -50,7 +50,7 @@
virtual void completePaymentMethodSelection(Optional<WebCore::PaymentRequest::TotalAndLineItems> newTotalAndItems) = 0;
virtual void completePaymentSession(PaymentAuthorizationStatus) = 0;
virtual void abortPaymentSession() = 0;
- virtual void mainFrameDestroyed() = 0;
+ virtual void paymentCoordinatorDestroyed() = 0;
protected:
virtual ~PaymentCoordinatorClient() { }
Modified: trunk/Source/WebCore/loader/EmptyClients.cpp (202569 => 202570)
--- trunk/Source/WebCore/loader/EmptyClients.cpp 2016-06-28 15:36:13 UTC (rev 202569)
+++ trunk/Source/WebCore/loader/EmptyClients.cpp 2016-06-28 16:45:12 UTC (rev 202570)
@@ -63,7 +63,7 @@
void completePaymentMethodSelection(Optional<WebCore::PaymentRequest::TotalAndLineItems>) override { }
void completePaymentSession(PaymentAuthorizationStatus) override { }
void abortPaymentSession() override { }
- void mainFrameDestroyed() override { }
+ void paymentCoordinatorDestroyed() override { }
};
#endif
Modified: trunk/Source/WebKit/mac/ChangeLog (202569 => 202570)
--- trunk/Source/WebKit/mac/ChangeLog 2016-06-28 15:36:13 UTC (rev 202569)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-06-28 16:45:12 UTC (rev 202570)
@@ -1,3 +1,18 @@
+2016-06-27 Anders Carlsson <[email protected]>
+
+ WebKit::WebPaymentCoordinator leak
+ https://bugs.webkit.org/show_bug.cgi?id=159168
+ rdar://problem/26929772
+
+ Reviewed by Beth Dakin.
+
+ Update for WebCore changes.
+
+ * WebCoreSupport/WebPaymentCoordinatorClient.h:
+ * WebCoreSupport/WebPaymentCoordinatorClient.mm:
+ (WebPaymentCoordinatorClient::paymentCoordinatorDestroyed):
+ (WebPaymentCoordinatorClient::mainFrameDestroyed): Deleted.
+
2016-06-27 Tim Horton <[email protected]>
REGRESSION (r189052): Clipping occurs when using context menu to Look Up words within the Dictionary app
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebPaymentCoordinatorClient.h (202569 => 202570)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebPaymentCoordinatorClient.h 2016-06-28 15:36:13 UTC (rev 202569)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebPaymentCoordinatorClient.h 2016-06-28 16:45:12 UTC (rev 202570)
@@ -46,7 +46,7 @@
void completePaymentMethodSelection(Optional<WebCore::PaymentRequest::TotalAndLineItems>) override;
void completePaymentSession(WebCore::PaymentAuthorizationStatus) override;
void abortPaymentSession() override;
- void mainFrameDestroyed() override;
+ void paymentCoordinatorDestroyed() override;
};
#endif
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebPaymentCoordinatorClient.mm (202569 => 202570)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebPaymentCoordinatorClient.mm 2016-06-28 15:36:13 UTC (rev 202569)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebPaymentCoordinatorClient.mm 2016-06-28 16:45:12 UTC (rev 202570)
@@ -83,7 +83,7 @@
{
}
-void WebPaymentCoordinatorClient::mainFrameDestroyed()
+void WebPaymentCoordinatorClient::paymentCoordinatorDestroyed()
{
delete this;
}
Modified: trunk/Source/WebKit2/ChangeLog (202569 => 202570)
--- trunk/Source/WebKit2/ChangeLog 2016-06-28 15:36:13 UTC (rev 202569)
+++ trunk/Source/WebKit2/ChangeLog 2016-06-28 16:45:12 UTC (rev 202570)
@@ -1,3 +1,18 @@
+2016-06-27 Anders Carlsson <[email protected]>
+
+ WebKit::WebPaymentCoordinator leak
+ https://bugs.webkit.org/show_bug.cgi?id=159168
+ rdar://problem/26929772
+
+ Reviewed by Beth Dakin.
+
+ Update for WebCore changes.
+
+ * WebProcess/ApplePay/WebPaymentCoordinator.cpp:
+ (WebKit::WebPaymentCoordinator::paymentCoordinatorDestroyed):
+ (WebKit::WebPaymentCoordinator::mainFrameDestroyed): Deleted.
+ * WebProcess/ApplePay/WebPaymentCoordinator.h:
+
2016-06-27 Simon Fraser <[email protected]>
Fix TestWebKitAPI crash introduced in r202532.
Modified: trunk/Source/WebKit2/WebProcess/ApplePay/WebPaymentCoordinator.cpp (202569 => 202570)
--- trunk/Source/WebKit2/WebProcess/ApplePay/WebPaymentCoordinator.cpp 2016-06-28 15:36:13 UTC (rev 202569)
+++ trunk/Source/WebKit2/WebProcess/ApplePay/WebPaymentCoordinator.cpp 2016-06-28 16:45:12 UTC (rev 202570)
@@ -123,7 +123,7 @@
m_webPage.send(Messages::WebPaymentCoordinatorProxy::AbortPaymentSession());
}
-void WebPaymentCoordinator::mainFrameDestroyed()
+void WebPaymentCoordinator::paymentCoordinatorDestroyed()
{
delete this;
}
Modified: trunk/Source/WebKit2/WebProcess/ApplePay/WebPaymentCoordinator.h (202569 => 202570)
--- trunk/Source/WebKit2/WebProcess/ApplePay/WebPaymentCoordinator.h 2016-06-28 15:36:13 UTC (rev 202569)
+++ trunk/Source/WebKit2/WebProcess/ApplePay/WebPaymentCoordinator.h 2016-06-28 16:45:12 UTC (rev 202570)
@@ -64,7 +64,7 @@
void completePaymentSession(WebCore::PaymentAuthorizationStatus) override;
void abortPaymentSession() override;
- void mainFrameDestroyed() override;
+ void paymentCoordinatorDestroyed() override;
// IPC::MessageReceiver.
void didReceiveMessage(IPC::Connection&, IPC::MessageDecoder&) override;
