Differences between the patch in 533502 and what was pushed. r=mfinkle
authorDoug Turner <dougt@dougt.org>
Sun, 13 Dec 2009 21:51:11 -0800
changeset 65911 cc0a939453ac27eb9536fec51933652f923795f8
parent 65910 9318d62cb05d9355b58df5e56381f0bcedcb6df9
child 65912 13fc08074328824ecb6f095c5c1f489d0b26911b
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmfinkle
bugs533502
Differences between the patch in 533502 and what was pushed. r=mfinkle
mobile/chrome/content/BrowserView.js
mobile/chrome/content/browser.js
--- a/mobile/chrome/content/BrowserView.js
+++ b/mobile/chrome/content/BrowserView.js
@@ -235,17 +235,16 @@ BrowserView.prototype = {
   init: function init(container, visibleRectFactory) {
     this._batchOps = [];
     this._container = container;
     this._browser = null;
     this._browserViewportState = null;
     this._contentWindow = null;
     this._renderMode = 0;
     this._offscreenDepth = 0;
-    this._aggro = false;
 
     let cacheSize = kBrowserViewCacheSize;
     try {
       cacheSize = gPrefService.getIntPref("tile.cache.size");
     } catch(e) {}
 
     if (cacheSize == -1) {
       let sysInfo = Cc["@mozilla.org/system-info;1"].getService(Ci.nsIPropertyBag2);
@@ -280,21 +279,20 @@ BrowserView.prototype = {
   
   uninit: function uninit() {
     this.setBrowser(null, null);
     this._idleService.removeIdleObserver(this._idleServiceObserver, this._idleServiceWait);
   },
 
   /** When aggressive, spend more time rendering tiles. */
   setAggressive: function setAggressive(aggro) {
-/*    this._aggro = aggro;
     let wait = aggro ? kBrowserViewPrefetchBeginIdleWait : kBrowserViewPrefetchBeginIdleWaitLoading;
     this._idleService.removeIdleObserver(this._idleServiceObserver, this._idleServiceWait);
     this._idleService.addIdleObserver(this._idleServiceObserver, wait);
-    this._idleServiceWait = wait; */
+    this._idleServiceWait = wait;
   },
 
   getVisibleRect: function getVisibleRect() {
     return this._visibleRectFactory();
   },
 
   /**
    * @return [width, height]
--- a/mobile/chrome/content/browser.js
+++ b/mobile/chrome/content/browser.js
@@ -2786,20 +2786,20 @@ Tab.prototype = {
 
   startLoading: function() {
     this._loading = true;
     let bvs = this._browserViewportState;
     bvs.defaultZoomLevel = bvs.zoomLevel; // ensures zoom level is reset on new pages
 
     if (!this._loadingTimeout) {
       let bv = Browser._browserView;
+      bv.beginBatchOperation();
+      bv.invalidateEntireView();
       if (this == Browser.selectedTab)
         bv.setAggressive(false);
-      Browser._browserView.beginBatchOperation();
-      Browser._browserView.invalidateEntireView();
       // Sync up browser so previous and forward scroll positions are set. This is a good time to do
       // this because the resulting invalidation is irrelevant.
       Browser.scrollBrowserToContent();
       this._startResizeAndPaint();
     }
   },
 
   endLoading: function() {