| Index: Source/platform/exported/WebScrollbarThemeClientImpl.cpp
|
| diff --git a/Source/platform/exported/WebScrollbarThemeClientImpl.cpp b/Source/platform/exported/WebScrollbarThemeClientImpl.cpp
|
| index 35c976ee537a3835ae64b212d39c485d52d302e6..9aad523c8e2a13a72b70a8fd1150996f24b07b13 100644
|
| --- a/Source/platform/exported/WebScrollbarThemeClientImpl.cpp
|
| +++ b/Source/platform/exported/WebScrollbarThemeClientImpl.cpp
|
| @@ -29,8 +29,6 @@
|
|
|
| #include "platform/scroll/ScrollbarTheme.h"
|
|
|
| -using blink::WebScrollbar;
|
| -
|
| namespace blink {
|
|
|
| WebScrollbarThemeClientImpl::WebScrollbarThemeClientImpl(WebScrollbar* scrollbar)
|
| @@ -111,14 +109,14 @@ void WebScrollbarThemeClientImpl::invalidateRect(const IntRect&)
|
| ASSERT_NOT_REACHED();
|
| }
|
|
|
| -blink::ScrollbarOverlayStyle WebScrollbarThemeClientImpl::scrollbarOverlayStyle() const
|
| +ScrollbarOverlayStyle WebScrollbarThemeClientImpl::scrollbarOverlayStyle() const
|
| {
|
| - return static_cast<blink::ScrollbarOverlayStyle>(m_scrollbar->scrollbarOverlayStyle());
|
| + return static_cast<ScrollbarOverlayStyle>(m_scrollbar->scrollbarOverlayStyle());
|
| }
|
|
|
| void WebScrollbarThemeClientImpl::getTickmarks(Vector<IntRect>& tickmarks) const
|
| {
|
| - blink::WebVector<blink::WebRect> webTickmarks;
|
| + WebVector<WebRect> webTickmarks;
|
| m_scrollbar->getTickmarks(webTickmarks);
|
| tickmarks.resize(webTickmarks.size());
|
| for (size_t i = 0; i < webTickmarks.size(); ++i)
|
| @@ -149,9 +147,9 @@ bool WebScrollbarThemeClientImpl::isCustomScrollbar() const
|
| return m_scrollbar->isCustomScrollbar();
|
| }
|
|
|
| -blink::ScrollbarOrientation WebScrollbarThemeClientImpl::orientation() const
|
| +ScrollbarOrientation WebScrollbarThemeClientImpl::orientation() const
|
| {
|
| - return static_cast<blink::ScrollbarOrientation>(m_scrollbar->orientation());
|
| + return static_cast<ScrollbarOrientation>(m_scrollbar->orientation());
|
| }
|
|
|
| bool WebScrollbarThemeClientImpl::isLeftSideVerticalScrollbar() const
|
| @@ -184,19 +182,19 @@ int WebScrollbarThemeClientImpl::maximum() const
|
| return m_scrollbar->maximum();
|
| }
|
|
|
| -blink::ScrollbarControlSize WebScrollbarThemeClientImpl::controlSize() const
|
| +ScrollbarControlSize WebScrollbarThemeClientImpl::controlSize() const
|
| {
|
| - return static_cast<blink::ScrollbarControlSize>(m_scrollbar->controlSize());
|
| + return static_cast<ScrollbarControlSize>(m_scrollbar->controlSize());
|
| }
|
|
|
| -blink::ScrollbarPart WebScrollbarThemeClientImpl::pressedPart() const
|
| +ScrollbarPart WebScrollbarThemeClientImpl::pressedPart() const
|
| {
|
| - return static_cast<blink::ScrollbarPart>(m_scrollbar->pressedPart());
|
| + return static_cast<ScrollbarPart>(m_scrollbar->pressedPart());
|
| }
|
|
|
| -blink::ScrollbarPart WebScrollbarThemeClientImpl::hoveredPart() const
|
| +ScrollbarPart WebScrollbarThemeClientImpl::hoveredPart() const
|
| {
|
| - return static_cast<blink::ScrollbarPart>(m_scrollbar->hoveredPart());
|
| + return static_cast<ScrollbarPart>(m_scrollbar->hoveredPart());
|
| }
|
|
|
| void WebScrollbarThemeClientImpl::styleChanged()
|
|
|