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

Unified Diff: cc/resource_provider.h

Issue 11571053: Revert r173875 - "cc: Defer texture allocation (to allow async allocations)." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years 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_impl_unittest.cc ('k') | cc/resource_provider.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/resource_provider.h
diff --git a/cc/resource_provider.h b/cc/resource_provider.h
index 9b5b54b63475a413d3b65ca32d761f5cc6e856de..d90d2244340edfdc731913b8505f1dde6c5e4005 100644
--- a/cc/resource_provider.h
+++ b/cc/resource_provider.h
@@ -230,10 +230,6 @@ public:
void beginSetPixels(ResourceId id);
bool didSetPixelsComplete(ResourceId id);
- // For tests only! This prevents detecting uninitialized reads.
- // Use setPixels or lockForWrite to allocate implicitly.
- void allocateForTesting(ResourceId id);
-
private:
struct Resource {
Resource();
@@ -254,7 +250,6 @@ private:
bool exported;
bool markedForDeletion;
bool pendingSetPixels;
- bool allocated;
gfx::Size size;
GLenum format;
// TODO(skyostil): Use a separate sampler object for filter state.
@@ -282,7 +277,6 @@ private:
bool transferResource(WebKit::WebGraphicsContext3D*, ResourceId, TransferableResource*);
void deleteResourceInternal(ResourceMap::iterator it);
- void lazyAllocate(Resource*);
OutputSurface* m_outputSurface;
ResourceId m_nextId;
« no previous file with comments | « cc/layer_tree_host_impl_unittest.cc ('k') | cc/resource_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698