Diff
Modified: trunk/Source/WebCore/ChangeLog (183529 => 183530)
--- trunk/Source/WebCore/ChangeLog 2015-04-29 05:05:48 UTC (rev 183529)
+++ trunk/Source/WebCore/ChangeLog 2015-04-29 05:51:30 UTC (rev 183530)
@@ -1,3 +1,20 @@
+2015-04-28 Simon Fraser <[email protected]>
+
+ Make a non-static version of FrameView::yPositionForRootContentLayer()
+ https://bugs.webkit.org/show_bug.cgi?id=144375
+
+ Reviewed by Andy Estes.
+
+ There were two calls to the static FrameView::yPositionForRootContentLayer()
+ which passed in all the arguments for the same FrameView. Make a member
+ function for convenience.
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::yPositionForRootContentLayer):
+ * page/FrameView.h:
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::updateRootLayerPosition):
+
2015-04-28 Ryuan Choi <[email protected]>
[CoordinatedGraphics] Merge TILED_BACKING_STORE guard with COORDINATED_GRAPHICS
Modified: trunk/Source/WebCore/page/FrameView.cpp (183529 => 183530)
--- trunk/Source/WebCore/page/FrameView.cpp 2015-04-29 05:05:48 UTC (rev 183529)
+++ trunk/Source/WebCore/page/FrameView.cpp 2015-04-29 05:51:30 UTC (rev 183530)
@@ -1688,6 +1688,11 @@
return yPositionForHeaderLayer(scrollPosition, topContentInset) + totalContentsHeight - footerHeight;
}
+float FrameView::yPositionForRootContentLayer() const
+{
+ return yPositionForRootContentLayer(scrollPosition(), topContentInset(), headerHeight());
+}
+
#if PLATFORM(IOS)
LayoutRect FrameView::rectForViewportConstrainedObjects(const LayoutRect& visibleContentRect, const LayoutSize& totalContentsSize, float frameScaleFactor, bool fixedElementsLayoutRelativeToFrame, ScrollBehaviorForFixedElements scrollBehavior)
{
Modified: trunk/Source/WebCore/page/FrameView.h (183529 => 183530)
--- trunk/Source/WebCore/page/FrameView.h 2015-04-29 05:05:48 UTC (rev 183529)
+++ trunk/Source/WebCore/page/FrameView.h 2015-04-29 05:51:30 UTC (rev 183530)
@@ -284,6 +284,8 @@
// on both the main thread and the scrolling thread.
static float yPositionForInsetClipLayer(const FloatPoint& scrollPosition, float topContentInset);
WEBCORE_EXPORT static float yPositionForRootContentLayer(const FloatPoint& scrollPosition, float topContentInset, float headerHeight);
+ WEBCORE_EXPORT float yPositionForRootContentLayer() const;
+
static float yPositionForHeaderLayer(const FloatPoint& scrollPosition, float topContentInset);
static float yPositionForFooterLayer(const FloatPoint& scrollPosition, float topContentInset, float totalContentsHeight, float footerHeight);
Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (183529 => 183530)
--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2015-04-29 05:05:48 UTC (rev 183529)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2015-04-29 05:51:30 UTC (rev 183530)
@@ -2081,8 +2081,7 @@
if (m_rootContentLayer) {
const IntRect& documentRect = m_renderView.documentRect();
m_rootContentLayer->setSize(documentRect.size());
- m_rootContentLayer->setPosition(FloatPoint(documentRect.x(), documentRect.y()
- + FrameView::yPositionForRootContentLayer(m_renderView.frameView().scrollPosition(), m_renderView.frameView().topContentInset(), m_renderView.frameView().headerHeight())));
+ m_rootContentLayer->setPosition(FloatPoint(documentRect.x(), documentRect.y() + m_renderView.frameView().yPositionForRootContentLayer()));
m_rootContentLayer->setAnchorPoint(FloatPoint3D());
}
if (m_clipLayer) {
Modified: trunk/Source/WebKit2/ChangeLog (183529 => 183530)
--- trunk/Source/WebKit2/ChangeLog 2015-04-29 05:05:48 UTC (rev 183529)
+++ trunk/Source/WebKit2/ChangeLog 2015-04-29 05:51:30 UTC (rev 183530)
@@ -1,3 +1,17 @@
+2015-04-28 Simon Fraser <[email protected]>
+
+ Make a non-static version of FrameView::yPositionForRootContentLayer()
+ https://bugs.webkit.org/show_bug.cgi?id=144375
+
+ Reviewed by Andy Estes.
+
+ There were two calls to the static FrameView::yPositionForRootContentLayer()
+ which passed in all the arguments for the same FrameView. Make a member
+ function for convenience.
+
+ * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
+ (WebKit::shadowLayerPositionForFrame):
+
2015-04-28 Ryuan Choi <[email protected]>
[CoordinatedGraphics] Merge TILED_BACKING_STORE guard with COORDINATED_GRAPHICS
Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm (183529 => 183530)
--- trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2015-04-29 05:05:48 UTC (rev 183529)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2015-04-29 05:51:30 UTC (rev 183530)
@@ -572,8 +572,7 @@
static FloatPoint shadowLayerPositionForFrame(FrameView& frameView, FloatPoint origin)
{
- FloatPoint position = frameView.renderView()->documentRect().location() + FloatPoint(0, FrameView::yPositionForRootContentLayer(frameView.scrollPosition(), frameView.topContentInset(), frameView.headerHeight()));
-
+ FloatPoint position = frameView.renderView()->documentRect().location() + FloatPoint(0, frameView.yPositionForRootContentLayer());
return position + origin.expandedTo(FloatPoint());
}
