Title: [106319] trunk/Source/WebCore
- Revision
- 106319
- Author
- [email protected]
- Date
- 2012-01-30 18:58:27 -0800 (Mon, 30 Jan 2012)
Log Message
Simplify RenderLayerCompositor::frameViewDidScroll
https://bugs.webkit.org/show_bug.cgi?id=77398
Reviewed by Sam Weinig.
Remove the scrollPosition parameter from RenderLayerCompositor::frameViewDidScroll; we can just get it
from the associated FrameView object.
* page/FrameView.cpp:
(WebCore::FrameView::scrollPositionChanged):
* rendering/RenderLayerCompositor.cpp:
(WebCore::RenderLayerCompositor::frameViewDidChangeSize):
Call frameViewDidScroll() here instead of setting the scroll layer position explicitly.
(WebCore::RenderLayerCompositor::frameViewDidScroll):
(WebCore::RenderLayerCompositor::ensureRootLayer):
* rendering/RenderLayerCompositor.h:
(RenderLayerCompositor):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (106318 => 106319)
--- trunk/Source/WebCore/ChangeLog 2012-01-31 02:55:08 UTC (rev 106318)
+++ trunk/Source/WebCore/ChangeLog 2012-01-31 02:58:27 UTC (rev 106319)
@@ -1,3 +1,24 @@
+2012-01-30 Anders Carlsson <[email protected]>
+
+ Simplify RenderLayerCompositor::frameViewDidScroll
+ https://bugs.webkit.org/show_bug.cgi?id=77398
+
+ Reviewed by Sam Weinig.
+
+ Remove the scrollPosition parameter from RenderLayerCompositor::frameViewDidScroll; we can just get it
+ from the associated FrameView object.
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::scrollPositionChanged):
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::frameViewDidChangeSize):
+ Call frameViewDidScroll() here instead of setting the scroll layer position explicitly.
+
+ (WebCore::RenderLayerCompositor::frameViewDidScroll):
+ (WebCore::RenderLayerCompositor::ensureRootLayer):
+ * rendering/RenderLayerCompositor.h:
+ (RenderLayerCompositor):
+
2012-01-30 Pablo Flouret <[email protected]>
Don't select the next selectable index when deselecting an option in select elements with size set to a value greater than one.
Modified: trunk/Source/WebCore/page/FrameView.cpp (106318 => 106319)
--- trunk/Source/WebCore/page/FrameView.cpp 2012-01-31 02:55:08 UTC (rev 106318)
+++ trunk/Source/WebCore/page/FrameView.cpp 2012-01-31 02:58:27 UTC (rev 106319)
@@ -1729,7 +1729,7 @@
#if USE(ACCELERATED_COMPOSITING)
if (RenderView* root = rootRenderer(this)) {
if (root->usesCompositing())
- root->compositor()->frameViewDidScroll(scrollPosition());
+ root->compositor()->frameViewDidScroll();
}
#endif
}
Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (106318 => 106319)
--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2012-01-31 02:55:08 UTC (rev 106318)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2012-01-31 02:58:27 UTC (rev 106319)
@@ -964,8 +964,7 @@
FrameView* frameView = m_renderView->frameView();
m_clipLayer->setSize(frameView->visibleContentRect(false /* exclude scrollbars */).size());
- LayoutPoint scrollPosition = frameView->scrollPosition();
- m_scrollLayer->setPosition(FloatPoint(-scrollPosition.x(), -scrollPosition.y()));
+ frameViewDidScroll();
updateOverflowControlsLayers();
#if ENABLE(RUBBER_BANDING)
@@ -980,8 +979,11 @@
}
}
-void RenderLayerCompositor::frameViewDidScroll(const LayoutPoint& scrollPosition)
+void RenderLayerCompositor::frameViewDidScroll()
{
+ FrameView* frameView = m_renderView->frameView();
+ LayoutPoint scrollPosition = frameView->scrollPosition();
+
if (m_scrollLayer)
m_scrollLayer->setPosition(FloatPoint(-scrollPosition.x(), -scrollPosition.y()));
}
@@ -1867,7 +1869,7 @@
m_scrollLayer->addChild(m_rootContentLayer.get());
frameViewDidChangeSize();
- frameViewDidScroll(m_renderView->frameView()->scrollPosition());
+ frameViewDidScroll();
#if ENABLE(THREADED_SCROLLING)
if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator())
Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.h (106318 => 106319)
--- trunk/Source/WebCore/rendering/RenderLayerCompositor.h 2012-01-31 02:55:08 UTC (rev 106318)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.h 2012-01-31 02:58:27 UTC (rev 106319)
@@ -187,7 +187,7 @@
// Update the geometry of the layers used for clipping and scrolling in frames.
void frameViewDidChangeLocation(const LayoutPoint& contentsOffset);
void frameViewDidChangeSize();
- void frameViewDidScroll(const LayoutPoint& = LayoutPoint());
+ void frameViewDidScroll();
String layerTreeAsText(bool showDebugInfo = false);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
