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

Side by Side Diff: cc/output/direct_renderer.h

Issue 1099383002: Change ScopedPtrHashMap's 2nd template parameter (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: custom deleter Created 5 years, 7 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
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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 CC_OUTPUT_DIRECT_RENDERER_H_ 5 #ifndef CC_OUTPUT_DIRECT_RENDERER_H_
6 #define CC_OUTPUT_DIRECT_RENDERER_H_ 6 #define CC_OUTPUT_DIRECT_RENDERER_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/containers/scoped_ptr_hash_map.h" 10 #include "base/containers/scoped_ptr_hash_map.h"
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 virtual bool FlippedFramebuffer(const DrawingFrame* frame) const = 0; 132 virtual bool FlippedFramebuffer(const DrawingFrame* frame) const = 0;
133 virtual void EnsureScissorTestEnabled() = 0; 133 virtual void EnsureScissorTestEnabled() = 0;
134 virtual void EnsureScissorTestDisabled() = 0; 134 virtual void EnsureScissorTestDisabled() = 0;
135 virtual void DiscardBackbuffer() {} 135 virtual void DiscardBackbuffer() {}
136 virtual void EnsureBackbuffer() {} 136 virtual void EnsureBackbuffer() {}
137 137
138 virtual void CopyCurrentRenderPassToBitmap( 138 virtual void CopyCurrentRenderPassToBitmap(
139 DrawingFrame* frame, 139 DrawingFrame* frame,
140 scoped_ptr<CopyOutputRequest> request) = 0; 140 scoped_ptr<CopyOutputRequest> request) = 0;
141 141
142 base::ScopedPtrHashMap<RenderPassId, ScopedResource> render_pass_textures_; 142 base::ScopedPtrHashMap<RenderPassId, scoped_ptr<ScopedResource>>
143 render_pass_textures_;
143 OutputSurface* output_surface_; 144 OutputSurface* output_surface_;
144 ResourceProvider* resource_provider_; 145 ResourceProvider* resource_provider_;
145 scoped_ptr<OverlayProcessor> overlay_processor_; 146 scoped_ptr<OverlayProcessor> overlay_processor_;
146 147
147 // For use in coordinate conversion, this stores the output rect, viewport 148 // For use in coordinate conversion, this stores the output rect, viewport
148 // rect (= unflipped version of glViewport rect), the size of target 149 // rect (= unflipped version of glViewport rect), the size of target
149 // framebuffer, and the current window space viewport. During a draw, this 150 // framebuffer, and the current window space viewport. During a draw, this
150 // stores the values for the current render pass; in between draws, they 151 // stores the values for the current render pass; in between draws, they
151 // retain the values for the root render pass of the last draw. 152 // retain the values for the root render pass of the last draw.
152 gfx::Rect current_draw_rect_; 153 gfx::Rect current_draw_rect_;
153 gfx::Rect current_viewport_rect_; 154 gfx::Rect current_viewport_rect_;
154 gfx::Size current_surface_size_; 155 gfx::Size current_surface_size_;
155 gfx::Rect current_window_space_viewport_; 156 gfx::Rect current_window_space_viewport_;
156 157
157 private: 158 private:
158 gfx::Vector2d enlarge_pass_texture_amount_; 159 gfx::Vector2d enlarge_pass_texture_amount_;
159 160
160 DISALLOW_COPY_AND_ASSIGN(DirectRenderer); 161 DISALLOW_COPY_AND_ASSIGN(DirectRenderer);
161 }; 162 };
162 163
163 } // namespace cc 164 } // namespace cc
164 165
165 #endif // CC_OUTPUT_DIRECT_RENDERER_H_ 166 #endif // CC_OUTPUT_DIRECT_RENDERER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698