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

Side by Side Diff: cc/CCRenderPass.h

Issue 11034006: Remove the CCOcclusionTracker include from CCRenderPass header file (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 | « no previous file | no next file » | 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 "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "cc/hash_pair.h" 9 #include "cc/hash_pair.h"
10 #include "cc/scoped_ptr_hash_map.h" 10 #include "cc/scoped_ptr_hash_map.h"
11 #include "cc/scoped_ptr_vector.h" 11 #include "cc/scoped_ptr_vector.h"
12 #include "CCDrawQuad.h" 12 #include "CCDrawQuad.h"
13 #include "CCOcclusionTracker.h"
14 #include "CCSharedQuadState.h" 13 #include "CCSharedQuadState.h"
15 #include "FloatRect.h" 14 #include "FloatRect.h"
16 #include "SkColor.h" 15 #include "SkColor.h"
17 #include <public/WebFilterOperations.h> 16 #include <public/WebFilterOperations.h>
18 #include <public/WebTransformationMatrix.h> 17 #include <public/WebTransformationMatrix.h>
19 #include <vector> 18 #include <vector>
20 19
21 namespace cc { 20 namespace cc {
22 21
23 class CCLayerImpl; 22 class CCLayerImpl;
23 template<typename LayerType, typename SurfaceType>
24 class CCOcclusionTrackerBase;
24 class CCRenderSurface; 25 class CCRenderSurface;
25 26
26 struct CCAppendQuadsData; 27 struct CCAppendQuadsData;
27 28
29 typedef CCOcclusionTrackerBase<CCLayerImpl, CCRenderSurface> CCOcclusionTrackerI mpl;
30
28 // A list of CCDrawQuad objects, sorted internally in front-to-back order. 31 // A list of CCDrawQuad objects, sorted internally in front-to-back order.
29 class CCQuadList : public ScopedPtrVector<CCDrawQuad> { 32 class CCQuadList : public ScopedPtrVector<CCDrawQuad> {
30 public: 33 public:
31 typedef reverse_iterator backToFrontIterator; 34 typedef reverse_iterator backToFrontIterator;
32 typedef const_reverse_iterator constBackToFrontIterator; 35 typedef const_reverse_iterator constBackToFrontIterator;
33 36
34 inline backToFrontIterator backToFrontBegin() { return rbegin(); } 37 inline backToFrontIterator backToFrontBegin() { return rbegin(); }
35 inline backToFrontIterator backToFrontEnd() { return rend(); } 38 inline backToFrontIterator backToFrontEnd() { return rend(); }
36 inline constBackToFrontIterator backToFrontBegin() const { return rbegin(); } 39 inline constBackToFrontIterator backToFrontBegin() const { return rbegin(); }
37 inline constBackToFrontIterator backToFrontEnd() const { return rend(); } 40 inline constBackToFrontIterator backToFrontEnd() const { return rend(); }
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 #error define a hash function for your compiler 131 #error define a hash function for your compiler
129 #endif // COMPILER 132 #endif // COMPILER
130 } 133 }
131 134
132 namespace cc { 135 namespace cc {
133 typedef std::vector<CCRenderPass*> CCRenderPassList; 136 typedef std::vector<CCRenderPass*> CCRenderPassList;
134 typedef ScopedPtrHashMap<CCRenderPass::Id, CCRenderPass> CCRenderPassIdHashMap; 137 typedef ScopedPtrHashMap<CCRenderPass::Id, CCRenderPass> CCRenderPassIdHashMap;
135 } // namespace cc 138 } // namespace cc
136 139
137 #endif 140 #endif
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698