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) |