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 730687 - Fold updateViewport into endDrawing. r=Cwiiis

Browse Source
This commit is contained in:
Kartikaya Gupta 2012-02-28 16:13:26 -05:00
parent 8c39c8a618
commit 7026e92ffb
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
mobile/android/base/gfx/GeckoLayerClient.java
View File

@ -176,17 +176,6 @@ public class GeckoLayerClient implements GeckoEventResponder,
/** This function is invoked by Gecko via JNI; be careful when modifying signature. */ /** This function is invoked by Gecko via JNI; be careful when modifying signature. */
public void endDrawing() { public void endDrawing() {
updateViewport(!mUpdateViewportOnEndDraw);
mUpdateViewportOnEndDraw = false;
Log.i(LOGTAG, "zerdatime " + SystemClock.uptimeMillis() + " - endDrawing");
/* Used by robocop for testing purposes */
if (mDrawListener != null) {
mDrawListener.drawFinished();
}
}
private void updateViewport(boolean onlyUpdatePageSize) {
synchronized (mLayerController) { synchronized (mLayerController) {
// save and restore the viewport size stored in java; never let the // save and restore the viewport size stored in java; never let the
// JS-side viewport dimensions override the java-side ones because // JS-side viewport dimensions override the java-side ones because
@ -199,20 +188,27 @@ public class GeckoLayerClient implements GeckoEventResponder,
RectF position = mGeckoViewport.getViewport(); RectF position = mGeckoViewport.getViewport();
mRootLayer.setPositionAndResolution(RectUtils.round(position), mGeckoViewport.getZoomFactor()); mRootLayer.setPositionAndResolution(RectUtils.round(position), mGeckoViewport.getZoomFactor());
Log.e(LOGTAG, "### updateViewport onlyUpdatePageSize=" + onlyUpdatePageSize + Log.e(LOGTAG, "### updateViewport onlyUpdatePageSize=" + !mUpdateViewportOnEndDraw +
" getTileViewport " + mGeckoViewport); " getTileViewport " + mGeckoViewport);
if (onlyUpdatePageSize) { if (mUpdateViewportOnEndDraw) {
mLayerController.setViewportMetrics(mGeckoViewport);
mLayerController.abortPanZoomAnimation();
mUpdateViewportOnEndDraw = false;
} else {
// Don't adjust page size when zooming unless zoom levels are // Don't adjust page size when zooming unless zoom levels are
// approximately equal. // approximately equal.
if (FloatUtils.fuzzyEquals(mLayerController.getZoomFactor(), if (FloatUtils.fuzzyEquals(mLayerController.getZoomFactor(),
mGeckoViewport.getZoomFactor())) mGeckoViewport.getZoomFactor()))
mLayerController.setPageSize(mGeckoViewport.getPageSize()); mLayerController.setPageSize(mGeckoViewport.getPageSize());
} else {
mLayerController.setViewportMetrics(mGeckoViewport);
mLayerController.abortPanZoomAnimation();
} }
} }
Log.i(LOGTAG, "zerdatime " + SystemClock.uptimeMillis() + " - endDrawing");
/* Used by robocop for testing purposes */
if (mDrawListener != null) {
mDrawListener.drawFinished();
}
} }
/* Informs Gecko that the screen size has changed. */ /* Informs Gecko that the screen size has changed. */