Index: cc/scrollbar_layer_impl.cc |
diff --git a/cc/scrollbar_layer_impl.cc b/cc/scrollbar_layer_impl.cc |
index f2996310d95eefb44b98d1fa8f890f52b746a522..7b398fe6a24d9944cb7d941ac3ec8191d49c9685 100644 |
--- a/cc/scrollbar_layer_impl.cc |
+++ b/cc/scrollbar_layer_impl.cc |
@@ -102,7 +102,8 @@ void ScrollbarLayerImpl::appendQuads(QuadSink& quadSink, AppendQuadsData& append |
{ |
bool premultipledAlpha = false; |
bool flipped = false; |
- gfx::RectF uvRect(0, 0, 1, 1); |
+ gfx::PointF uvTopLeft(0, 0); |
danakj
2013/01/15 01:48:42
nit: 0.f
Jerome
2013/01/15 17:58:12
Done.
|
+ gfx::PointF uvBottomRight(1, 1); |
danakj
2013/01/15 01:48:42
nit: 1.f
Jerome
2013/01/15 17:58:12
Done.
|
gfx::Rect boundsRect(gfx::Point(), bounds()); |
gfx::Rect contentBoundsRect(gfx::Point(), contentBounds()); |
@@ -119,7 +120,7 @@ void ScrollbarLayerImpl::appendQuads(QuadSink& quadSink, AppendQuadsData& append |
gfx::Rect opaqueRect; |
const float opacity[] = {1.0f, 1.0f, 1.0f, 1.0f}; |
scoped_ptr<TextureDrawQuad> quad = TextureDrawQuad::Create(); |
- quad->SetNew(sharedQuadState, quadRect, opaqueRect, m_thumbResourceId, premultipledAlpha, uvRect, opacity, flipped); |
+ quad->SetNew(sharedQuadState, quadRect, opaqueRect, m_thumbResourceId, premultipledAlpha, uvTopLeft, uvBottomRight, opacity, flipped); |
quadSink.append(quad.PassAs<DrawQuad>(), appendQuadsData); |
} |
@@ -130,9 +131,10 @@ void ScrollbarLayerImpl::appendQuads(QuadSink& quadSink, AppendQuadsData& append |
if (m_foreTrackResourceId && !foreTrackRect.isEmpty()) { |
gfx::Rect quadRect(scrollbarLayerRectToContentRect(foreTrackRect)); |
gfx::Rect opaqueRect(contentsOpaque() ? quadRect : gfx::Rect()); |
+ gfx::RectF uvRect(toUVRect(foreTrackRect, boundsRect)); |
const float opacity[] = {1.0f, 1.0f, 1.0f, 1.0f}; |
scoped_ptr<TextureDrawQuad> quad = TextureDrawQuad::Create(); |
- quad->SetNew(sharedQuadState, quadRect, opaqueRect, m_foreTrackResourceId, premultipledAlpha, toUVRect(foreTrackRect, boundsRect), opacity, flipped); |
+ quad->SetNew(sharedQuadState, quadRect, opaqueRect, m_foreTrackResourceId, premultipledAlpha, uvRect.origin(), uvRect.bottom_right(), opacity, flipped); |
quadSink.append(quad.PassAs<DrawQuad>(), appendQuadsData); |
} |
@@ -143,7 +145,7 @@ void ScrollbarLayerImpl::appendQuads(QuadSink& quadSink, AppendQuadsData& append |
gfx::Rect opaqueRect(contentsOpaque() ? quadRect : gfx::Rect()); |
const float opacity[] = {1.0f, 1.0f, 1.0f, 1.0f}; |
scoped_ptr<TextureDrawQuad> quad = TextureDrawQuad::Create(); |
- quad->SetNew(sharedQuadState, quadRect, opaqueRect, m_backTrackResourceId, premultipledAlpha, uvRect, opacity, flipped); |
+ quad->SetNew(sharedQuadState, quadRect, opaqueRect, m_backTrackResourceId, premultipledAlpha, uvTopLeft, uvBottomRight, opacity, flipped); |
quadSink.append(quad.PassAs<DrawQuad>(), appendQuadsData); |
} |
} |