cc: ReadyToDraw notifications.

cc/layers/picture_layer_impl.cc

 // 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.
 
 #include "cc/layers/picture_layer_impl.h"
 
 #include <algorithm>
 #include <limits>
 #include <set>
 
@@ skipping 1350 matching lines @@
 }
 
 bool PictureLayerImpl::IsOnActiveOrPendingTree() const {
   return !layer_tree_impl()->IsRecycleTree();
 }
 
 bool PictureLayerImpl::HasValidTilePriorities() const {
   return IsOnActiveOrPendingTree() && IsDrawnRenderSurfaceLayerListMember();
 }
 
-bool PictureLayerImpl::AllTilesRequiredForActivationAreReadyToDraw() const {
-  TRACE_EVENT0("cc",
-               "PictureLayerImpl::AllTilesRequiredForActivationAreReadyToDraw");
-  if (!layer_tree_impl()->IsPendingTree())
-    return true;
-
+bool PictureLayerImpl::AllTilesRequiredAreReadyToDraw(
+    const char* action_name,

[vmpstr, 2014/10/24 18:02:23]

I don't think we need this. I'm not a fan of passing information like this just
so tracing is easier to interpret. We can just have an event that says "Tile
required, but not ready to draw"; we can see what it is required for from the
higher level trace.

[ernstm, 2014/10/27 21:13:56]

Done.

+    const base::Callback<bool(PictureLayerTiling* tiling, const Tile*)>&
+        IsTileRequiredCallback) const {
   if (!HasValidTilePriorities())
     return true;
 
   if (!tilings_)
     return true;
 
   if (visible_rect_for_tile_priority_.IsEmpty())
     return true;
 
   gfx::Rect rect = GetViewportForTilePriorityInContentSpace();
@@ skipping 11 matching lines @@
       // A null tile (i.e. missing recording) can just be skipped.
       // TODO(vmpstr): Verify this is true if we create tiles in raster
       // iterators.
       if (!tile)
         continue;
 
       // We can't check tile->required_for_activation, because that value might
       // be out of date. It is updated in the raster/eviction iterators.
       // TODO(vmpstr): Remove the comment once you can't access this information
       // from the tile.
-      if (tiling->IsTileRequiredForActivation(tile) && !tile->IsReadyToDraw()) {
-        TRACE_EVENT_INSTANT0("cc",
-                             "PictureLayerImpl::"
-                             "AllTilesRequiredForActivationAreReadyToDraw not "
-                             "ready to activate",
-                             TRACE_EVENT_SCOPE_THREAD);
+      if (IsTileRequiredCallback.Run(tiling, tile) && !tile->IsReadyToDraw()) {
+        std::string event_name = "Tiles required for " +

[vmpstr, 2014/10/24 18:02:23]

This would be constructed even when tracing is not enabled, which is something
we should avoid I think.

[ernstm, 2014/10/27 21:13:56]

Done.

+                                 std::string(action_name) +
+                                 " not ready to draw.";
+        TRACE_EVENT_INSTANT0(
+            "cc", event_name.c_str(), TRACE_EVENT_SCOPE_THREAD);
         return false;
       }
     }
   }
 
   return true;
 }
 
+bool PictureLayerImpl::IsTileRequiredForActivation(PictureLayerTiling* tiling,
+                                                   const Tile* tile) {
+  return tiling->IsTileRequiredForActivation(tile);
+}
+
+bool PictureLayerImpl::IsTileRequiredForDraw(PictureLayerTiling* tiling,
+                                             const Tile* tile) {
+  return tiling->IsTileRequiredForDraw(tile);
+}
+
+bool PictureLayerImpl::AllTilesRequiredForActivationAreReadyToDraw() const {
+  TRACE_EVENT0("cc",
+               "PictureLayerImpl::AllTilesRequiredForActivationAreReadyToDraw");
+
+  if (!layer_tree_impl()->IsPendingTree())
+    return true;
+
+  return AllTilesRequiredAreReadyToDraw(
+      "activation", base::Bind(&PictureLayerImpl::IsTileRequiredForActivation));
+}
+
+bool PictureLayerImpl::AllTilesRequiredForDrawAreReadyToDraw() const {
+  TRACE_EVENT0("cc", "PictureLayerImpl::AllTilesRequiredForDrawAreReadyToDraw");
+
+  if (!layer_tree_impl()->IsActiveTree())
+    return true;
+
+  return AllTilesRequiredAreReadyToDraw(
+      "draw", base::Bind(&PictureLayerImpl::IsTileRequiredForDraw));
+}
+
 PictureLayerImpl::LayerRasterTileIterator::LayerRasterTileIterator()
     : layer_(nullptr), current_stage_(arraysize(stages_)) {
 }
 
 PictureLayerImpl::LayerRasterTileIterator::LayerRasterTileIterator(
     PictureLayerImpl* layer,
     bool prioritize_low_res)
     : layer_(layer), current_stage_(0) {
   DCHECK(layer_);
 
@@ skipping 253 matching lines @@
       PictureLayerTilingSet::TilingRange tiling_range = CurrentTilingRange();
       size_t current_tiling_range_offset = current_tiling_ - tiling_range.start;
       return tiling_range.end - 1 - current_tiling_range_offset;
     }
   }
   NOTREACHED();
   return 0;
 }
 
 }  // namespace cc