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

Unified Diff: cc/prioritized_resource.h

Issue 11377055: cc: Rename Texture class to Resource. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years, 1 month 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/layer_tree_host.cc ('k') | cc/prioritized_resource.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/prioritized_resource.h
diff --git a/cc/prioritized_resource.h b/cc/prioritized_resource.h
index 8197e57c9b81e6f078adbec15aa4e7fb5e04e069..2f8cac8455c307d9d80991dff5c48259b5f8cf48 100644
--- a/cc/prioritized_resource.h
+++ b/cc/prioritized_resource.h
@@ -10,12 +10,12 @@
#include "base/memory/scoped_ptr.h"
#include "cc/cc_export.h"
#include "cc/priority_calculator.h"
+#include "cc/resource.h"
#include "cc/resource_provider.h"
-#include "cc/texture.h"
+#include "third_party/khronos/GLES2/gl2.h"
#include "ui/gfx/rect.h"
#include "ui/gfx/size.h"
#include "ui/gfx/vector2d.h"
-#include "third_party/khronos/GLES2/gl2.h"
namespace cc {
@@ -92,7 +92,7 @@ private:
friend class PrioritizedResourceManager;
friend class PrioritizedResourceTest;
- class Backing : public Texture {
+ class Backing : public Resource {
public:
Backing(unsigned id, ResourceProvider*, gfx::Size, GLenum format);
~Backing();
« no previous file with comments | « cc/layer_tree_host.cc ('k') | cc/prioritized_resource.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698