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

Enable zooming.

Browse Source
This commit is contained in:
Ali Juma 2012-02-12 15:06:34 -05:00
parent 8a076808c5
commit a74c63a281
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gfx/layers/ipc/CompositorParent.cpp
View File

@ -284,8 +284,8 @@ CompositorParent::TransformShadowTree(Layer* aLayer, const ViewTransform& aTrans
const FrameMetrics* metrics = &container->GetFrameMetrics();
const gfx3DMatrix& currentTransform = aLayer->GetTransform();
aTempScaleDiffX *= GetXScale(shadowTransform);
aTempScaleDiffY *= GetYScale(shadowTransform);
aTempScaleDiffX *= GetXScale(shadowTransform) * mXScale;
aTempScaleDiffY *= GetYScale(shadowTransform) * mYScale;
nsIntPoint metricsScrollOffset = metrics->mViewportScrollOffset;

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

@ -1585,9 +1585,10 @@ Tab.prototype = {
this.viewportExcess.y = excessY;
}
if (Math.abs(aViewport.zoom - this._viewport.zoom) >= 1e-6) {
//FIXME: Uncomment once zoom is working again.
//this._viewport.zoom = aViewport.zoom;
this._viewport.zoom = 1;
this._viewport.zoom = aViewport.zoom;
let cwu = window.top.QueryInterface(Ci.nsIInterfaceRequestor)
.getInterface(Ci.nsIDOMWindowUtils);
cwu.setResolution(this._viewport.zoom, this._viewport.zoom);
}
},
@ -1673,9 +1674,7 @@ Tab.prototype = {
aZoomLevel = this.getDefaultZoomLevel();
let win = this.browser.contentWindow;
//FIXME: Uncomment when zoom is working again.
//let zoom = (aReset ? aZoomLevel : this._viewport.zoom);
let zoom = 1;
let zoom = (aReset ? aZoomLevel : this._viewport.zoom);
let xpos = ((aReset && win) ? win.scrollX * zoom : this._viewport.x);
let ypos = ((aReset && win) ? win.scrollY * zoom : this._viewport.y);