| Index: cc/scrollbar_layer_impl.cc
|
| diff --git a/cc/scrollbar_layer_impl.cc b/cc/scrollbar_layer_impl.cc
|
| index 2b82529de8399169f009e2cba28f32923161d0d2..5b6968dc16f399c43f459be52fce8d487965d03e 100644
|
| --- a/cc/scrollbar_layer_impl.cc
|
| +++ b/cc/scrollbar_layer_impl.cc
|
| @@ -97,7 +97,8 @@ void ScrollbarLayerImpl::appendQuads(QuadSink& quadSink, AppendQuadsData& append
|
| if (m_thumbResourceId && !thumbRect.isEmpty()) {
|
| gfx::Rect quadRect(scrollbarLayerRectToContentRect(thumbRect));
|
| gfx::Rect opaqueRect;
|
| - scoped_ptr<TextureDrawQuad> quad = TextureDrawQuad::create(sharedQuadState, quadRect, opaqueRect, m_thumbResourceId, premultipledAlpha, uvRect, flipped);
|
| + scoped_ptr<TextureDrawQuad> quad = TextureDrawQuad::Create();
|
| + quad->SetNew(sharedQuadState, quadRect, opaqueRect, m_thumbResourceId, premultipledAlpha, uvRect, flipped);
|
| quadSink.append(quad.PassAs<DrawQuad>(), appendQuadsData);
|
| }
|
|
|
| @@ -108,7 +109,9 @@ void ScrollbarLayerImpl::appendQuads(QuadSink& quadSink, AppendQuadsData& append
|
| if (m_foreTrackResourceId && !foreTrackRect.isEmpty()) {
|
| gfx::Rect quadRect(scrollbarLayerRectToContentRect(foreTrackRect));
|
| gfx::Rect opaqueRect(contentsOpaque() ? quadRect : gfx::Rect());
|
| - quadSink.append(TextureDrawQuad::create(sharedQuadState, quadRect, opaqueRect, m_foreTrackResourceId, premultipledAlpha, toUVRect(foreTrackRect, boundsRect), flipped).PassAs<DrawQuad>(), appendQuadsData);
|
| + scoped_ptr<TextureDrawQuad> quad = TextureDrawQuad::Create();
|
| + quad->SetNew(sharedQuadState, quadRect, opaqueRect, m_foreTrackResourceId, premultipledAlpha, toUVRect(foreTrackRect, boundsRect), flipped);
|
| + quadSink.append(quad.PassAs<DrawQuad>(), 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
|
| @@ -116,7 +119,9 @@ void ScrollbarLayerImpl::appendQuads(QuadSink& quadSink, AppendQuadsData& append
|
| if (!contentBoundsRect.IsEmpty()) {
|
| gfx::Rect quadRect(contentBoundsRect);
|
| gfx::Rect opaqueRect(contentsOpaque() ? quadRect : gfx::Rect());
|
| - quadSink.append(TextureDrawQuad::create(sharedQuadState, quadRect, opaqueRect, m_backTrackResourceId, premultipledAlpha, uvRect, flipped).PassAs<DrawQuad>(), appendQuadsData);
|
| + scoped_ptr<TextureDrawQuad> quad = TextureDrawQuad::Create();
|
| + quad->SetNew(sharedQuadState, quadRect, opaqueRect, m_backTrackResourceId, premultipledAlpha, uvRect, flipped);
|
| + quadSink.append(quad.PassAs<DrawQuad>(), appendQuadsData);
|
| }
|
| }
|
|
|
|
|