From 4e7ea4dcd0515abbeee814dfa5d0f4184fb1bf68 Mon Sep 17 00:00:00 2001 From: Kartikaya Gupta Date: Tue, 24 Apr 2012 13:52:37 -0500 Subject: [PATCH] Bug 732016 - Re-enable scroll clamping but set the desired scrollport using the new scrollport API. r=Cwiiis --- mobile/android/chrome/content/browser.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js index b0950212d693..ad2ab2d60c23 100644 --- a/mobile/android/chrome/content/browser.js +++ b/mobile/android/chrome/content/browser.js @@ -1560,7 +1560,6 @@ Tab.prototype = { let frameLoader = this.browser.QueryInterface(Ci.nsIFrameLoaderOwner).frameLoader; frameLoader.renderMode = Ci.nsIFrameLoader.RENDER_MODE_ASYNC_SCROLL; - frameLoader.clampScrollPosition = false; // only set tab uri if uri is valid let uri = null; @@ -1852,6 +1851,8 @@ Tab.prototype = { // Set scroll position let win = this.browser.contentWindow; + win.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindowUtils).setScrollPositionClampingScrollPortSize( + gScreenWidth / aViewport.zoom, gScreenHeight / aViewport.zoom); win.scrollTo(x, y); this.userScrollPos.x = win.scrollX; this.userScrollPos.y = win.scrollY;