Title: [149561] trunk/Source/WebKit2
- Revision
- 149561
- Author
- [email protected]
- Date
- 2013-05-04 11:46:20 -0700 (Sat, 04 May 2013)
Log Message
https://bugs.webkit.org/show_bug.cgi?id=115574
Crash using new WKBundlePageSetHeaderBanner() API to set a banner to null
Reviewed by Darin Adler.
Don't call addToPage() on a null banner.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::setHeaderPageBanner):
(WebKit::WebPage::setFooterPageBanner):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (149560 => 149561)
--- trunk/Source/WebKit2/ChangeLog 2013-05-04 16:29:05 UTC (rev 149560)
+++ trunk/Source/WebKit2/ChangeLog 2013-05-04 18:46:20 UTC (rev 149561)
@@ -1,3 +1,15 @@
+2013-05-04 Beth Dakin <[email protected]>
+
+ https://bugs.webkit.org/show_bug.cgi?id=115574
+ Crash using new WKBundlePageSetHeaderBanner() API to set a banner to null
+
+ Reviewed by Darin Adler.
+
+ Don't call addToPage() on a null banner.
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::setHeaderPageBanner):
+ (WebKit::WebPage::setFooterPageBanner):
+
2013-05-03 Alexey Proskuryakov <[email protected]>
<rdar://problem/13806836> Tweak sandbox profile.
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (149560 => 149561)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2013-05-04 16:29:05 UTC (rev 149560)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2013-05-04 18:46:20 UTC (rev 149561)
@@ -1410,13 +1410,13 @@
void WebPage::setHeaderPageBanner(PassRefPtr<PageBanner> pageBanner)
{
- if (m_headerBanner) {
+ if (m_headerBanner)
m_headerBanner->detachFromPage();
- m_headerBanner = 0;
- }
m_headerBanner = pageBanner;
- m_headerBanner->addToPage(PageBanner::Header, this);
+
+ if (m_headerBanner)
+ m_headerBanner->addToPage(PageBanner::Header, this);
}
PageBanner* WebPage::headerPageBanner()
@@ -1426,13 +1426,13 @@
void WebPage::setFooterPageBanner(PassRefPtr<PageBanner> pageBanner)
{
- if (m_footerBanner) {
+ if (m_footerBanner)
m_footerBanner->detachFromPage();
- m_footerBanner = 0;
- }
m_footerBanner = pageBanner;
- m_footerBanner->addToPage(PageBanner::Footer, this);
+
+ if (m_footerBanner)
+ m_footerBanner->addToPage(PageBanner::Footer, this);
}
PageBanner* WebPage::footerPageBanner()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
