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

Side by Side Diff: cc/CCRenderPass.h

Issue 10989024: cc: Remove OwnPtr usage from CCRenderPass and CCDrawQuad class hierarchy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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/CCQuadSink.h ('k') | cc/CCRenderPass.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 #ifndef CCRenderPass_h 5 #ifndef CCRenderPass_h
6 #define CCRenderPass_h 6 #define CCRenderPass_h
7 7
8 #include "CCDrawQuad.h" 8 #include "CCDrawQuad.h"
9 #include "CCOcclusionTracker.h" 9 #include "CCOcclusionTracker.h"
10 #include "CCSharedQuadState.h" 10 #include "CCSharedQuadState.h"
11 #include "FloatRect.h" 11 #include "FloatRect.h"
12 #include "SkColor.h" 12 #include "SkColor.h"
13 #include "cc/hash_pair.h" 13 #include "cc/hash_pair.h"
14 #include "cc/own_ptr_vector.h"
15 #include "cc/scoped_ptr_hash_map.h" 14 #include "cc/scoped_ptr_hash_map.h"
15 #include "cc/scoped_ptr_vector.h"
16 #include <public/WebFilterOperations.h> 16 #include <public/WebFilterOperations.h>
17 #include <public/WebTransformationMatrix.h> 17 #include <public/WebTransformationMatrix.h>
18 #include <wtf/Vector.h> 18 #include <wtf/Vector.h>
19 19
20 namespace cc { 20 namespace cc {
21 21
22 class CCLayerImpl; 22 class CCLayerImpl;
23 class CCRenderSurface; 23 class CCRenderSurface;
24 24
25 struct CCAppendQuadsData; 25 struct CCAppendQuadsData;
26 26
27 // A list of CCDrawQuad objects, sorted internally in front-to-back order. 27 // A list of CCDrawQuad objects, sorted internally in front-to-back order.
28 class CCQuadList : public OwnPtrVector<CCDrawQuad> { 28 class CCQuadList : public ScopedPtrVector<CCDrawQuad> {
29 public: 29 public:
30 typedef reverse_iterator backToFrontIterator; 30 typedef reverse_iterator backToFrontIterator;
31 typedef const_reverse_iterator constBackToFrontIterator; 31 typedef const_reverse_iterator constBackToFrontIterator;
32 32
33 inline backToFrontIterator backToFrontBegin() { return rbegin(); } 33 inline backToFrontIterator backToFrontBegin() { return rbegin(); }
34 inline backToFrontIterator backToFrontEnd() { return rend(); } 34 inline backToFrontIterator backToFrontEnd() { return rend(); }
35 inline constBackToFrontIterator backToFrontBegin() const { return rbegin(); } 35 inline constBackToFrontIterator backToFrontBegin() const { return rbegin(); }
36 inline constBackToFrontIterator backToFrontEnd() const { return rend(); } 36 inline constBackToFrontIterator backToFrontEnd() const { return rend(); }
37 }; 37 };
38 38
39 typedef OwnPtrVector<CCSharedQuadState> CCSharedQuadStateList; 39 typedef ScopedPtrVector<CCSharedQuadState> CCSharedQuadStateList;
40 40
41 class CCRenderPass { 41 class CCRenderPass {
42 WTF_MAKE_NONCOPYABLE(CCRenderPass); 42 WTF_MAKE_NONCOPYABLE(CCRenderPass);
43 public: 43 public:
44 ~CCRenderPass(); 44 ~CCRenderPass();
45 45
46 struct Id { 46 struct Id {
47 int layerId; 47 int layerId;
48 int index; 48 int index;
49 49
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 #error define a hash function for your compiler 126 #error define a hash function for your compiler
127 #endif // COMPILER 127 #endif // COMPILER
128 } 128 }
129 129
130 namespace cc { 130 namespace cc {
131 typedef Vector<CCRenderPass*> CCRenderPassList; 131 typedef Vector<CCRenderPass*> CCRenderPassList;
132 typedef ScopedPtrHashMap<CCRenderPass::Id, CCRenderPass> CCRenderPassIdHashMap; 132 typedef ScopedPtrHashMap<CCRenderPass::Id, CCRenderPass> CCRenderPassIdHashMap;
133 } // namespace cc 133 } // namespace cc
134 134
135 #endif 135 #endif
OLDNEW
« no previous file with comments | « cc/CCQuadSink.h ('k') | cc/CCRenderPass.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698