diff options
| author | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-26 23:37:40 +0000 |
|---|---|---|
| committer | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-26 23:37:40 +0000 |
| commit | 8aff93381cafd5fb209e13be6dafcf2617c226b8 (patch) | |
| tree | 355fce9cac28cadd8acfb35ad51f809d2e5b3e3f /cc/CCScrollbarLayerImpl.cpp | |
| parent | b5fd05d58de63636fb77013e58cc2051ea213407 (diff) | |
| download | chromium_src-8aff93381cafd5fb209e13be6dafcf2617c226b8.zip chromium_src-8aff93381cafd5fb209e13be6dafcf2617c226b8.tar.gz chromium_src-8aff93381cafd5fb209e13be6dafcf2617c226b8.tar.bz2 | |
cc: Remove OwnPtr usage from CCRenderPass and CCDrawQuad class hierarchy.
Replaces OwnPtr with scoped_ptr throughout.
Covered by existing tests
R=jamesr,enne
BUG=152049
Review URL: https://codereview.chromium.org/10989024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@158929 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/CCScrollbarLayerImpl.cpp')
| -rw-r--r-- | cc/CCScrollbarLayerImpl.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cc/CCScrollbarLayerImpl.cpp b/cc/CCScrollbarLayerImpl.cpp index dd4791f..42aac84 100644 --- a/cc/CCScrollbarLayerImpl.cpp +++ b/cc/CCScrollbarLayerImpl.cpp @@ -91,9 +91,9 @@ void CCScrollbarLayerImpl::appendQuads(CCQuadSink& quadSink, CCAppendQuadsData& thumbRect = WebRect(); if (m_thumbResourceId && !thumbRect.isEmpty()) { - OwnPtr<CCTextureDrawQuad> quad = CCTextureDrawQuad::create(sharedQuadState, layerRectToContentRect(thumbRect), m_thumbResourceId, premultipledAlpha, uvRect, flipped); + scoped_ptr<CCTextureDrawQuad> quad = CCTextureDrawQuad::create(sharedQuadState, layerRectToContentRect(thumbRect), m_thumbResourceId, premultipledAlpha, uvRect, flipped); quad->setNeedsBlending(); - quadSink.append(quad.release(), appendQuadsData); + quadSink.append(quad.PassAs<CCDrawQuad>(), appendQuadsData); } if (!m_backTrackResourceId) @@ -101,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, layerRectToContentRect(foreTrackRect), m_foreTrackResourceId, premultipledAlpha, toUVRect(foreTrackRect, boundsRect), flipped), appendQuadsData); + quadSink.append(CCTextureDrawQuad::create(sharedQuadState, layerRectToContentRect(foreTrackRect), m_foreTrackResourceId, premultipledAlpha, toUVRect(foreTrackRect, boundsRect), flipped).PassAs<CCDrawQuad>(), 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); + quadSink.append(CCTextureDrawQuad::create(sharedQuadState, IntRect(contentBoundsRect), m_backTrackResourceId, premultipledAlpha, uvRect, flipped).PassAs<CCDrawQuad>(), appendQuadsData); } void CCScrollbarLayerImpl::didLoseContext() |