Title: [159238] trunk/Source/WebCore
- Revision
- 159238
- Author
- [email protected]
- Date
- 2013-11-13 14:22:14 -0800 (Wed, 13 Nov 2013)
Log Message
Rename FrameView's repaintFixedElementsAfterScrolling and updateFixedElementsAfterScrolling
https://bugs.webkit.org/show_bug.cgi?id=124306
Reviewed by Tim Horton.
FrameView::repaintFixedElementsAfterScrolling() didn't do any repainting, and didn't
just apply to fixed elements. Rename it to updateLayerPositionsAfterScrolling().
updateFixedElementsAfterScrolling() was also confusingly named; rename it
to updateCompositingLayersAfterScrolling().
* page/FrameView.cpp:
(WebCore::FrameView::setFixedVisibleContentRect):
(WebCore::FrameView::scrollPositionChangedViaPlatformWidget):
(WebCore::FrameView::updateLayerPositionsAfterScrolling):
(WebCore::FrameView::shouldUpdateCompositingLayersAfterScrolling):
(WebCore::FrameView::updateCompositingLayersAfterScrolling):
* page/FrameView.h:
* platform/ScrollView.cpp:
(WebCore::ScrollView::scrollTo):
* platform/ScrollView.h:
(WebCore::ScrollView::updateLayerPositionsAfterScrolling):
(WebCore::ScrollView::updateCompositingLayersAfterScrolling):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (159237 => 159238)
--- trunk/Source/WebCore/ChangeLog 2013-11-13 22:19:33 UTC (rev 159237)
+++ trunk/Source/WebCore/ChangeLog 2013-11-13 22:22:14 UTC (rev 159238)
@@ -1,3 +1,29 @@
+2013-11-13 Simon Fraser <[email protected]>
+
+ Rename FrameView's repaintFixedElementsAfterScrolling and updateFixedElementsAfterScrolling
+ https://bugs.webkit.org/show_bug.cgi?id=124306
+
+ Reviewed by Tim Horton.
+
+ FrameView::repaintFixedElementsAfterScrolling() didn't do any repainting, and didn't
+ just apply to fixed elements. Rename it to updateLayerPositionsAfterScrolling().
+
+ updateFixedElementsAfterScrolling() was also confusingly named; rename it
+ to updateCompositingLayersAfterScrolling().
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::setFixedVisibleContentRect):
+ (WebCore::FrameView::scrollPositionChangedViaPlatformWidget):
+ (WebCore::FrameView::updateLayerPositionsAfterScrolling):
+ (WebCore::FrameView::shouldUpdateCompositingLayersAfterScrolling):
+ (WebCore::FrameView::updateCompositingLayersAfterScrolling):
+ * page/FrameView.h:
+ * platform/ScrollView.cpp:
+ (WebCore::ScrollView::scrollTo):
+ * platform/ScrollView.h:
+ (WebCore::ScrollView::updateLayerPositionsAfterScrolling):
+ (WebCore::ScrollView::updateCompositingLayersAfterScrolling):
+
2013-11-13 Andreas Kling <[email protected]>
Generate casting helpers for SVGPaint and SVGColor.
Modified: trunk/Source/WebCore/page/FrameView.cpp (159237 => 159238)
--- trunk/Source/WebCore/page/FrameView.cpp 2013-11-13 22:19:33 UTC (rev 159237)
+++ trunk/Source/WebCore/page/FrameView.cpp 2013-11-13 22:22:14 UTC (rev 159238)
@@ -1920,9 +1920,9 @@
IntSize offset = scrollOffset();
ScrollView::setFixedVisibleContentRect(visibleContentRect);
if (offset != scrollOffset()) {
- repaintFixedElementsAfterScrolling();
+ updateLayerPositionsAfterScrolling();
if (frame().page()->settings().acceleratedCompositingForFixedPositionEnabled())
- updateFixedElementsAfterScrolling();
+ updateCompositingLayersAfterScrolling();
scrollAnimator()->setCurrentPosition(scrollPosition());
scrollPositionChanged();
}
@@ -1944,8 +1944,8 @@
void FrameView::scrollPositionChangedViaPlatformWidget()
{
- repaintFixedElementsAfterScrolling();
- updateFixedElementsAfterScrolling();
+ updateLayerPositionsAfterScrolling();
+ updateCompositingLayersAfterScrolling();
repaintSlowRepaintObjects();
scrollPositionChanged();
}
@@ -1963,15 +1963,12 @@
#endif
}
-// FIXME: this function is misnamed; its primary purpose is to update RenderLayer positions.
-void FrameView::repaintFixedElementsAfterScrolling()
+void FrameView::updateLayerPositionsAfterScrolling()
{
// If we're scrolling as a result of updating the view size after layout, we'll update widgets and layer positions soon anyway.
if (m_layoutPhase == InViewSizeAdjust)
return;
- // For fixed position elements, update widget positions and compositing layers after scrolling,
- // but only if we're not inside of layout.
if (m_nestedLayoutCount <= 1 && hasViewportConstrainedObjects()) {
if (RenderView* renderView = this->renderView()) {
updateWidgetPositions();
@@ -1980,7 +1977,7 @@
}
}
-bool FrameView::shouldUpdateFixedElementsAfterScrolling()
+bool FrameView::shouldUpdateCompositingLayersAfterScrolling() const
{
#if ENABLE(THREADED_SCROLLING)
// If the scrolling thread is updating the fixed elements, then the FrameView should not update them as well.
@@ -2010,10 +2007,10 @@
return true;
}
-void FrameView::updateFixedElementsAfterScrolling()
+void FrameView::updateCompositingLayersAfterScrolling()
{
#if USE(ACCELERATED_COMPOSITING)
- if (!shouldUpdateFixedElementsAfterScrolling())
+ if (!shouldUpdateCompositingLayersAfterScrolling())
return;
if (m_nestedLayoutCount <= 1 && hasViewportConstrainedObjects()) {
Modified: trunk/Source/WebCore/page/FrameView.h (159237 => 159238)
--- trunk/Source/WebCore/page/FrameView.h 2013-11-13 22:19:33 UTC (rev 159237)
+++ trunk/Source/WebCore/page/FrameView.h 2013-11-13 22:22:14 UTC (rev 159238)
@@ -196,8 +196,8 @@
virtual void setFixedVisibleContentRect(const IntRect&) OVERRIDE;
virtual void setScrollPosition(const IntPoint&) OVERRIDE;
void scrollPositionChangedViaPlatformWidget();
- virtual void repaintFixedElementsAfterScrolling() OVERRIDE;
- virtual void updateFixedElementsAfterScrolling() OVERRIDE;
+ virtual void updateLayerPositionsAfterScrolling() OVERRIDE;
+ virtual void updateCompositingLayersAfterScrolling() OVERRIDE;
virtual bool requestScrollPositionUpdate(const IntPoint&) OVERRIDE;
virtual bool isRubberBandInProgress() const OVERRIDE;
virtual IntPoint minimumScrollPosition() const OVERRIDE;
@@ -466,7 +466,7 @@
void updateCanBlitOnScrollRecursively();
bool contentsInCompositedLayer() const;
- bool shouldUpdateFixedElementsAfterScrolling();
+ bool shouldUpdateCompositingLayersAfterScrolling() const;
void applyOverflowToViewport(RenderElement*, ScrollbarMode& hMode, ScrollbarMode& vMode);
void applyPaginationToViewport();
Modified: trunk/Source/WebCore/platform/ScrollView.cpp (159237 => 159238)
--- trunk/Source/WebCore/platform/ScrollView.cpp 2013-11-13 22:19:33 UTC (rev 159237)
+++ trunk/Source/WebCore/platform/ScrollView.cpp 2013-11-13 22:22:14 UTC (rev 159238)
@@ -412,9 +412,9 @@
return;
}
#endif
- repaintFixedElementsAfterScrolling();
+ updateLayerPositionsAfterScrolling();
scrollContents(scrollDelta);
- updateFixedElementsAfterScrolling();
+ updateCompositingLayersAfterScrolling();
}
int ScrollView::scrollPosition(Scrollbar* scrollbar) const
Modified: trunk/Source/WebCore/platform/ScrollView.h (159237 => 159238)
--- trunk/Source/WebCore/platform/ScrollView.h 2013-11-13 22:19:33 UTC (rev 159237)
+++ trunk/Source/WebCore/platform/ScrollView.h 2013-11-13 22:22:14 UTC (rev 159238)
@@ -380,8 +380,8 @@
IntRect rectToCopyOnScroll() const;
// Called when the scroll position within this view changes. FrameView overrides this to generate repaint invalidations.
- virtual void repaintFixedElementsAfterScrolling() { }
- virtual void updateFixedElementsAfterScrolling() { }
+ virtual void updateLayerPositionsAfterScrolling() { }
+ virtual void updateCompositingLayersAfterScrolling() { }
void platformAddChild(Widget*);
void platformRemoveChild(Widget*);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
