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

Unified Diff: cc/output/direct_renderer.cc

Issue 23653002: Move ScopedPtrHashMap from cc to base (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: jam's comment Created 7 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/output/direct_renderer.h ('k') | cc/quads/render_pass.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/output/direct_renderer.cc
diff --git a/cc/output/direct_renderer.cc b/cc/output/direct_renderer.cc
index a664d7df822836f734567d4f3489749fb716a5e6..72e6028f84c3dc42ce6d7fe5b73510d3c66875e2 100644
--- a/cc/output/direct_renderer.cc
+++ b/cc/output/direct_renderer.cc
@@ -8,6 +8,7 @@
#include <vector>
#include "base/containers/hash_tables.h"
+#include "base/containers/scoped_ptr_hash_map.h"
#include "base/debug/trace_event.h"
#include "base/metrics/histogram.h"
#include "cc/base/math_util.h"
@@ -151,7 +152,8 @@ void DirectRenderer::DecideRenderPassAllocationsForFrame(
render_passes_in_draw_order[i]->id, render_passes_in_draw_order[i]));
std::vector<RenderPass::Id> passes_to_delete;
- ScopedPtrHashMap<RenderPass::Id, CachedResource>::const_iterator pass_iter;
+ base::ScopedPtrHashMap<RenderPass::Id, CachedResource>::const_iterator
+ pass_iter;
for (pass_iter = render_pass_textures_.begin();
pass_iter != render_pass_textures_.end();
++pass_iter) {
@@ -169,7 +171,7 @@ void DirectRenderer::DecideRenderPassAllocationsForFrame(
DCHECK(texture);
bool size_appropriate = texture->size().width() >= required_size.width() &&
- texture->size().height() >= required_size.height();
+ texture->size().height() >= required_size.height();
if (texture->id() &&
(!size_appropriate || texture->format() != required_format))
texture->Free();
« no previous file with comments | « cc/output/direct_renderer.h ('k') | cc/quads/render_pass.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698