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

cc/resource_provider.h

Index: cc/resource_provider.h
diff --git a/cc/resource_provider.h b/cc/resource_provider.h
index 1cc4f274828513b8e695a8129118740bcfc186b6..0dc7eabdd5a6b129554102828d9b33bce9dc67c1 100644
--- a/cc/resource_provider.h
+++ b/cc/resource_provider.h
@@ -280,6 +280,7 @@ class CC_EXPORT ResourceProvider {
 
   // Asynchronously update pixels from acquired pixel buffer.
   void BeginSetPixels(ResourceId id);
+  void InsertWaitForSetPixels(ResourceId id);
   bool DidSetPixelsComplete(ResourceId id);
   void AbortSetPixels(ResourceId id);
 
@@ -328,6 +329,7 @@ class CC_EXPORT ResourceProvider {
     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;