Backout 8cc37887f621 and b6bd9f564650 (bug 795259) and 8b9c7bf80449 (bug 803013) to investigate the effect on Android reftest-1 and -4 permaorange
authorPhil Ringnalda <philringnalda@gmail.com>
Tue, 23 Oct 2012 23:35:13 -0700
changeset 111356 84cfd17d06473c9b391b7af3c3b1fd6c7829c166
parent 111355 95aa292658aa98bf3963e682b3a11d6d507da96b
child 111357 8dffd0757c9c54d1955f13383350d6ea49262dcc
push id93
push usernmatsakis@mozilla.com
push dateWed, 31 Oct 2012 21:26:57 +0000
bugs795259, 803013
milestone19.0a1
backs out8cc37887f62141c3af6560141181ab3c5b3fd82b
Backout 8cc37887f621 and b6bd9f564650 (bug 795259) and 8b9c7bf80449 (bug 803013) to investigate the effect on Android reftest-1 and -4 permaorange
gfx/layers/basic/BasicTiledThebesLayer.cpp
mobile/android/app/mobile.js
--- a/gfx/layers/basic/BasicTiledThebesLayer.cpp
+++ b/gfx/layers/basic/BasicTiledThebesLayer.cpp
@@ -406,20 +406,17 @@ BasicTiledThebesLayer::PaintThebes(gfxCo
     for (ContainerLayer* parent = GetParent(); parent; parent = parent->GetParent()) {
       if (parent->UseIntermediateSurface()) {
         transform.PreMultiply(parent->GetEffectiveTransform());
       }
     }
     transform.Invert();
 
     // Store the old valid region, then clear it before painting.
-    // We clip the old valid region to the visible region, as it only gets
-    // used to decide stale content (currently valid and previously visible)
     nsIntRegion oldValidRegion = mTiledBuffer.GetValidRegion();
-    oldValidRegion.And(oldValidRegion, mVisibleRegion);
     mTiledBuffer.ClearPaintedRegion();
 
     // Make sure that tiles that fall outside of the visible region are
     // discarded on the first update.
     if (!BasicManager()->IsRepeatTransaction()) {
       mValidRegion.And(mValidRegion, mVisibleRegion);
     }
 
@@ -452,24 +449,18 @@ BasicTiledThebesLayer::PaintThebes(gfxCo
         } else {
           return;
         }
       }
 
       // Keep track of what we're about to refresh.
       mValidRegion.Or(mValidRegion, regionToPaint);
 
-      // mValidRegion would have been altered by InvalidateRegion, but we still
-      // want to display stale content until it gets progressively updated.
-      // Create a region that includes stale content.
-      nsIntRegion validOrStale;
-      validOrStale.Or(mValidRegion, oldValidRegion);
-
       // Paint the computed region and subtract it from the invalid region.
-      mTiledBuffer.PaintThebes(this, validOrStale, regionToPaint, aCallback, aCallbackData);
+      mTiledBuffer.PaintThebes(this, mValidRegion, regionToPaint, aCallback, aCallbackData);
       invalidRegion.Sub(invalidRegion, regionToPaint);
     } while (repeat);
   } else {
     mTiledBuffer.ClearPaintedRegion();
     mTiledBuffer.SetResolution(resolution);
     mValidRegion = mVisibleRegion;
     mTiledBuffer.PaintThebes(this, mValidRegion, invalidRegion, aCallback, aCallbackData);
   }
--- a/mobile/android/app/mobile.js
+++ b/mobile/android/app/mobile.js
@@ -338,17 +338,17 @@ pref("gfx.displayport.strategy_vb.revers
 pref("gfx.displayport.strategy_vb.danger_x_base", -1); // danger zone on x-axis when multiplied by viewport width
 pref("gfx.displayport.strategy_vb.danger_y_base", -1); // danger zone on y-axis when multiplied by viewport height
 pref("gfx.displayport.strategy_vb.danger_x_incr", -1); // additional danger zone on x-axis when multiplied by viewport width and velocity
 pref("gfx.displayport.strategy_vb.danger_y_incr", -1); // additional danger zone on y-axis when multiplied by viewport height and velocity
 
 // prediction bias strategy options
 pref("gfx.displayport.strategy_pb.threshold", -1); // velocity threshold in inches/frame
 
-pref("gfx.java.screenshot.enabled", false);
+pref("gfx.java.screenshot.enabled", true);
 
 // don't allow JS to move and resize existing windows
 pref("dom.disable_window_move_resize", true);
 
 // prevent click image resizing for nsImageDocument
 pref("browser.enable_click_image_resizing", false);
 
 // open in tab preferences
@@ -517,17 +517,17 @@ pref("editor.singleLine.pasteNewlines", 
 // threshold where a tap becomes a drag, in 1/240" reference pixels
 // The names of the preferences are to be in sync with nsEventStateManager.cpp
 pref("ui.dragThresholdX", 25);
 pref("ui.dragThresholdY", 25);
 
 pref("layers.acceleration.disabled", false);
 pref("layers.offmainthreadcomposition.enabled", true);
 pref("layers.async-video.enabled", true);
-pref("layers.progressive-paint", true);
+pref("layers.progressive-paint", false);
 
 pref("notification.feature.enabled", true);
 
 // prevent tooltips from showing up
 pref("browser.chrome.toolbar_tips", false);
 pref("indexedDB.feature.enabled", true);
 pref("dom.indexedDB.warningQuota", 5);