Title: [171402] branches/safari-600.1-branch/Source/WebKit2
- Revision
- 171402
- Author
- dburk...@apple.com
- Date
- 2014-07-22 22:15:31 -0700 (Tue, 22 Jul 2014)
Log Message
Merge r171194
Modified Paths
Diff
Modified: branches/safari-600.1-branch/Source/WebKit2/ChangeLog (171401 => 171402)
--- branches/safari-600.1-branch/Source/WebKit2/ChangeLog 2014-07-23 05:13:51 UTC (rev 171401)
+++ branches/safari-600.1-branch/Source/WebKit2/ChangeLog 2014-07-23 05:15:31 UTC (rev 171402)
@@ -1,5 +1,20 @@
2014-07-22 Dana Burkart <dburk...@apple.com>
+ Merge r171194.
+
+ 2014-07-17 Brady Eidson <beid...@apple.com>
+
+ Crash in ServicesOverlayController::~ServicesOverlayController.
+ <rdar://problem/17622172> and https://bugs.webkit.org/show_bug.cgi?id=135022
+
+ Reviewed by Tim Horton.
+
+ * WebProcess/WebPage/mac/ServicesOverlayController.mm:
+ (WebKit::ServicesOverlayController::~ServicesOverlayController): Don’t need to uninstall the
+ PageOverlay as it has already been destroyed by this point in WebPage::~WebPage.
+
+2014-07-22 Dana Burkart <dburk...@apple.com>
+
Merge r171191.
2014-07-17 Tim Horton <timothy_hor...@apple.com>
Modified: branches/safari-600.1-branch/Source/WebKit2/WebProcess/WebPage/mac/ServicesOverlayController.mm (171401 => 171402)
--- branches/safari-600.1-branch/Source/WebKit2/WebProcess/WebPage/mac/ServicesOverlayController.mm 2014-07-23 05:13:51 UTC (rev 171401)
+++ branches/safari-600.1-branch/Source/WebKit2/WebProcess/WebPage/mac/ServicesOverlayController.mm 2014-07-23 05:15:31 UTC (rev 171402)
@@ -81,10 +81,6 @@
ServicesOverlayController::~ServicesOverlayController()
{
- if (m_servicesOverlay) {
- ASSERT(m_webPage);
- m_webPage->uninstallPageOverlay(m_servicesOverlay, PageOverlay::FadeMode::DoNotFade);
- }
}
void ServicesOverlayController::pageOverlayDestroyed(PageOverlay*)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
