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

Unified Diff: cc/CCResourceProvider.h

Issue 11031060: Revert 160267 - Merge 158192 - cc: Remove TextureUploaderOption. (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1271/src/
Patch Set: Created 8 years, 2 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/CCRendererGLTest.cpp ('k') | cc/CCResourceProvider.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/CCResourceProvider.h
===================================================================
--- cc/CCResourceProvider.h (revision 160268)
+++ cc/CCResourceProvider.h (working copy)
@@ -26,6 +26,8 @@
namespace cc {
+enum TextureUploaderOption { ThrottledUploader, UnthrottledUploader };
+
class IntRect;
class LayerTextureSubImage;
class TextureCopier;
@@ -59,7 +61,7 @@
unsigned syncPoint;
};
- static PassOwnPtr<CCResourceProvider> create(CCGraphicsContext*);
+ static PassOwnPtr<CCResourceProvider> create(CCGraphicsContext*, TextureUploaderOption);
virtual ~CCResourceProvider();
@@ -262,7 +264,7 @@
typedef HashMap<int, Child> ChildMap;
explicit CCResourceProvider(CCGraphicsContext*);
- bool initialize();
+ bool initialize(TextureUploaderOption);
const Resource* lockForRead(ResourceId);
void unlockForRead(ResourceId);
« no previous file with comments | « cc/CCRendererGLTest.cpp ('k') | cc/CCResourceProvider.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698