Add dedicated windowToViewport method

third_party/WebKit/Source/platform/scroll/Scrollbar.cpp

 /*
  * Copyright (C) 2004, 2006, 2008 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 11 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "platform/scroll/Scrollbar.h"
 
 #include <algorithm>
 #include "platform/HostWindow.h"
 #include "platform/PlatformGestureEvent.h"
 #include "platform/PlatformMouseEvent.h"
+#include "platform/geometry/FloatRect.h"
 #include "platform/graphics/paint/CullRect.h"
 // See windowActiveChangedForSnowLeopardOnly() below.
 // TODO(ellyjones): remove this when Snow Leopard support is gone.
 #if OS(MACOSX)
 #include "platform/mac/VersionUtilMac.h"
 #endif
 #include "platform/scroll/ScrollAnimatorBase.h"
 #include "platform/scroll/ScrollableArea.h"
 #include "platform/scroll/ScrollbarTheme.h"
 
@@ skipping 32 matching lines @@
     , m_trackNeedsRepaint(true)
     , m_thumbNeedsRepaint(true)
 {
     m_theme.registerScrollbar(*this);
 
     // FIXME: This is ugly and would not be necessary if we fix cross-platform code to actually query for
     // scrollbar thickness and use it when sizing scrollbars (rather than leaving one dimension of the scrollbar
     // alone when sizing).
     int thickness = m_theme.scrollbarThickness(controlSize);
     if (m_hostWindow)
-        thickness = m_hostWindow->screenToViewport(thickness);
+        thickness = m_hostWindow->windowToViewport(FloatRect(0, 0, thickness, 0)).width();
     Widget::setFrameRect(IntRect(0, 0, thickness, thickness));
 
     m_currentPos = scrollableAreaCurrentPos();
 }
 
 Scrollbar::~Scrollbar()
 {
     m_theme.unregisterScrollbar(*this);
 }
 
@@ skipping 380 matching lines @@
     m_enabled = e;
     theme().updateEnabledState(*this);
     setNeedsPaintInvalidation(AllParts);
 }
 
 int Scrollbar::scrollbarThickness() const
 {
     int thickness = orientation() == HorizontalScrollbar ? height() : width();
     if (!thickness || !m_hostWindow)
         return thickness;
-    return m_hostWindow->screenToViewport(m_theme.scrollbarThickness(controlSize()));
+    return m_hostWindow->windowToViewport(FloatRect(0, 0, m_theme.scrollbarThickness(controlSize()), 0)).width();
 }
 
 
 bool Scrollbar::isOverlayScrollbar() const
 {
     return m_theme.usesOverlayScrollbars();
 }
 
 bool Scrollbar::shouldParticipateInHitTesting()
 {
@@ skipping 83 matching lines @@
         invalidParts = AllParts;
     if (invalidParts & ~ThumbPart)
         m_trackNeedsRepaint = true;
     if (invalidParts & ThumbPart)
         m_thumbNeedsRepaint = true;
     if (m_scrollableArea)
         m_scrollableArea->setScrollbarNeedsPaintInvalidation(orientation());
 }
 
 } // namespace blink