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

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

Issue 646273006: Get rid of ScrollView. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: merge to ToT Created 6 years, 2 months 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
Index: sky/engine/platform/scroll/Scrollbar.cpp
diff --git a/sky/engine/platform/scroll/Scrollbar.cpp b/sky/engine/platform/scroll/Scrollbar.cpp
index 03acd916bd8b0d796f7bd0cf156cfefecd152022..0e62bca7c23ab45608350b5574b62c40775b1ea9 100644
--- a/sky/engine/platform/scroll/Scrollbar.cpp
+++ b/sky/engine/platform/scroll/Scrollbar.cpp
@@ -30,10 +30,10 @@
#include "platform/graphics/GraphicsContext.h"
#include "platform/PlatformGestureEvent.h"
#include "platform/PlatformMouseEvent.h"
+#include "platform/FrameWidget.h"
#include "platform/scroll/ScrollableArea.h"
#include "platform/scroll/ScrollAnimator.h"
#include "platform/scroll/Scrollbar.h"
-#include "platform/scroll/ScrollView.h"
#include "public/platform/Platform.h"
#include "public/platform/WebPoint.h"
#include "public/platform/WebRect.h"
@@ -91,17 +91,7 @@ Scrollbar::~Scrollbar()
void Scrollbar::removeFromParent()
{
if (parent())
- toScrollView(parent())->removeChild(this);
-}
-
-ScrollView* Scrollbar::parentScrollView() const
-{
- return toScrollView(parent());
-}
-
-ScrollView* Scrollbar::rootScrollView() const
-{
- return toScrollView(root());
+ toFrameWidget(parent())->removeChild(this);
}
ScrollbarOverlayStyle Scrollbar::scrollbarOverlayStyle() const
@@ -122,7 +112,8 @@ bool Scrollbar::isScrollableAreaActive() const
bool Scrollbar::isScrollViewScrollbar() const
{
- return parent() && parent()->isFrameView() && toScrollView(parent())->isScrollViewScrollbar(this);
+ // FIXME(sky): Remove
+ return false;
}
bool Scrollbar::isLeftSideVerticalScrollbar() const

Powered by Google App Engine
This is Rietveld 408576698