Revert 158386 - Revert 158362 - Support high DPI scrollbar on top level web frame.

cc/ScrollbarLayerChromium.cpp

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 
 #if USE(ACCELERATED_COMPOSITING)
 
 #include "ScrollbarLayerChromium.h"
 
@@ skipping 113 matching lines @@
         , m_trackPart(trackPart)
     {
     }
 
     WebKit::WebScrollbar* m_scrollbar;
     WebKit::WebScrollbarThemePainter m_painter;
     WebKit::WebScrollbarThemeGeometry* m_geometry;
     WebKit::WebScrollbar::ScrollbarPart m_trackPart;
 };
 
+bool ScrollbarLayerChromium::needsContentsScale() const
+{
+    return true;
+}
+
+IntSize ScrollbarLayerChromium::contentBounds() const
+{
+    return IntSize(lroundf(bounds().width() * contentsScale()), lroundf(bounds().height() * contentsScale()));
+}
+
 class ScrollbarThumbPainter : public LayerPainterChromium {
     WTF_MAKE_NONCOPYABLE(ScrollbarThumbPainter);
 public:
     static PassOwnPtr<ScrollbarThumbPainter> create(WebKit::WebScrollbar* scrollbar, WebKit::WebScrollbarThemePainter painter, WebKit::WebScrollbarThemeGeometry* geometry)
     {
         return adoptPtr(new ScrollbarThumbPainter(scrollbar, painter, geometry));
     }
 
     virtual void paint(SkCanvas* skCanvas, const IntRect& contentRect, FloatRect& opaque) OVERRIDE
     {
@@ skipping 62 matching lines @@
             && texture->texture()->size() == rect.size()
             && m_updateRect.isEmpty())
         return;
 
     // We should always have enough memory for UI.
     ASSERT(texture->texture()->canAcquireBackingTexture());
     if (!texture->texture()->canAcquireBackingTexture())
         return;
 
     // Paint and upload the entire part.
+    float widthScale = static_cast<float>(contentBounds().width()) / bounds().width();
+    float heightScale = static_cast<float>(contentBounds().height()) / bounds().height();
     IntRect paintedOpaqueRect;
-    painter->prepareToUpdate(rect, rect.size(), 1, 1, paintedOpaqueRect, stats);
+    painter->prepareToUpdate(rect, rect.size(), widthScale, heightScale, paintedOpaqueRect, stats);
     texture->prepareRect(rect, stats);
 
     IntSize destOffset(0, 0);
     TextureUploader::Parameters upload = { texture, rect, destOffset };
     queue.appendFullUpload(upload);
 }
 
 
 void ScrollbarLayerChromium::setTexturePriorities(const CCPriorityCalculator&)
 {
     if (contentBounds().isEmpty())
         return;
 
     createTextureUpdaterIfNeeded();
 
     bool drawsToRoot = !renderTarget()->parent();
     if (m_backTrack) {
         m_backTrack->texture()->setDimensions(contentBounds(), m_textureFormat);
         m_backTrack->texture()->setRequestPriority(CCPriorityCalculator::uiPriority(drawsToRoot));
     }
     if (m_foreTrack) {
         m_foreTrack->texture()->setDimensions(contentBounds(), m_textureFormat);
         m_foreTrack->texture()->setRequestPriority(CCPriorityCalculator::uiPriority(drawsToRoot));
     }
     if (m_thumb) {
-        WebKit::WebRect thumbRect = m_geometry->thumbRect(m_scrollbar.get());
-        m_thumb->texture()->setDimensions(IntSize(thumbRect.width, thumbRect.height), m_textureFormat);
+        IntSize thumbSize = layerRectToContentRect(m_geometry->thumbRect(m_scrollbar.get())).size();
+        m_thumb->texture()->setDimensions(thumbSize, m_textureFormat);
         m_thumb->texture()->setRequestPriority(CCPriorityCalculator::uiPriority(drawsToRoot));
     }
 }
 
 void ScrollbarLayerChromium::update(CCTextureUpdateQueue& queue, const CCOcclusionTracker*, CCRenderingStats& stats)
 {
     if (contentBounds().isEmpty())
         return;
 
     createTextureUpdaterIfNeeded();
 
     IntPoint scrollbarOrigin(m_scrollbar->location().x, m_scrollbar->location().y);
-    IntRect contentRect(scrollbarOrigin, contentBounds());
+    IntRect contentRect = layerRectToContentRect(WebKit::WebRect(scrollbarOrigin.x(), scrollbarOrigin.y(), bounds().width(), bounds().height()));
     updatePart(m_backTrackUpdater.get(), m_backTrack.get(), contentRect, queue, stats);
     if (m_foreTrack && m_foreTrackUpdater)
         updatePart(m_foreTrackUpdater.get(), m_foreTrack.get(), contentRect, queue, stats);
 
     // Consider the thumb to be at the origin when painting.
     WebKit::WebRect thumbRect = m_geometry->thumbRect(m_scrollbar.get());
-    IntRect originThumbRect = IntRect(0, 0, thumbRect.width, thumbRect.height);
+    IntRect originThumbRect = layerRectToContentRect(WebKit::WebRect(0, 0, thumbRect.width, thumbRect.height));
     if (!originThumbRect.isEmpty())
         updatePart(m_thumbUpdater.get(), m_thumb.get(), originThumbRect, queue, stats);
 }
 
 }
 #endif // USE(ACCELERATED_COMPOSITING)