cc: ReadyToDraw notifications.

cc/layers/picture_layer_impl.cc

Index: cc/layers/picture_layer_impl.cc
diff --git a/cc/layers/picture_layer_impl.cc b/cc/layers/picture_layer_impl.cc
index 687243c5984f6e30ad6aaff83c680e665521a418..dcd6f2794f2cd63a8adde6dbd18eb558c3e80fc3 100644
--- a/cc/layers/picture_layer_impl.cc
+++ b/cc/layers/picture_layer_impl.cc
@@ -1359,12 +1359,9 @@ 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 base::Callback<bool(PictureLayerTiling* tiling, const Tile*)>&

[danakj, 2014/10/31 17:00:57]

Can you give this callback type a name somewhere, so you don't have to repeat
its definition everywhere like this?

[danakj, 2014/10/31 18:41:31]

ignore this comment :)

+        is_tile_required_callback) const {
   if (!HasValidTilePriorities())
     return true;
 
@@ -1396,11 +1393,10 @@ bool PictureLayerImpl::AllTilesRequiredForActivationAreReadyToDraw() const {
       // 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()) {
+      if (is_tile_required_callback.Run(tiling, tile) &&
+          !tile->IsReadyToDraw()) {
         TRACE_EVENT_INSTANT0("cc",
-                             "PictureLayerImpl::"
-                             "AllTilesRequiredForActivationAreReadyToDraw not "
-                             "ready to activate",
+                             "Tile required, but not ready to draw.",
                              TRACE_EVENT_SCOPE_THREAD);
         return false;
       }
@@ -1410,6 +1406,39 @@ bool PictureLayerImpl::AllTilesRequiredForActivationAreReadyToDraw() const {
   return true;
 }
 
+namespace {
+bool IsTileRequiredForActivationIfVisible(PictureLayerTiling* tiling,
+                                          const Tile* tile) {
+  return tiling->IsTileRequiredForActivationIfVisible(tile);
+}
+
+bool IsTileRequiredForDrawIfVisible(PictureLayerTiling* tiling,
+                                    const Tile* tile) {
+  return tiling->IsTileRequiredForDrawIfVisible(tile);
+}
+}  // namespace
+
+bool PictureLayerImpl::AllTilesRequiredForActivationAreReadyToDraw() const {
+  TRACE_EVENT0("cc",
+               "PictureLayerImpl::AllTilesRequiredForActivationAreReadyToDraw");
+
+  if (!layer_tree_impl()->IsPendingTree())
+    return true;
+
+  return AllTilesRequiredAreReadyToDraw(
+      base::Bind(&IsTileRequiredForActivationIfVisible));

[danakj, 2014/10/31 17:00:57]

this seems like a functor (function pointer) would be better suited for this,
like how STL classes work, than Bind/Callback which is much more heavyweight.

You can templatize the AllTilesRequiredAreReadyToDraw like

template <typename F>
bool AllTilesRequiredAreReadyToDraw(const F& is_tile_required_callback) const {
...
   ... is_tile_required_callback(tiling, tile) ...
...
}


And then just call it like
  return AllTilesRequiredAreReadyToDraw(&IsTileRequiredForActivationIfVisible);

[ernstm, 2014/11/03 22:34:41]

Done.

+}
+
+bool PictureLayerImpl::AllTilesRequiredForDrawAreReadyToDraw() const {
+  TRACE_EVENT0("cc", "PictureLayerImpl::AllTilesRequiredForDrawAreReadyToDraw");
+
+  if (!layer_tree_impl()->IsActiveTree())
+    return true;
+
+  return AllTilesRequiredAreReadyToDraw(
+      base::Bind(&IsTileRequiredForDrawIfVisible));
+}
+
 PictureLayerImpl::LayerRasterTileIterator::LayerRasterTileIterator()
     : layer_(nullptr), current_stage_(arraysize(stages_)) {
 }