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 732564 - Modify the Viewport:Update event to take a viewport and synchronously update Java with it. r=Cwiiis

Browse Source
This commit is contained in:
Kartikaya Gupta 2012-03-12 12:03:38 -04:00
parent 56c4bfc1fb
commit 49a8b558b5
2 changed files with 17 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -76,20 +76,10 @@ public class GeckoLayerClient implements GeckoEventResponder,
/* The viewport that Gecko is currently displaying. */ /* The viewport that Gecko is currently displaying. */
private ViewportMetrics mGeckoViewport; private ViewportMetrics mGeckoViewport;
/* The viewport that Gecko will display when drawing is finished */
private ViewportMetrics mNewGeckoViewport;
private boolean mViewportSizeChanged; private boolean mViewportSizeChanged;
private boolean mIgnorePaintsPendingViewportSizeChange; private boolean mIgnorePaintsPendingViewportSizeChange;
private boolean mFirstPaint = true; private boolean mFirstPaint = true;
// mUpdateViewportOnEndDraw is used to indicate that we received a
// viewport update notification while drawing. therefore, when the
// draw finishes, we need to update the entire viewport rather than
// just the page size. this boolean should always be accessed from
// inside a transaction, so no synchronization is needed.
private boolean mUpdateViewportOnEndDraw;
private String mLastCheckerboardColor; private String mLastCheckerboardColor;
/* Used by robocop for testing purposes */ /* Used by robocop for testing purposes */
@ -147,7 +137,7 @@ public class GeckoLayerClient implements GeckoEventResponder,
try { try {
JSONObject viewportObject = new JSONObject(metadata); JSONObject viewportObject = new JSONObject(metadata);
mNewGeckoViewport = new ViewportMetrics(viewportObject); mGeckoViewport = new ViewportMetrics(viewportObject);
} catch (JSONException e) { } catch (JSONException e) {
Log.e(LOGTAG, "Aborting draw, bad viewport description: " + metadata); Log.e(LOGTAG, "Aborting draw, bad viewport description: " + metadata);
return false; return false;
@ -163,28 +153,8 @@ 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() {
synchronized (mLayerController) { synchronized (mLayerController) {
// save and restore the viewport size stored in java; never let the
// JS-side viewport dimensions override the java-side ones because
// java is the One True Source of this information, and allowing JS
// to override can lead to race conditions where this data gets clobbered.
FloatSize viewportSize = mLayerController.getViewportSize();
mGeckoViewport = mNewGeckoViewport;
mGeckoViewport.setSize(viewportSize);
RectF position = mGeckoViewport.getViewport(); RectF position = mGeckoViewport.getViewport();
mRootLayer.setPositionAndResolution(RectUtils.round(position), mGeckoViewport.getZoomFactor()); mRootLayer.setPositionAndResolution(RectUtils.round(position), mGeckoViewport.getZoomFactor());
if (mUpdateViewportOnEndDraw) {
mLayerController.setViewportMetrics(mGeckoViewport);
mLayerController.abortPanZoomAnimation();
mUpdateViewportOnEndDraw = false;
} else {
// Don't adjust page size when zooming unless zoom levels are
// approximately equal.
if (FloatUtils.fuzzyEquals(mLayerController.getZoomFactor(),
mGeckoViewport.getZoomFactor()))
mLayerController.setPageSize(mGeckoViewport.getPageSize());
}
} }
Log.i(LOGTAG, "zerdatime " + SystemClock.uptimeMillis() + " - endDrawing"); Log.i(LOGTAG, "zerdatime " + SystemClock.uptimeMillis() + " - endDrawing");
@ -278,8 +248,20 @@ public class GeckoLayerClient implements GeckoEventResponder,
/** Implementation of GeckoEventResponder/GeckoEventListener. */ /** Implementation of GeckoEventResponder/GeckoEventListener. */
public void handleMessage(String event, JSONObject message) { public void handleMessage(String event, JSONObject message) {
if ("Viewport:Update".equals(event)) { if ("Viewport:Update".equals(event)) {
mUpdateViewportOnEndDraw = true;
mIgnorePaintsPendingViewportSizeChange = false; mIgnorePaintsPendingViewportSizeChange = false;
try {
ViewportMetrics newMetrics = new ViewportMetrics(message);
synchronized (mLayerController) {
// keep the old viewport size, but update everything else
ImmutableViewportMetrics oldMetrics = mLayerController.getViewportMetrics();
newMetrics.setSize(oldMetrics.getSize());
mLayerController.setViewportMetrics(newMetrics);
mLayerController.abortPanZoomAnimation();
}
} catch (JSONException e) {
Log.e(LOGTAG, "Unable to create viewport metrics in " + event + " handler", e);
}
} }
} }

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

@ -1732,11 +1732,9 @@ Tab.prototype = {
sendViewportUpdate: function() { sendViewportUpdate: function() {
if (BrowserApp.selectedTab != this) if (BrowserApp.selectedTab != this)
return; return;
let displayPortMargins = sendMessageToJava({ let message = this.getViewport();
gecko: { message.type = "Viewport:Update";
type: "Viewport:Update" let displayPortMargins = sendMessageToJava({ gecko: message });
}
});
if (displayPortMargins != null) if (displayPortMargins != null)
this.refreshDisplayPort(JSON.parse(displayPortMargins)); this.refreshDisplayPort(JSON.parse(displayPortMargins));
}, },