Revert 261000 "Re-raster GPU-rasterized layers during scale animations"

Revert 261000 "Re-raster GPU-rasterized layers during scale animations"

This reverts http://crrev.com/216313007.

Re-rastering a layer with text during a scale animation can cause
many texture uploads during the animation (as new glyphs are generated
at each scale).

To re-enable this behavior in the future, we need to either make it
dependent on distance-field fonts, or we need a way to reuse glyphs
during scale animations (allowing text to become slightly blurry rather
than generating new glyphs every frame).

BUG=366225
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=269701

[Vangelis Kokkevis, 2014-05-09 23:25:38]

On 2014/05/09 22:31:18, ajuma wrote:

LGTM, thanks!

[ajuma, 2014-05-09 23:27:14]

The CQ bit was checked by ajuma@chromium.org

[commit-bot: I haz the power, 2014-05-09 23:31:33]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/ajuma@chromium.org/272283003/10001

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

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

[commit-bot: I haz the power, 2014-05-11 01:07:08]

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 1038.
  Hunk #2 FAILED at 1137.
  2 out of 2 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
bd3b9dc590e413bf998aa6325f95d8fd36386239..5b5486874fbb0e31bfaaac2d99058efd2c8131fb
100644
--- a/cc/layers/picture_layer_impl.cc
+++ b/cc/layers/picture_layer_impl.cc
@@ -1038,11 +1038,6 @@ bool PictureLayerImpl::ShouldAdjustRasterScale(
   if (was_animating_transform_to_screen_ != animating_transform_to_screen)
     return true;
 
-  if (animating_transform_to_screen &&
-      raster_contents_scale_ != ideal_contents_scale_ &&
-      ShouldUseGpuRasterization())
-    return true;
-
   bool is_pinching = layer_tree_impl()->PinchGestureActive();
   if (is_pinching && raster_page_scale_) {
     // We change our raster scale when it is:
@@ -1137,10 +1132,10 @@ void PictureLayerImpl::RecalculateRasterScales(
   raster_contents_scale_ =
       std::max(raster_contents_scale_, MinimumContentsScale());
 
-  // If we're not re-rasterizing during animation, rasterize at the maximum
+  // Since we're not re-rasterizing during animation, rasterize at the maximum
   // scale that will occur during the animation, if the maximum scale is
   // known.
-  if (animating_transform_to_screen && !ShouldUseGpuRasterization()) {
+  if (animating_transform_to_screen) {
     if (maximum_animation_contents_scale > 0.f) {
       raster_contents_scale_ =
           std::max(raster_contents_scale_, maximum_animation_contents_scale);

[ajuma, 2014-05-11 01:18:17]

The CQ bit was checked by ajuma@chromium.org

[commit-bot: I haz the power, 2014-05-11 01:18:39]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/ajuma@chromium.org/272283003/30001

[commit-bot: I haz the power, 2014-05-11 05:14:45]

Change committed as 269701