Title: [168806] branches/safari-538.34-branch/Source/WebCore
Diff
Modified: branches/safari-538.34-branch/Source/WebCore/ChangeLog (168805 => 168806)
--- branches/safari-538.34-branch/Source/WebCore/ChangeLog 2014-05-14 07:54:30 UTC (rev 168805)
+++ branches/safari-538.34-branch/Source/WebCore/ChangeLog 2014-05-14 07:56:36 UTC (rev 168806)
@@ -1,5 +1,23 @@
2014-05-14 Lucas Forschler <[email protected]>
+ Merge r168643
+
+ 2014-05-12 Beth Dakin <[email protected]>
+
+ Layer for bottom overhang area needs to be offset by the topContentInset
+ https://bugs.webkit.org/show_bug.cgi?id=132835
+ -and corresponding-
+ <rdar://problem/16641115>
+
+ Reviewed by Simon Fraser.
+
+ Push this layer down by the topContentInset in addition to the root layer height,
+ footer height, and header height.
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::updateLayerForBottomOverhangArea):
+
+2014-05-14 Lucas Forschler <[email protected]>
+
Merge r168602
2014-05-11 Beth Dakin <[email protected]>
Modified: branches/safari-538.34-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp (168805 => 168806)
--- branches/safari-538.34-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp 2014-05-14 07:54:30 UTC (rev 168805)
+++ branches/safari-538.34-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp 2014-05-14 07:56:36 UTC (rev 168806)
@@ -2935,7 +2935,8 @@
m_scrollLayer->addChildBelow(m_layerForBottomOverhangArea.get(), m_rootContentLayer.get());
}
- m_layerForBottomOverhangArea->setPosition(FloatPoint(0, m_rootContentLayer->size().height() + m_renderView.frameView().headerHeight() + m_renderView.frameView().footerHeight()));
+ m_layerForBottomOverhangArea->setPosition(FloatPoint(0, m_rootContentLayer->size().height() + m_renderView.frameView().headerHeight()
+ + m_renderView.frameView().footerHeight() + m_renderView.frameView().topContentInset()));
return m_layerForBottomOverhangArea.get();
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
