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

Re-land a fixed c8451607557b (Take out the empty GeckoLayerClient.dimensionsChanged method and the unneeded support architecture for it)

Browse Source
This commit is contained in:
Kartikaya Gupta 2012-02-23 10:09:38 -05:00
parent 4f1487504a
commit 01cac3410f
3 changed files with 1 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,8 +60,7 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
public class GeckoLayerClient implements GeckoEventListener,
FlexibleGLSurfaceView.Listener,
VirtualLayer.Listener {
FlexibleGLSurfaceView.Listener {
private static final String LOGTAG = "GeckoLayerClient";
private LayerController mLayerController;
@ -326,7 +325,6 @@ public class GeckoLayerClient implements GeckoEventListener,
Log.e(LOGTAG, "### Creating virtual layer");
VirtualLayer virtualLayer = new VirtualLayer();
virtualLayer.setListener(this);
virtualLayer.setSize(getBufferSize());
mLayerController.setRoot(virtualLayer);
mTileLayer = virtualLayer;
@ -496,11 +494,6 @@ public class GeckoLayerClient implements GeckoEventListener,
renderRequested();
}
/** Implementation of VirtualLayer.Listener */
public void dimensionsChanged(Point newOrigin, float newResolution) {
Log.e(LOGTAG, "### dimensionsChanged " + newOrigin + " " + newResolution);
}
/** Used by robocop for testing purposes. Not for production use! This is called via reflection by robocop. */
public void setDrawListener(DrawListener listener) {
mDrawListener = listener;

4
mobile/android/base/gfx/Layer.java
View File

@ -182,10 +182,6 @@ public abstract class Layer {
return true;
}
protected boolean dimensionChangesPending() {
return (mNewOrigin != null) || (mNewResolution != 0.0f);
}
public static class RenderContext {
public final RectF viewport;
public final FloatSize pageSize;

22
mobile/android/base/gfx/VirtualLayer.java
View File

@ -38,16 +38,9 @@
package org.mozilla.gecko.gfx;
import android.graphics.Point;
public class VirtualLayer extends Layer {
private Listener mListener;
private IntSize mSize;
public void setListener(Listener listener) {
mListener = listener;
}
@Override
public void draw(RenderContext context) {
// No-op.
@ -61,20 +54,5 @@ public class VirtualLayer extends Layer {
public void setSize(IntSize size) {
mSize = size;
}
@Override
protected boolean performUpdates(RenderContext context) {
boolean dimensionsChanged = dimensionChangesPending();
boolean result = super.performUpdates(context);
if (dimensionsChanged && mListener != null) {
mListener.dimensionsChanged(getOrigin(), getResolution());
}
return result;
}
public interface Listener {
void dimensionsChanged(Point newOrigin, float newResolution);
}
}