summaryrefslogtreecommitdiffstats
path: root/cc/prioritized_texture_manager.h
diff options
context:
space:
mode:
authordanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-31 20:52:25 +0000
committerdanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-31 20:52:25 +0000
commitf809d3bb86532d666d6094497b5b7f93f3b32a9e (patch)
treee37a05eb364b08446fbdd4a11e77a79eabf48d02 /cc/prioritized_texture_manager.h
parentd388fe22c8c1c6e80c990be37fe067634bfed7a9 (diff)
downloadchromium_src-f809d3bb86532d666d6094497b5b7f93f3b32a9e.zip
chromium_src-f809d3bb86532d666d6094497b5b7f93f3b32a9e.tar.gz
chromium_src-f809d3bb86532d666d6094497b5b7f93f3b32a9e.tar.bz2
Use gfx:: Geometry types for the resource provider and layer updater classes.
This depends on the gfx::Vector2d class from https://codereview.chromium.org/11269022/ Covered by existing tests, just changing data types. BUG=147395 R=enne Review URL: https://codereview.chromium.org/11266030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165225 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/prioritized_texture_manager.h')
-rw-r--r--cc/prioritized_texture_manager.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/cc/prioritized_texture_manager.h b/cc/prioritized_texture_manager.h
index 952b584..92d739f 100644
--- a/cc/prioritized_texture_manager.h
+++ b/cc/prioritized_texture_manager.h
@@ -8,8 +8,6 @@
#include <list>
#include <vector>
-#include "IntRect.h"
-#include "IntSize.h"
#include "base/basictypes.h"
#include "base/hash_tables.h"
#include "base/memory/scoped_ptr.h"
@@ -17,6 +15,7 @@
#include "cc/priority_calculator.h"
#include "cc/texture.h"
#include "third_party/khronos/GLES2/gl2.h"
+#include "ui/gfx/size.h"
#if defined(COMPILER_GCC)
namespace BASE_HASH_NAMESPACE {
@@ -39,7 +38,7 @@ public:
{
return make_scoped_ptr(new PrioritizedTextureManager(maxMemoryLimitBytes, maxTextureSize, pool));
}
- scoped_ptr<PrioritizedTexture> createTexture(IntSize size, GLenum format)
+ scoped_ptr<PrioritizedTexture> createTexture(gfx::Size size, GLenum format)
{
return make_scoped_ptr(new PrioritizedTexture(this, size, format));
}
@@ -145,7 +144,7 @@ private:
PrioritizedTextureManager(size_t maxMemoryLimitBytes, int maxTextureSize, int pool);
bool evictBackingsToReduceMemory(size_t limitBytes, int priorityCutoff, EvictionPolicy, ResourceProvider*);
- PrioritizedTexture::Backing* createBacking(IntSize, GLenum format, ResourceProvider*);
+ PrioritizedTexture::Backing* createBacking(gfx::Size, GLenum format, ResourceProvider*);
void evictFirstBackingResource(ResourceProvider*);
void deleteUnlinkedEvictedBackings();
void sortBackings();