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

Unified Diff: Source/core/platform/Scrollbar.cpp

Issue 61603003: Remove Scrollbar dependency on Frame, FrameView and EventHandler (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Patch for landing Created 7 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/platform/Scrollbar.cpp
diff --git a/Source/core/platform/Scrollbar.cpp b/Source/core/platform/Scrollbar.cpp
index 556a50c8708c50262b0c589d5e65e6554d99dc6c..a91597f93f31d8ed5b594098142cf8f8b71ca742 100644
--- a/Source/core/platform/Scrollbar.cpp
+++ b/Source/core/platform/Scrollbar.cpp
@@ -28,15 +28,11 @@
#include <algorithm>
#include "core/platform/ScrollAnimator.h"
+#include "core/platform/ScrollView.h"
#include "core/platform/ScrollableArea.h"
#include "core/platform/ScrollbarTheme.h"
#include "core/platform/graphics/GraphicsContext.h"
-// FIXME: The following #includes are a layering violation and should be removed.
-#include "core/page/EventHandler.h"
-#include "core/frame/Frame.h"
-#include "core/frame/FrameView.h"
-
#include "platform/PlatformGestureEvent.h"
#include "platform/PlatformMouseEvent.h"
@@ -131,7 +127,7 @@ bool Scrollbar::isScrollableAreaActive() const
bool Scrollbar::isScrollViewScrollbar() const
{
- return parent() && parent()->isFrameView() && toFrameView(parent())->isScrollViewScrollbar(this);
+ return parent() && parent()->isFrameView() && toScrollView(parent())->isScrollViewScrollbar(this);
}
bool Scrollbar::isLeftSideVerticalScrollbar() const
@@ -453,9 +449,6 @@ void Scrollbar::mouseUp(const PlatformMouseEvent& mouseEvent)
if (part == NoPart)
m_scrollableArea->mouseExitedScrollbar(this);
}
-
- if (parent() && parent()->isFrameView())
- toFrameView(parent())->frame().eventHandler().setMousePressed(false);
}
void Scrollbar::mouseDown(const PlatformMouseEvent& evt)
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698