Index: third_party/WebKit/Source/platform/scroll/ScrollbarThemeOverlay.cpp |
diff --git a/third_party/WebKit/Source/platform/scroll/ScrollbarThemeOverlay.cpp b/third_party/WebKit/Source/platform/scroll/ScrollbarThemeOverlay.cpp |
index 9b1fb69267c52a13da0f04d73048b7b99bf13afe..b60cfbcbfbea6ef5c5a60358ba6299897314ea72 100644 |
--- a/third_party/WebKit/Source/platform/scroll/ScrollbarThemeOverlay.cpp |
+++ b/third_party/WebKit/Source/platform/scroll/ScrollbarThemeOverlay.cpp |
@@ -70,18 +70,6 @@ |
bool ScrollbarThemeOverlay::usesOverlayScrollbars() const { |
return true; |
-} |
- |
-double ScrollbarThemeOverlay::overlayScrollbarFadeOutDelaySeconds() const { |
- WebThemeEngine::ScrollbarStyle style; |
- Platform::current()->themeEngine()->getOverlayScrollbarStyle(&style); |
- return style.fadeOutDelaySeconds; |
-} |
- |
-double ScrollbarThemeOverlay::overlayScrollbarFadeOutDurationSeconds() const { |
- WebThemeEngine::ScrollbarStyle style; |
- Platform::current()->themeEngine()->getOverlayScrollbarStyle(&style); |
- return style.fadeOutDurationSeconds; |
} |
int ScrollbarThemeOverlay::thumbPosition(const ScrollbarThemeClient& scrollbar, |
@@ -163,10 +151,7 @@ |
} |
WebThemeEngine::State state = WebThemeEngine::StateNormal; |
- |
- if (!scrollbar.enabled()) |
- state = WebThemeEngine::StateDisabled; |
- else if (scrollbar.pressedPart() == ThumbPart) |
+ if (scrollbar.pressedPart() == ThumbPart) |
state = WebThemeEngine::StatePressed; |
else if (scrollbar.hoveredPart() == ThumbPart) |
state = WebThemeEngine::StateHover; |
@@ -192,11 +177,7 @@ |
if (m_allowHitTest == DisallowHitTest) |
return NoPart; |
- ScrollbarPart part = ScrollbarTheme::hitTest(scrollbar, position); |
- if (part != ThumbPart) |
- return NoPart; |
- |
- return ThumbPart; |
+ return ScrollbarTheme::hitTest(scrollbar, position); |
} |
ScrollbarThemeOverlay& ScrollbarThemeOverlay::mobileTheme() { |