Title: [152658] branches/safari-537-branch/Source/WebKit2
- Revision
- 152658
- Author
- [email protected]
- Date
- 2013-07-15 15:20:42 -0700 (Mon, 15 Jul 2013)
Log Message
Merged r152316. <rdar://problem/13917901>
Modified Paths
Diff
Modified: branches/safari-537-branch/Source/WebKit2/ChangeLog (152657 => 152658)
--- branches/safari-537-branch/Source/WebKit2/ChangeLog 2013-07-15 22:18:12 UTC (rev 152657)
+++ branches/safari-537-branch/Source/WebKit2/ChangeLog 2013-07-15 22:20:42 UTC (rev 152658)
@@ -1,5 +1,20 @@
2013-07-15 Lucas Forschler <[email protected]>
+ Merge r152316
+
+ 2013-07-02 Ada Chan <[email protected]>
+
+ Fix crash when PageBanner::detachFromPage() is called from WebPage::~WebPage().
+ https://bugs.webkit.org/show_bug.cgi?id=118268
+
+ Reviewed by Beth Dakin.
+
+ * WebProcess/WebPage/mac/PageBannerMac.mm:
+ (WebKit::PageBanner::detachFromPage): Add some null checks. m_webPage->corePage()
+ can be null if this method is called after the web page is closed.
+
+2013-07-15 Lucas Forschler <[email protected]>
+
Merge r152249
2013-07-01 Ada Chan <[email protected]>
Modified: branches/safari-537-branch/Source/WebKit2/WebProcess/WebPage/mac/PageBannerMac.mm (152657 => 152658)
--- branches/safari-537-branch/Source/WebKit2/WebProcess/WebPage/mac/PageBannerMac.mm 2013-07-15 22:18:12 UTC (rev 152657)
+++ branches/safari-537-branch/Source/WebKit2/WebProcess/WebPage/mac/PageBannerMac.mm 2013-07-15 22:20:42 UTC (rev 152658)
@@ -81,12 +81,19 @@
void PageBanner::detachFromPage()
{
- // We can hide the banner by removing the parent layer that hosts it.
- if (m_type == Header)
- m_webPage->corePage()->addHeaderWithHeight(0);
- else if (m_type == Footer)
- m_webPage->corePage()->addFooterWithHeight(0);
+ if (!m_webPage)
+ return;
+ // m_webPage->corePage() can be null when this is called from WebPage::~WebPage() after
+ // the web page has been closed.
+ if (m_webPage->corePage()) {
+ // We can hide the banner by removing the parent layer that hosts it.
+ if (m_type == Header)
+ m_webPage->corePage()->addHeaderWithHeight(0);
+ else if (m_type == Footer)
+ m_webPage->corePage()->addFooterWithHeight(0);
+ }
+
m_type = NotSet;
m_webPage = 0;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes