Title: [152657] branches/safari-537-branch/Source/WebKit2
- Revision
- 152657
- Author
- lforsch...@apple.com
- Date
- 2013-07-15 15:18:12 -0700 (Mon, 15 Jul 2013)
Log Message
Merged r152249. <rdar://problem/13917901>
Modified Paths
Diff
Modified: branches/safari-537-branch/Source/WebKit2/ChangeLog (152656 => 152657)
--- branches/safari-537-branch/Source/WebKit2/ChangeLog 2013-07-15 22:15:50 UTC (rev 152656)
+++ branches/safari-537-branch/Source/WebKit2/ChangeLog 2013-07-15 22:18:12 UTC (rev 152657)
@@ -1,3 +1,20 @@
+2013-07-15 Lucas Forschler <lforsch...@apple.com>
+
+ Merge r152249
+
+ 2013-07-01 Ada Chan <adac...@apple.com>
+
+ Properly hide the header and footer banners if they are set to null.
+ https://bugs.webkit.org/show_bug.cgi?id=118219
+
+ Reviewed by Beth Dakin.
+
+ Call Page::addFooterWithHeight(0) to remove the parent layer that hosts the banner when
+ the footer banner is detached. Similarly for the header banner.
+
+ * WebProcess/WebPage/mac/PageBannerMac.mm:
+ (WebKit::PageBanner::detachFromPage):
+
2013-07-12 Lucas Forschler <lforsch...@apple.com>
Merge r152571
Modified: branches/safari-537-branch/Source/WebKit2/WebProcess/WebPage/mac/PageBannerMac.mm (152656 => 152657)
--- branches/safari-537-branch/Source/WebKit2/WebProcess/WebPage/mac/PageBannerMac.mm 2013-07-15 22:15:50 UTC (rev 152656)
+++ branches/safari-537-branch/Source/WebKit2/WebProcess/WebPage/mac/PageBannerMac.mm 2013-07-15 22:18:12 UTC (rev 152657)
@@ -81,6 +81,12 @@
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);
+
m_type = NotSet;
m_webPage = 0;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
