Index: Source/core/platform/Scrollbar.cpp |
diff --git a/Source/core/platform/Scrollbar.cpp b/Source/core/platform/Scrollbar.cpp |
index 7bf8b4107a4bbcdc877580ab2b23a161e0d536a7..742c417b0c06acaf2a5dd1c9bd90e9448ad141d5 100644 |
--- a/Source/core/platform/Scrollbar.cpp |
+++ b/Source/core/platform/Scrollbar.cpp |
@@ -105,9 +105,9 @@ Scrollbar::~Scrollbar() |
{ |
if (AXObjectCache* cache = existingAXObjectCache()) |
cache->remove(this); |
- |
+ |
stopTimerIfNeeded(); |
- |
+ |
m_theme->unregisterScrollbar(this); |
} |
@@ -144,7 +144,7 @@ void Scrollbar::offsetDidChange() |
m_currentPos = position; |
updateThumbPosition(); |
if (m_pressedPart == ThumbPart) |
- setPressedPos(m_pressedPos + theme()->thumbPosition(this) - oldThumbPosition); |
+ setPressedPos(m_pressedPos + theme()->thumbPosition(this) - oldThumbPosition); |
} |
void Scrollbar::setProportion(int visibleSize, int totalSize) |
@@ -313,7 +313,7 @@ void Scrollbar::moveThumb(int pos, bool draggingDocument) |
delta = min(trackLen - thumbLen - thumbPos, delta); |
else if (delta < 0) |
delta = max(-thumbPos, delta); |
- |
+ |
float minPos = m_scrollableArea->minimumScrollPosition(m_orientation); |
float maxPos = m_scrollableArea->maximumScrollPosition(m_orientation); |
if (delta) { |
@@ -392,7 +392,7 @@ void Scrollbar::mouseMoved(const PlatformMouseEvent& evt) |
if (m_scrollableArea) |
m_scrollableArea->scrollToOffsetWithoutAnimation(m_orientation, m_dragOrigin); |
} else { |
- moveThumb(m_orientation == HorizontalScrollbar ? |
+ moveThumb(m_orientation == HorizontalScrollbar ? |
convertFromContainingWindow(evt.position()).x() : |
convertFromContainingWindow(evt.position()).y(), theme()->shouldDragDocumentInsteadOfThumb(this, evt)); |
} |
@@ -416,10 +416,10 @@ void Scrollbar::mouseMoved(const PlatformMouseEvent& evt) |
stopTimerIfNeeded(); |
theme()->invalidatePart(this, m_pressedPart); |
} |
- } |
- |
+ } |
+ |
setHoveredPart(part); |
- } |
+ } |
return; |
} |
@@ -464,7 +464,7 @@ void Scrollbar::mouseDown(const PlatformMouseEvent& evt) |
setPressedPart(theme()->hitTest(this, evt.position())); |
int pressedPos = (orientation() == HorizontalScrollbar ? convertFromContainingWindow(evt.position()).x() : convertFromContainingWindow(evt.position()).y()); |
- |
+ |
if ((m_pressedPart == BackTrackPart || m_pressedPart == ForwardTrackPart) && theme()->shouldCenterOnThumb(this, evt)) { |
setHoveredPart(ThumbPart); |
setPressedPart(ThumbPart); |
@@ -478,7 +478,7 @@ void Scrollbar::mouseDown(const PlatformMouseEvent& evt) |
return; |
} else if (m_pressedPart == ThumbPart) |
m_dragOrigin = m_currentPos; |
- |
+ |
m_pressedPos = pressedPos; |
autoscrollPressedPart(theme()->initialAutoscrollTimerDelay()); |
@@ -526,7 +526,7 @@ void Scrollbar::setParent(ScrollView* parentView) |
} |
void Scrollbar::setEnabled(bool e) |
-{ |
+{ |
if (m_enabled == e) |
return; |
m_enabled = e; |
@@ -556,7 +556,7 @@ AXObjectCache* Scrollbar::existingAXObjectCache() const |
{ |
if (!parent()) |
return 0; |
- |
+ |
return parent()->axObjectCache(); |
} |