Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(48)

Side by Side Diff: cc/CCRenderPassDrawQuad.cpp

Issue 11047032: cc: Use syntax sugar 'make_scoped_ptr' in more places. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « cc/CCRenderPass.cpp ('k') | cc/CCSharedQuadState.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 6
7 #include "CCRenderPassDrawQuad.h" 7 #include "CCRenderPassDrawQuad.h"
8 8
9 namespace cc { 9 namespace cc {
10 10
11 scoped_ptr<CCRenderPassDrawQuad> CCRenderPassDrawQuad::create(const CCSharedQuad State* sharedQuadState, const IntRect& quadRect, CCRenderPass::Id renderPassId, bool isReplica, const CCResourceProvider::ResourceId maskResourceId, const IntRe ct& contentsChangedSinceLastFrame, float maskTexCoordScaleX, float maskTexCoordS caleY, float maskTexCoordOffsetX, float maskTexCoordOffsetY) 11 scoped_ptr<CCRenderPassDrawQuad> CCRenderPassDrawQuad::create(const CCSharedQuad State* sharedQuadState, const IntRect& quadRect, CCRenderPass::Id renderPassId, bool isReplica, const CCResourceProvider::ResourceId maskResourceId, const IntRe ct& contentsChangedSinceLastFrame, float maskTexCoordScaleX, float maskTexCoordS caleY, float maskTexCoordOffsetX, float maskTexCoordOffsetY)
12 { 12 {
13 return scoped_ptr<CCRenderPassDrawQuad>(new CCRenderPassDrawQuad(sharedQuadS tate, quadRect, renderPassId, isReplica, maskResourceId, contentsChangedSinceLas tFrame, maskTexCoordScaleX, maskTexCoordScaleY, maskTexCoordOffsetX, maskTexCoor dOffsetY)); 13 return make_scoped_ptr(new CCRenderPassDrawQuad(sharedQuadState, quadRect, r enderPassId, isReplica, maskResourceId, contentsChangedSinceLastFrame, maskTexCo ordScaleX, maskTexCoordScaleY, maskTexCoordOffsetX, maskTexCoordOffsetY));
14 } 14 }
15 15
16 CCRenderPassDrawQuad::CCRenderPassDrawQuad(const CCSharedQuadState* sharedQuadSt ate, const IntRect& quadRect, CCRenderPass::Id renderPassId, bool isReplica, CCR esourceProvider::ResourceId maskResourceId, const IntRect& contentsChangedSinceL astFrame, float maskTexCoordScaleX, float maskTexCoordScaleY, float maskTexCoord OffsetX, float maskTexCoordOffsetY) 16 CCRenderPassDrawQuad::CCRenderPassDrawQuad(const CCSharedQuadState* sharedQuadSt ate, const IntRect& quadRect, CCRenderPass::Id renderPassId, bool isReplica, CCR esourceProvider::ResourceId maskResourceId, const IntRect& contentsChangedSinceL astFrame, float maskTexCoordScaleX, float maskTexCoordScaleY, float maskTexCoord OffsetX, float maskTexCoordOffsetY)
17 : CCDrawQuad(sharedQuadState, CCDrawQuad::RenderPass, quadRect) 17 : CCDrawQuad(sharedQuadState, CCDrawQuad::RenderPass, quadRect)
18 , m_renderPassId(renderPassId) 18 , m_renderPassId(renderPassId)
19 , m_isReplica(isReplica) 19 , m_isReplica(isReplica)
20 , m_maskResourceId(maskResourceId) 20 , m_maskResourceId(maskResourceId)
21 , m_contentsChangedSinceLastFrame(contentsChangedSinceLastFrame) 21 , m_contentsChangedSinceLastFrame(contentsChangedSinceLastFrame)
22 , m_maskTexCoordScaleX(maskTexCoordScaleX) 22 , m_maskTexCoordScaleX(maskTexCoordScaleX)
23 , m_maskTexCoordScaleY(maskTexCoordScaleY) 23 , m_maskTexCoordScaleY(maskTexCoordScaleY)
(...skipping 16 matching lines...) Expand all
40 ASSERT(bytes); 40 ASSERT(bytes);
41 41
42 scoped_ptr<CCRenderPassDrawQuad> copyQuad(reinterpret_cast<CCRenderPassDrawQ uad*>(new char[bytes])); 42 scoped_ptr<CCRenderPassDrawQuad> copyQuad(reinterpret_cast<CCRenderPassDrawQ uad*>(new char[bytes]));
43 memcpy(copyQuad.get(), this, bytes); 43 memcpy(copyQuad.get(), this, bytes);
44 copyQuad->setSharedQuadState(copiedSharedQuadState); 44 copyQuad->setSharedQuadState(copiedSharedQuadState);
45 copyQuad->m_renderPassId = copiedRenderPassId; 45 copyQuad->m_renderPassId = copiedRenderPassId;
46 46
47 return copyQuad.Pass(); 47 return copyQuad.Pass();
48 } 48 }
49 49
50 } 50 } // namespace cc
OLDNEW
« no previous file with comments | « cc/CCRenderPass.cpp ('k') | cc/CCSharedQuadState.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698