From 5bc29a2dabe01f1e2315bcc287f11db10df4144b Mon Sep 17 00:00:00 2001 From: "jamesr@chromium.org" Date: Thu, 1 Nov 2012 21:21:59 +0000 Subject: Revert 165476 - Remove static thread pointers from CC Might be causing webkit_unit_tests to fail on mac/win BUG=152904 Review URL: https://codereview.chromium.org/11232051 TBR=jamesr@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165501 0039d316-1c4b-4281-b951-d872f2087c98 --- cc/prioritized_texture_manager.h | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'cc/prioritized_texture_manager.h') diff --git a/cc/prioritized_texture_manager.h b/cc/prioritized_texture_manager.h index b0127db..92d739f 100644 --- a/cc/prioritized_texture_manager.h +++ b/cc/prioritized_texture_manager.h @@ -11,7 +11,6 @@ #include "base/basictypes.h" #include "base/hash_tables.h" #include "base/memory/scoped_ptr.h" -#include "cc/proxy.h" #include "cc/prioritized_texture.h" #include "cc/priority_calculator.h" #include "cc/texture.h" @@ -32,13 +31,12 @@ struct hash { namespace cc { class PriorityCalculator; -class Proxy; class PrioritizedTextureManager { public: - static scoped_ptr create(size_t maxMemoryLimitBytes, int maxTextureSize, int pool, const Proxy* proxy) + static scoped_ptr create(size_t maxMemoryLimitBytes, int maxTextureSize, int pool) { - return make_scoped_ptr(new PrioritizedTextureManager(maxMemoryLimitBytes, maxTextureSize, pool, proxy)); + return make_scoped_ptr(new PrioritizedTextureManager(maxMemoryLimitBytes, maxTextureSize, pool)); } scoped_ptr createTexture(gfx::Size size, GLenum format) { @@ -109,8 +107,6 @@ public: // Mark all textures' backings as being in the drawing impl tree. void updateBackingsInDrawingImplTree(); - const Proxy* proxyForDebug() const; - private: friend class PrioritizedTextureTest; @@ -145,7 +141,7 @@ private: return a < b; } - PrioritizedTextureManager(size_t maxMemoryLimitBytes, int maxTextureSize, int pool, const Proxy* proxy); + PrioritizedTextureManager(size_t maxMemoryLimitBytes, int maxTextureSize, int pool); bool evictBackingsToReduceMemory(size_t limitBytes, int priorityCutoff, EvictionPolicy, ResourceProvider*); PrioritizedTexture::Backing* createBacking(gfx::Size, GLenum format, ResourceProvider*); @@ -171,8 +167,6 @@ private: typedef base::hash_set TextureSet; typedef std::vector TextureVector; - const Proxy* m_proxy; - TextureSet m_textures; // This list is always sorted in eviction order, with the exception the // newly-allocated or recycled textures at the very end of the tail that -- cgit v1.1