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

Unified Diff: cc/output/direct_renderer.h

Issue 1587283002: Switch cc to std::unordered_*. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@unordered-map
Patch Set: Fix MSVC build issue Created 4 years, 11 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/layers/scrollbar_layer_unittest.cc ('k') | cc/output/direct_renderer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/output/direct_renderer.h
diff --git a/cc/output/direct_renderer.h b/cc/output/direct_renderer.h
index 2f6736f2df0f2f8897cde9bf3a09b74ac7d4301c..0d032f1513ae4dbae13b945fee117ba52151e46b 100644
--- a/cc/output/direct_renderer.h
+++ b/cc/output/direct_renderer.h
@@ -5,8 +5,9 @@
#ifndef CC_OUTPUT_DIRECT_RENDERER_H_
#define CC_OUTPUT_DIRECT_RENDERER_H_
+#include <unordered_map>
+
#include "base/callback.h"
-#include "base/containers/scoped_ptr_hash_map.h"
#include "base/macros.h"
#include "cc/base/cc_export.h"
#include "cc/output/ca_layer_overlay.h"
@@ -18,7 +19,6 @@
#include "ui/gfx/geometry/quad_f.h"
namespace cc {
-
class DrawPolygon;
class ResourceProvider;
@@ -141,7 +141,7 @@ class CC_EXPORT DirectRenderer : public Renderer {
scoped_ptr<CopyOutputRequest> request) = 0;
// TODO(danakj): Just use a vector of pairs here? Hash map is way overkill.
- base::ScopedPtrHashMap<RenderPassId, scoped_ptr<ScopedResource>>
+ std::unordered_map<RenderPassId, scoped_ptr<ScopedResource>, RenderPassIdHash>
render_pass_textures_;
OutputSurface* output_surface_;
ResourceProvider* resource_provider_;
« no previous file with comments | « cc/layers/scrollbar_layer_unittest.cc ('k') | cc/output/direct_renderer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698