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

cc/CCScrollbarLayerImpl.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 "CCScrollbarLayerImpl.h"
 
@@ skipping 61 matching lines @@
 {
     return FloatRect(static_cast<float>(r.x) / bounds.width(), static_cast<float>(r.y) / bounds.height(),
                      static_cast<float>(r.width) / bounds.width(), static_cast<float>(r.height) / bounds.height());
 }
 
 void CCScrollbarLayerImpl::appendQuads(CCQuadSink& quadSink, CCAppendQuadsData& appendQuadsData)
 {
     bool premultipledAlpha = false;
     bool flipped = false;
     FloatRect uvRect(0, 0, 1, 1);
-    IntRect boundsRect(IntPoint(), bounds());
-    IntRect contentBoundsRect(IntPoint(), contentBounds());
+    IntRect boundsRect(IntPoint(), contentBounds());
 
     CCSharedQuadState* sharedQuadState = quadSink.useSharedQuadState(createSharedQuadState());
     appendDebugBorderQuad(quadSink, sharedQuadState, appendQuadsData);
 
     WebRect thumbRect, backTrackRect, foreTrackRect;
     m_geometry->splitTrack(&m_scrollbar, m_geometry->trackRect(&m_scrollbar), backTrackRect, thumbRect, foreTrackRect);
     if (!m_geometry->hasThumb(&m_scrollbar))
         thumbRect = WebRect();
 
     if (m_thumbResourceId && !thumbRect.isEmpty()) {
-        OwnPtr<CCTextureDrawQuad> quad = CCTextureDrawQuad::create(sharedQuadState, layerRectToContentRect(thumbRect), m_thumbResourceId, premultipledAlpha, uvRect, flipped);
+        OwnPtr<CCTextureDrawQuad> quad = CCTextureDrawQuad::create(sharedQuadState, IntRect(thumbRect.x, thumbRect.y, thumbRect.width, thumbRect.height), m_thumbResourceId, premultipledAlpha, uvRect, flipped);
         quad->setNeedsBlending();
         quadSink.append(quad.release(), appendQuadsData);
     }
 
     if (!m_backTrackResourceId)
         return;
 
     // We only paint the track in two parts if we were given a texture for the forward track part.
     if (m_foreTrackResourceId && !foreTrackRect.isEmpty())
-        quadSink.append(CCTextureDrawQuad::create(sharedQuadState, layerRectToContentRect(foreTrackRect), m_foreTrackResourceId, premultipledAlpha, toUVRect(foreTrackRect, boundsRect), flipped), appendQuadsData);
+        quadSink.append(CCTextureDrawQuad::create(sharedQuadState, IntRect(foreTrackRect.x, foreTrackRect.y, foreTrackRect.width, foreTrackRect.height), m_foreTrackResourceId, premultipledAlpha, toUVRect(foreTrackRect, boundsRect), flipped), appendQuadsData);
 
     // Order matters here: since the back track texture is being drawn to the entire contents rect, we must append it after the thumb and
     // fore track quads. The back track texture contains (and displays) the buttons.
-    if (!contentBoundsRect.isEmpty())
-        quadSink.append(CCTextureDrawQuad::create(sharedQuadState, IntRect(contentBoundsRect), m_backTrackResourceId, premultipledAlpha, uvRect, flipped), appendQuadsData);
+    if (!boundsRect.isEmpty())
+        quadSink.append(CCTextureDrawQuad::create(sharedQuadState, IntRect(boundsRect), m_backTrackResourceId, premultipledAlpha, uvRect, flipped), appendQuadsData);
 }
 
 void CCScrollbarLayerImpl::didLoseContext()
 {
     m_backTrackResourceId = 0;
     m_foreTrackResourceId = 0;
     m_thumbResourceId = 0;
 }
 
 bool CCScrollbarLayerImpl::CCScrollbar::isOverlay() const
 {
     return m_owner->m_isOverlayScrollbar;
 }
 
 int CCScrollbarLayerImpl::CCScrollbar::value() const
 {
     return m_owner->m_currentPos;
 }
 
 WebKit::WebPoint CCScrollbarLayerImpl::CCScrollbar::location() const
 {
     return WebKit::WebPoint();
 }
 
 WebKit::WebSize CCScrollbarLayerImpl::CCScrollbar::size() const
 {
-    return WebKit::WebSize(m_owner->bounds().width(), m_owner->bounds().height());
+    return WebKit::WebSize(m_owner->contentBounds().width(), m_owner->contentBounds().height());
 }
 
 bool CCScrollbarLayerImpl::CCScrollbar::enabled() const
 {
     return m_owner->m_enabled;
 }
 
 int CCScrollbarLayerImpl::CCScrollbar::maximum() const
 {
     return m_owner->m_maximum;
@@ skipping 50 matching lines @@
 }
 
 const char* CCScrollbarLayerImpl::layerTypeAsString() const
 {
     return "ScrollbarLayer";
 }
 
 }
 
 #endif // USE(ACCELERATED_COMPOSITING)