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 1136726. Remove PaintMode from TileLayer. r=kats

Browse Source 
PaintMode is never changed from the default.
This commit is contained in:
Jeff Muizelaar 2015-01-30 16:04:44 -05:00
parent 98ef649787
commit dbb24f8c26
3 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mobile/android/base/gfx/PluginLayer.java
View File

@ -37,7 +37,7 @@ public class PluginLayer extends TileLayer {
};
public PluginLayer(View view, RectF rect, int maxDimension) {
super(new IntSize(0, 0), TileLayer.PaintMode.NORMAL);
super(new IntSize(0, 0));
mView = view;
mContainer = GeckoAppShell.getGeckoInterface().getPluginContainer();

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

@ -69,7 +69,7 @@ public class ScrollbarLayer extends TileLayer {
private final Rect mEndCapTexCoords; // bottom/right endcap coordinates
ScrollbarLayer(LayerRenderer renderer, Bitmap scrollbarImage, IntSize imageSize, boolean vertical) {
super(new IntSize(scrollbarImage.getHeight(), scrollbarImage.getWidth()), TileLayer.PaintMode.NORMAL);
super(new IntSize(scrollbarImage.getHeight(), scrollbarImage.getWidth()));
mImage = new BufferedImage(scrollbarImage);
mRenderer = renderer;
mVertical = vertical;
@ -400,7 +400,7 @@ public class ScrollbarLayer extends TileLayer {
GLES20.glTexParameterf(GLES20.GL_TEXTURE_2D, GLES20.GL_TEXTURE_MAG_FILTER,
GLES20.GL_LINEAR);
int repeatMode = repeats() ? GLES20.GL_REPEAT : GLES20.GL_CLAMP_TO_EDGE;
int repeatMode = GLES20.GL_CLAMP_TO_EDGE;
GLES20.glTexParameterf(GLES20.GL_TEXTURE_2D, GLES20.GL_TEXTURE_WRAP_S, repeatMode);
GLES20.glTexParameterf(GLES20.GL_TEXTURE_2D, GLES20.GL_TEXTURE_WRAP_T, repeatMode);
}

14
mobile/android/base/gfx/TileLayer.java
View File

@ -15,22 +15,10 @@ import android.opengl.GLES20;
public abstract class TileLayer extends Layer {
private static final String LOGTAG = "GeckoTileLayer";
public enum PaintMode { NORMAL, REPEAT, STRETCH };
private PaintMode mPaintMode;
public TileLayer(IntSize size, PaintMode paintMode) {
public TileLayer(IntSize size) {
super(size);
mPaintMode = paintMode;
}
protected boolean repeats() { return mPaintMode == PaintMode.REPEAT; }
protected boolean stretches() { return mPaintMode == PaintMode.STRETCH; }
public abstract void destroy();
public void setPaintMode(PaintMode mode) {
mPaintMode = mode;
}
}