Title: [147931] tags/Safari-537.35.10/Source/WebCore
- Revision
- 147931
- Author
- [email protected]
- Date
- 2013-04-08 10:42:43 -0700 (Mon, 08 Apr 2013)
Log Message
Merged r147806. <rdar://problem/13591653>
Modified Paths
Diff
Modified: tags/Safari-537.35.10/Source/WebCore/ChangeLog (147930 => 147931)
--- tags/Safari-537.35.10/Source/WebCore/ChangeLog 2013-04-08 17:41:06 UTC (rev 147930)
+++ tags/Safari-537.35.10/Source/WebCore/ChangeLog 2013-04-08 17:42:43 UTC (rev 147931)
@@ -1,5 +1,23 @@
2013-04-08 Lucas Forschler <[email protected]>
+ Merge r147806
+
+ 2013-04-05 Beth Dakin <[email protected]>
+
+ Setting a header or footer should cause a relayout
+ https://bugs.webkit.org/show_bug.cgi?id=114070
+
+ Reviewed by Sam Weinig.
+
+ Mark the RenderView as needing layout in order to adjust everything for the new
+ header/footer.
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::setHeaderHeight):
+ (WebCore::FrameView::setFooterHeight):
+
+2013-04-08 Lucas Forschler <[email protected]>
+
Merge r147659
2013-04-03 Dean Jackson <[email protected]>
Modified: tags/Safari-537.35.10/Source/WebCore/page/FrameView.cpp (147930 => 147931)
--- tags/Safari-537.35.10/Source/WebCore/page/FrameView.cpp 2013-04-08 17:41:06 UTC (rev 147930)
+++ tags/Safari-537.35.10/Source/WebCore/page/FrameView.cpp 2013-04-08 17:42:43 UTC (rev 147931)
@@ -924,6 +924,9 @@
if (m_frame && m_frame->page())
ASSERT(m_frame == m_frame->page()->mainFrame());
m_headerHeight = headerHeight;
+
+ if (RenderView* renderView = this->renderView())
+ renderView->setNeedsLayout(true);
}
void FrameView::setFooterHeight(int footerHeight)
@@ -931,6 +934,9 @@
if (m_frame && m_frame->page())
ASSERT(m_frame == m_frame->page()->mainFrame());
m_footerHeight = footerHeight;
+
+ if (RenderView* renderView = this->renderView())
+ renderView->setNeedsLayout(true);
}
bool FrameView::flushCompositingStateForThisFrame(Frame* rootFrameForFlush)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
