Revert of cc: Change required_for_activation bookkeeping.

Revert of cc: Change required_for_activation bookkeeping. (https://codereview.chromium.org/257773009/)

Reason for revert:
Breaks DevTools rendering badly. See crbug.com/369086.

Original issue's description:
> cc: Change required_for_activation bookkeeping.
> 
> This patch changes the bookkeeping of whether required for activation
> tiles all received memory during AssignGpuMemory. The new approach
> doesn't rely on the fact that we process every tile in that loop, thus
> allowing us to early out or use another approach at getting tiles that
> does not guarantee that every tile will be visited.
> 
> The end goal is to evaluate if we can activate when the rasterizer
> notifies us that all tasks given to it that are required for
> activation are finished rather than trying to figure this out
> when we schedule tasks.
> 
> R=reveman, enne
> 
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=267400

TBR=enne@chromium.org,reveman@chromium.org,kbr@chromium.org,vmpstr@chromium.org
NOTREECHECKS=true
NOTRY=true

[pfeldman, 2014-05-01 13:30:50]

Created Revert of cc: Change required_for_activation bookkeeping.

[commit-bot: I haz the power, 2014-05-01 13:31:07]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/pfeldman@chromium.org/268683002/1

[commit-bot: I haz the power, 2014-05-01 13:31:11]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-05-01 13:31:12]

Failed to apply patch for cc/layers/picture_layer_impl.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file cc/layers/picture_layer_impl.cc
  Hunk #1 FAILED at 56.
  Hunk #2 FAILED at 407.
  Hunk #3 FAILED at 420.
  Hunk #4 FAILED at 753.
  Hunk #5 FAILED at 861.
  Hunk #6 FAILED at 888.
  6 out of 6 hunks FAILED -- saving rejects to file
cc/layers/picture_layer_impl.cc.rej

Patch:       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
87414c1050798968d1084846bc344f10cb1484ed..aed6dc10cd2f5ea8bac3f09109bcbaa1f5d0d87f
100644
--- a/cc/layers/picture_layer_impl.cc
+++ b/cc/layers/picture_layer_impl.cc
@@ -56,9 +56,7 @@
       should_update_tile_priorities_(false),
       should_use_low_res_tiling_(tree_impl->settings().create_low_res_tiling),
       use_gpu_rasterization_(false),
-      layer_needs_to_register_itself_(true),
-      uninitialized_tiles_required_for_activation_count_(0) {
-}
+      layer_needs_to_register_itself_(true) {}
 
 PictureLayerImpl::~PictureLayerImpl() {
   if (!layer_needs_to_register_itself_)
@@ -407,7 +405,6 @@
                                  contents_scale_x(),
                                  current_frame_time_in_seconds);
 
-  uninitialized_tiles_required_for_activation_count_ = 0;
   if (layer_tree_impl()->IsPendingTree())
     MarkVisibleResourcesAsRequired();
 
@@ -420,13 +417,6 @@
     gfx::RectF layer_damage_rect =
         gfx::ScaleRect(tile->content_rect(), 1.f / tile->contents_scale());
     AddDamageRect(layer_damage_rect);
-
-    DCHECK_EQ(0, uninitialized_tiles_required_for_activation_count_);
-  } else if (layer_tree_impl()->IsPendingTree()) {
-    if (tile->required_for_activation()) {
-      DCHECK_GT(uninitialized_tiles_required_for_activation_count_, 0);
-      --uninitialized_tiles_required_for_activation_count_;
-    }
   }
 }
 
@@ -753,7 +743,7 @@
   return tile_version.get_resource_id();
 }
 
-void PictureLayerImpl::MarkVisibleResourcesAsRequired() {
+void PictureLayerImpl::MarkVisibleResourcesAsRequired() const {
   DCHECK(layer_tree_impl()->IsPendingTree());
   DCHECK(!layer_tree_impl()->needs_update_draw_properties());
   DCHECK(ideal_contents_scale_);
@@ -861,7 +851,7 @@
     const PictureLayerTiling* optional_twin_tiling,
     float contents_scale,
     const gfx::Rect& rect,
-    const Region& missing_region) {
+    const Region& missing_region) const {
   bool twin_had_missing_tile = false;
   for (PictureLayerTiling::CoverageIterator iter(tiling,
                                                  contents_scale,
@@ -888,10 +878,8 @@
         continue;
       }
     }
-    DCHECK(!tile->required_for_activation());
+
     tile->MarkRequiredForActivation();
-    if (!tile->IsReadyToDraw())
-      ++uninitialized_tiles_required_for_activation_count_;
   }
   return twin_had_missing_tile;
 }

[pfeldman, 2014-05-01 13:35:46]

The CQ bit was checked by pfeldman@chromium.org

[commit-bot: I haz the power, 2014-05-01 13:35:56]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/pfeldman@chromium.org/268683002/100001

[commit-bot: I haz the power, 2014-05-01 13:36:01]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-05-01 13:36:02]

Failed to apply patch for cc/layers/picture_layer_impl.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file cc/layers/picture_layer_impl.cc
  Hunk #1 FAILED at 56.
  Hunk #2 FAILED at 407.
  Hunk #3 FAILED at 420.
  Hunk #4 FAILED at 745.
  Hunk #5 FAILED at 853.
  Hunk #6 FAILED at 880.
  6 out of 6 hunks FAILED -- saving rejects to file
cc/layers/picture_layer_impl.cc.rej

Patch:       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
5d3fb863f6a6ee13380d1c9525d9d05f2e4bdb70..1475232d3e418393a44fd750831025b18bd2985b
100644
--- a/cc/layers/picture_layer_impl.cc
+++ b/cc/layers/picture_layer_impl.cc
@@ -56,9 +56,7 @@ PictureLayerImpl::PictureLayerImpl(LayerTreeImpl* tree_impl,
int id)
       should_update_tile_priorities_(false),
       should_use_low_res_tiling_(tree_impl->settings().create_low_res_tiling),
       use_gpu_rasterization_(false),
-      layer_needs_to_register_itself_(true),
-      uninitialized_tiles_required_for_activation_count_(0) {
-}
+      layer_needs_to_register_itself_(true) {}
 
 PictureLayerImpl::~PictureLayerImpl() {
   if (!layer_needs_to_register_itself_)
@@ -407,7 +405,6 @@ void PictureLayerImpl::UpdateTilePriorities() {
                                  contents_scale_x(),
                                  current_frame_time_in_seconds);
 
-  uninitialized_tiles_required_for_activation_count_ = 0;
   if (layer_tree_impl()->IsPendingTree())
     MarkVisibleResourcesAsRequired();
 
@@ -420,13 +417,6 @@ void PictureLayerImpl::NotifyTileInitialized(const Tile*
tile) {
     gfx::RectF layer_damage_rect =
         gfx::ScaleRect(tile->content_rect(), 1.f / tile->contents_scale());
     AddDamageRect(layer_damage_rect);
-
-    DCHECK_EQ(0, uninitialized_tiles_required_for_activation_count_);
-  } else if (layer_tree_impl()->IsPendingTree()) {
-    if (tile->required_for_activation()) {
-      DCHECK_GT(uninitialized_tiles_required_for_activation_count_, 0);
-      --uninitialized_tiles_required_for_activation_count_;
-    }
   }
 }
 
@@ -745,7 +735,7 @@ ResourceProvider::ResourceId
PictureLayerImpl::ContentsResourceId() const {
   return tile_version.get_resource_id();
 }
 
-void PictureLayerImpl::MarkVisibleResourcesAsRequired() {
+void PictureLayerImpl::MarkVisibleResourcesAsRequired() const {
   DCHECK(layer_tree_impl()->IsPendingTree());
   DCHECK(!layer_tree_impl()->needs_update_draw_properties());
   DCHECK(ideal_contents_scale_);
@@ -853,7 +843,7 @@ bool PictureLayerImpl::MarkVisibleTilesAsRequired(
     const PictureLayerTiling* optional_twin_tiling,
     float contents_scale,
     const gfx::Rect& rect,
-    const Region& missing_region) {
+    const Region& missing_region) const {
   bool twin_had_missing_tile = false;
   for (PictureLayerTiling::CoverageIterator iter(tiling,
                                                  contents_scale,
@@ -880,10 +870,8 @@ bool PictureLayerImpl::MarkVisibleTilesAsRequired(
         continue;
       }
     }
-    DCHECK(!tile->required_for_activation());
+
     tile->MarkRequiredForActivation();
-    if (!tile->IsReadyToDraw())
-      ++uninitialized_tiles_required_for_activation_count_;
   }
   return twin_had_missing_tile;
 }

[reveman, 2014-05-01 13:39:21]

On 2014/05/01 13:36:02, I haz the power (commit-bot) wrote:
> Failed to apply patch for cc/layers/picture_layer_impl.cc:
> While running patch -p1 --forward --force --no-backup-if-mismatch;
>   patching file cc/layers/picture_layer_impl.cc
>   Hunk #1 FAILED at 56.
>   Hunk #2 FAILED at 407.
>   Hunk #3 FAILED at 420.
>   Hunk #4 FAILED at 745.
>   Hunk #5 FAILED at 853.
>   Hunk #6 FAILED at 880.
>   6 out of 6 hunks FAILED -- saving rejects to file
> cc/layers/picture_layer_impl.cc.rej
> 
> Patch:       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
>
5d3fb863f6a6ee13380d1c9525d9d05f2e4bdb70..1475232d3e418393a44fd750831025b18bd2985b
> 100644
> --- a/cc/layers/picture_layer_impl.cc
> +++ b/cc/layers/picture_layer_impl.cc
> @@ -56,9 +56,7 @@ PictureLayerImpl::PictureLayerImpl(LayerTreeImpl* tree_impl,
> int id)
>        should_update_tile_priorities_(false),
>       
should_use_low_res_tiling_(tree_impl->settings().create_low_res_tiling),
>        use_gpu_rasterization_(false),
> -      layer_needs_to_register_itself_(true),
> -      uninitialized_tiles_required_for_activation_count_(0) {
> -}
> +      layer_needs_to_register_itself_(true) {}
>  
>  PictureLayerImpl::~PictureLayerImpl() {
>    if (!layer_needs_to_register_itself_)
> @@ -407,7 +405,6 @@ void PictureLayerImpl::UpdateTilePriorities() {
>                                   contents_scale_x(),
>                                   current_frame_time_in_seconds);
>  
> -  uninitialized_tiles_required_for_activation_count_ = 0;
>    if (layer_tree_impl()->IsPendingTree())
>      MarkVisibleResourcesAsRequired();
>  
> @@ -420,13 +417,6 @@ void PictureLayerImpl::NotifyTileInitialized(const Tile*
> tile) {
>      gfx::RectF layer_damage_rect =
>          gfx::ScaleRect(tile->content_rect(), 1.f / tile->contents_scale());
>      AddDamageRect(layer_damage_rect);
> -
> -    DCHECK_EQ(0, uninitialized_tiles_required_for_activation_count_);
> -  } else if (layer_tree_impl()->IsPendingTree()) {
> -    if (tile->required_for_activation()) {
> -      DCHECK_GT(uninitialized_tiles_required_for_activation_count_, 0);
> -      --uninitialized_tiles_required_for_activation_count_;
> -    }
>    }
>  }
>  
> @@ -745,7 +735,7 @@ ResourceProvider::ResourceId
> PictureLayerImpl::ContentsResourceId() const {
>    return tile_version.get_resource_id();
>  }
>  
> -void PictureLayerImpl::MarkVisibleResourcesAsRequired() {
> +void PictureLayerImpl::MarkVisibleResourcesAsRequired() const {
>    DCHECK(layer_tree_impl()->IsPendingTree());
>    DCHECK(!layer_tree_impl()->needs_update_draw_properties());
>    DCHECK(ideal_contents_scale_);
> @@ -853,7 +843,7 @@ bool PictureLayerImpl::MarkVisibleTilesAsRequired(
>      const PictureLayerTiling* optional_twin_tiling,
>      float contents_scale,
>      const gfx::Rect& rect,
> -    const Region& missing_region) {
> +    const Region& missing_region) const {
>    bool twin_had_missing_tile = false;
>    for (PictureLayerTiling::CoverageIterator iter(tiling,
>                                                   contents_scale,
> @@ -880,10 +870,8 @@ bool PictureLayerImpl::MarkVisibleTilesAsRequired(
>          continue;
>        }
>      }
> -    DCHECK(!tile->required_for_activation());
> +
>      tile->MarkRequiredForActivation();
> -    if (!tile->IsReadyToDraw())
> -      ++uninitialized_tiles_required_for_activation_count_;
>    }
>    return twin_had_missing_tile;
>  }

FYI, this change has already been reverted.