diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-24 21:39:15 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-24 21:39:15 +0000 |
| commit | e1324f25756a4fa4acc1ffd2bf99ee35796b83b5 (patch) | |
| tree | 69a3b18aa21165b264349f7eccd932e0c6c88642 /cc/CCScrollbarLayerImpl.cpp | |
| parent | 8f74058b17e25c17b6c7f7bfdf47590fbe5a8ff0 (diff) | |
| download | chromium_src-e1324f25756a4fa4acc1ffd2bf99ee35796b83b5.zip chromium_src-e1324f25756a4fa4acc1ffd2bf99ee35796b83b5.tar.gz chromium_src-e1324f25756a4fa4acc1ffd2bf99ee35796b83b5.tar.bz2 | |
Revert 158386 - Revert 158362 - Support high DPI scrollbar on top level web frame.
BUG=141389
TEST=Run chrome with --force-device-scale-factor=2 --force-compositing-mode and verify that the top-level scrollbar is high dpi.
CC tests are known flaky: http://code.google.com/p/chromium/issues/detail?id=148490
Re-committing the CC change.
Review URL: https://chromiumcodereview.appspot.com/10909255
TBR=flackr@chromium.org
Review URL: https://codereview.chromium.org/10990004
TBR=avi@chromium.org
Review URL: https://codereview.chromium.org/10989003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@158398 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/CCScrollbarLayerImpl.cpp')
| -rw-r--r-- | cc/CCScrollbarLayerImpl.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/cc/CCScrollbarLayerImpl.cpp b/cc/CCScrollbarLayerImpl.cpp index 63be4f5..dd4791f 100644 --- a/cc/CCScrollbarLayerImpl.cpp +++ b/cc/CCScrollbarLayerImpl.cpp @@ -79,7 +79,8 @@ void CCScrollbarLayerImpl::appendQuads(CCQuadSink& quadSink, CCAppendQuadsData& bool premultipledAlpha = false; bool flipped = false; FloatRect uvRect(0, 0, 1, 1); - IntRect boundsRect(IntPoint(), contentBounds()); + IntRect boundsRect(IntPoint(), bounds()); + IntRect contentBoundsRect(IntPoint(), contentBounds()); CCSharedQuadState* sharedQuadState = quadSink.useSharedQuadState(createSharedQuadState()); appendDebugBorderQuad(quadSink, sharedQuadState, appendQuadsData); @@ -90,7 +91,7 @@ void CCScrollbarLayerImpl::appendQuads(CCQuadSink& quadSink, CCAppendQuadsData& thumbRect = WebRect(); if (m_thumbResourceId && !thumbRect.isEmpty()) { - OwnPtr<CCTextureDrawQuad> quad = CCTextureDrawQuad::create(sharedQuadState, IntRect(thumbRect.x, thumbRect.y, thumbRect.width, thumbRect.height), m_thumbResourceId, premultipledAlpha, uvRect, flipped); + OwnPtr<CCTextureDrawQuad> quad = CCTextureDrawQuad::create(sharedQuadState, layerRectToContentRect(thumbRect), m_thumbResourceId, premultipledAlpha, uvRect, flipped); quad->setNeedsBlending(); quadSink.append(quad.release(), appendQuadsData); } @@ -100,12 +101,12 @@ void CCScrollbarLayerImpl::appendQuads(CCQuadSink& quadSink, CCAppendQuadsData& // 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, IntRect(foreTrackRect.x, foreTrackRect.y, foreTrackRect.width, foreTrackRect.height), m_foreTrackResourceId, premultipledAlpha, toUVRect(foreTrackRect, boundsRect), flipped), appendQuadsData); + quadSink.append(CCTextureDrawQuad::create(sharedQuadState, layerRectToContentRect(foreTrackRect), 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 (!boundsRect.isEmpty()) - quadSink.append(CCTextureDrawQuad::create(sharedQuadState, IntRect(boundsRect), m_backTrackResourceId, premultipledAlpha, uvRect, flipped), appendQuadsData); + if (!contentBoundsRect.isEmpty()) + quadSink.append(CCTextureDrawQuad::create(sharedQuadState, IntRect(contentBoundsRect), m_backTrackResourceId, premultipledAlpha, uvRect, flipped), appendQuadsData); } void CCScrollbarLayerImpl::didLoseContext() @@ -132,7 +133,7 @@ WebKit::WebPoint CCScrollbarLayerImpl::CCScrollbar::location() const WebKit::WebSize CCScrollbarLayerImpl::CCScrollbar::size() const { - return WebKit::WebSize(m_owner->contentBounds().width(), m_owner->contentBounds().height()); + return WebKit::WebSize(m_owner->bounds().width(), m_owner->bounds().height()); } bool CCScrollbarLayerImpl::CCScrollbar::enabled() const |