Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(373)

Unified Diff: sky/engine/platform/scroll/ScrollableArea.cpp

Issue 721473002: Removed ScrollingCoordinator and a bunch of composited scrolling' (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: cr comments Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sky/engine/platform/scroll/ScrollableArea.h ('k') | sky/engine/public/platform/WebCompositorSupport.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/platform/scroll/ScrollableArea.cpp
diff --git a/sky/engine/platform/scroll/ScrollableArea.cpp b/sky/engine/platform/scroll/ScrollableArea.cpp
index 6c5339b410a2d70e62bb27e4b7864357f444d760..f12031840acf4053b7c94a9acdf775896fc9b0b1 100644
--- a/sky/engine/platform/scroll/ScrollableArea.cpp
+++ b/sky/engine/platform/scroll/ScrollableArea.cpp
@@ -117,11 +117,6 @@ void ScrollableArea::setScrollOrigin(const IntPoint& origin)
}
}
-GraphicsLayer* ScrollableArea::layerForContainer() const
-{
- return layerForScrolling() ? layerForScrolling()->parent() : 0;
-}
-
bool ScrollableArea::scroll(ScrollDirection direction, ScrollGranularity granularity, float delta)
{
ScrollbarOrientation orientation;
@@ -199,7 +194,7 @@ void ScrollableArea::scrollPositionChanged(const IntPoint& position)
// Tell the scrollbars to update their thumb postions.
if (Scrollbar* horizontalScrollbar = this->horizontalScrollbar()) {
horizontalScrollbar->offsetDidChange();
- if (horizontalScrollbar->isOverlayScrollbar() && !hasLayerForHorizontalScrollbar()) {
+ if (horizontalScrollbar->isOverlayScrollbar()) {
if (!verticalScrollbar)
horizontalScrollbar->invalidate();
else {
@@ -213,7 +208,7 @@ void ScrollableArea::scrollPositionChanged(const IntPoint& position)
}
if (verticalScrollbar) {
verticalScrollbar->offsetDidChange();
- if (verticalScrollbar->isOverlayScrollbar() && !hasLayerForVerticalScrollbar())
+ if (verticalScrollbar->isOverlayScrollbar())
verticalScrollbar->invalidate();
}
@@ -369,32 +364,9 @@ void ScrollableArea::setScrollbarOverlayStyle(ScrollbarOverlayStyle overlayStyle
void ScrollableArea::invalidateScrollbar(Scrollbar* scrollbar, const IntRect& rect)
{
- if (scrollbar == horizontalScrollbar()) {
- if (GraphicsLayer* graphicsLayer = layerForHorizontalScrollbar()) {
- graphicsLayer->setNeedsDisplay();
- graphicsLayer->setContentsNeedsDisplay();
- return;
- }
- } else if (scrollbar == verticalScrollbar()) {
- if (GraphicsLayer* graphicsLayer = layerForVerticalScrollbar()) {
- graphicsLayer->setNeedsDisplay();
- graphicsLayer->setContentsNeedsDisplay();
- return;
- }
- }
invalidateScrollbarRect(scrollbar, rect);
}
-bool ScrollableArea::hasLayerForHorizontalScrollbar() const
-{
- return layerForHorizontalScrollbar();
-}
-
-bool ScrollableArea::hasLayerForVerticalScrollbar() const
-{
- return layerForVerticalScrollbar();
-}
-
bool ScrollableArea::scheduleAnimation()
{
WTF_LOG(ScriptedAnimationController, "ScrollableArea::scheduleAnimation: window = %d",
« no previous file with comments | « sky/engine/platform/scroll/ScrollableArea.h ('k') | sky/engine/public/platform/WebCompositorSupport.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698