Delay activation/draw on GPU tile work completion

cc/tiles/tile_draw_info.h

 // Copyright 2013 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_TILES_TILE_DRAW_INFO_H_
 #define CC_TILES_TILE_DRAW_INFO_H_
 
 #include <memory>
 
 #include "base/trace_event/trace_event_argument.h"
 #include "cc/resources/platform_color.h"
 #include "cc/resources/resource_provider.h"
 #include "cc/resources/scoped_resource.h"
 
 namespace cc {
 
 // This class holds all the state relevant to drawing a tile.
 class CC_EXPORT TileDrawInfo {
  public:
   enum Mode { RESOURCE_MODE, SOLID_COLOR_MODE, OOM_MODE };
 
   TileDrawInfo();
   ~TileDrawInfo();
 
   Mode mode() const { return mode_; }
 
   bool IsReadyToDraw() const {
     switch (mode_) {
       case RESOURCE_MODE:
-        return !!resource_;
+        return is_resource_ready_to_draw_;
       case SOLID_COLOR_MODE:
       case OOM_MODE:
         return true;
     }
     NOTREACHED();
     return false;
   }
   bool NeedsRaster() const {
     switch (mode_) {
       case RESOURCE_MODE:
@@ skipping 33 matching lines @@
   inline bool has_resource() const { return !!resource_; }
 
   inline bool has_compressed_resource() const {
     return resource_ ? IsResourceFormatCompressed(resource_->format()) : false;
   }
 
   void SetSolidColorForTesting(SkColor color) { set_solid_color(color); }
 
   void AsValueInto(base::trace_event::TracedValue* state) const;
 
-  void set_was_ever_ready_to_draw() { was_ever_ready_to_draw_ = true; }
   void set_was_ever_used_to_draw() { was_ever_used_to_draw_ = true; }
   void set_was_a_prepaint_tile() { was_a_prepaint_tile_ = true; }
 
  private:
   friend class Tile;
   friend class TileManager;
 
-  void set_use_resource() { mode_ = RESOURCE_MODE; }
+  const Resource* resource() const { return resource_; }
+
+  void set_resource(Resource* resource) {
+    mode_ = RESOURCE_MODE;
+    is_resource_ready_to_draw_ = false;
+    resource_ = resource;
+  }
+
+  void set_resource_ready_for_draw() {
+    is_resource_ready_to_draw_ = true;
+    was_ever_ready_to_draw_ = true;
+  }
+
+  Resource* TakeResource();
 
   void set_solid_color(const SkColor& color) {
     mode_ = SOLID_COLOR_MODE;
     solid_color_ = color;
+    was_ever_ready_to_draw_ = true;
   }
 
   void set_oom() { mode_ = OOM_MODE; }
 
-  Mode mode_;
-  SkColor solid_color_;
-  Resource* resource_;
-  bool contents_swizzled_;
+  Mode mode_ = RESOURCE_MODE;
+  SkColor solid_color_ = SK_ColorWHITE;
+  Resource* resource_ = nullptr;
+  bool contents_swizzled_ = false;
+  bool is_resource_ready_to_draw_ = false;
 
   // Used for gathering UMA stats.
   bool was_ever_ready_to_draw_ : 1;
   bool was_ever_used_to_draw_ : 1;
   bool was_a_prepaint_tile_ : 1;
 };
 
 }  // namespace cc
 
 #endif  // CC_TILES_TILE_DRAW_INFO_H_