wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 788526 - Call setScrollPositionClampingScrollPortSize from the updateViewportSize code. r=cwiiis

Browse Source
This commit is contained in:
Lucas Rocha 2012-09-10 18:31:39 -04:00
parent cf33482a3e
commit 866a54e3f7
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
mobile/android/chrome/content/browser.js
View File

@ -2521,14 +2521,9 @@ Tab.prototype = {
return aDisplayPort;
},
setViewport: function(aViewport) {
// Transform coordinates based on zoom
let x = aViewport.x / aViewport.zoom;
let y = aViewport.y / aViewport.zoom;
// Set scroll position and scroll-port clamping size
let viewportWidth = gScreenWidth / aViewport.zoom;
let viewportHeight = gScreenHeight / aViewport.zoom;
setScrollClampingSize: function(zoom) {
let viewportWidth = gScreenWidth / zoom;
let viewportHeight = gScreenHeight / zoom;
let [pageWidth, pageHeight] = this.getPageSize(this.browser.contentDocument,
viewportWidth, viewportHeight);
let scrollPortWidth = Math.min(viewportWidth, pageWidth);
@ -2537,6 +2532,16 @@ Tab.prototype = {
let win = this.browser.contentWindow;
win.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindowUtils).
setScrollPositionClampingScrollPortSize(scrollPortWidth, scrollPortHeight);
},
setViewport: function(aViewport) {
// Transform coordinates based on zoom
let x = aViewport.x / aViewport.zoom;
let y = aViewport.y / aViewport.zoom;
this.setScrollClampingSize(aViewport.zoom);
let win = this.browser.contentWindow;
win.scrollTo(x, y);
this.userScrollPos.x = win.scrollX;
@ -3286,6 +3291,7 @@ Tab.prototype = {
let zoomScale = (screenW * oldBrowserWidth) / (aOldScreenWidth * viewportW);
let zoom = this.clampZoom(this._zoom * zoomScale);
this.setResolution(zoom, false);
this.setScrollClampingSize(zoom);
this.sendViewportUpdate();
},