cc: Complete pending tile uploads if they are needed for tree activation

cc/resource_provider.h

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CC_RESOURCE_PROVIDER_H_
 #define CC_RESOURCE_PROVIDER_H_
 
 #include <deque>
 #include <set>
 #include <string>
@@ skipping 262 matching lines @@
 
   // Map/unmap the acquired pixel buffer.
   uint8_t* MapPixelBuffer(ResourceId id);
   void UnmapPixelBuffer(ResourceId id);
 
   // Update pixels from acquired pixel buffer.
   void SetPixelsFromBuffer(ResourceId id);
 
   // Asynchronously update pixels from acquired pixel buffer.
   void BeginSetPixels(ResourceId id);
+  void InsertWaitForSetPixels(ResourceId id);

[nduca, 2013/03/11 19:41:47]

ForceSetPixelsToComplete?

[Sami, 2013/03/12 14:13:07]

sgtm, done.

   bool DidSetPixelsComplete(ResourceId id);
   void AbortSetPixels(ResourceId id);
 
   // For tests only! This prevents detecting uninitialized reads.
   // Use SetPixels or LockForWrite to allocate implicitly.
   void AllocateForTesting(ResourceId id);
 
   // Sets the current read fence. If a resource is locked for read
   // and has read fences enabled, the resource will not allow writes
   // until this fence has passed.
@@ skipping 28 matching lines @@
     unsigned gl_upload_query_id;
     TextureMailbox mailbox;
     uint8_t* pixels;
     uint8_t* pixel_buffer;
     int lock_for_read_count;
     bool locked_for_write;
     bool external;
     bool exported;
     bool marked_for_deletion;
     bool pending_set_pixels;
+    bool wait_for_set_pixels_inserted;
     bool allocated;
     bool enable_read_lock_fences;
     scoped_refptr<Fence> read_lock_fence;
     gfx::Size size;
     GLenum format;
     // TODO(skyostil): Use a separate sampler object for filter state.
     GLenum filter;
     ResourceType type;
   };
   typedef base::hash_map<ResourceId, Resource> ResourceMap;
@@ skipping 47 matching lines @@
   base::ThreadChecker thread_checker_;
 
   scoped_refptr<Fence> current_read_lock_fence_;
 
   DISALLOW_COPY_AND_ASSIGN(ResourceProvider);
 };
 
 }
 
 #endif  // CC_RESOURCE_PROVIDER_H_