Kaydet (Commit) dd8440a1 authored tarafından Tomaž Vajngerl's avatar Tomaž Vajngerl

android: move getDrawable to LayerView (Fennec import)

Change-Id: Idd15003939574963f836bfab1e0c5385957ab18b
üst 488d19de
...@@ -52,7 +52,7 @@ public class MockTileProvider implements TileProvider { ...@@ -52,7 +52,7 @@ public class MockTileProvider implements TileProvider {
tileNumber += 1; // 0 to 1 based numbering tileNumber += 1; // 0 to 1 based numbering
String imageName = "d" + tileNumber; String imageName = "d" + tileNumber;
Bitmap bitmap = layerController.getDrawable(imageName); Bitmap bitmap = layerController.getView().getDrawable(imageName);
CairoImage image = new BufferedCairoImage(bitmap); CairoImage image = new BufferedCairoImage(bitmap);
...@@ -61,7 +61,7 @@ public class MockTileProvider implements TileProvider { ...@@ -61,7 +61,7 @@ public class MockTileProvider implements TileProvider {
@Override @Override
public Bitmap thumbnail(int size) { public Bitmap thumbnail(int size) {
return layerController.getDrawable("dummy_page"); return layerController.getView().getDrawable("dummy_page");
} }
@Override @Override
......
...@@ -6,9 +6,6 @@ ...@@ -6,9 +6,6 @@
package org.mozilla.gecko.gfx; package org.mozilla.gecko.gfx;
import android.content.Context; import android.content.Context;
import android.content.res.Resources;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.Color; import android.graphics.Color;
import android.graphics.PointF; import android.graphics.PointF;
import android.graphics.RectF; import android.graphics.RectF;
...@@ -104,9 +101,6 @@ public class LayerController implements PanZoomTarget { ...@@ -104,9 +101,6 @@ public class LayerController implements PanZoomTarget {
return mViewportMetrics.getSize(); return mViewportMetrics.getSize();
} }
public Bitmap getBackgroundPattern() { return getDrawable("background"); }
public Bitmap getShadowPattern() { return getDrawable("shadow"); }
public PanZoomController getPanZoomController() { return mPanZoomController; } public PanZoomController getPanZoomController() { return mPanZoomController; }
public GestureDetector.OnGestureListener getGestureListener() { return mPanZoomController; } public GestureDetector.OnGestureListener getGestureListener() { return mPanZoomController; }
public SimpleScaleGestureDetector.SimpleScaleGestureListener getScaleGestureListener() { public SimpleScaleGestureDetector.SimpleScaleGestureListener getScaleGestureListener() {
...@@ -114,14 +108,6 @@ public class LayerController implements PanZoomTarget { ...@@ -114,14 +108,6 @@ public class LayerController implements PanZoomTarget {
} }
public GestureDetector.OnDoubleTapListener getDoubleTapListener() { return mPanZoomController; } public GestureDetector.OnDoubleTapListener getDoubleTapListener() { return mPanZoomController; }
public Bitmap getDrawable(String name) {
Resources resources = mContext.getResources();
int resourceID = resources.getIdentifier(name, "drawable", mContext.getPackageName());
BitmapFactory.Options options = new BitmapFactory.Options();
options.inScaled = false;
return BitmapFactory.decodeResource(mContext.getResources(), resourceID, options);
}
/** /**
* The view calls this function to indicate that the viewport changed size. It must hold the * The view calls this function to indicate that the viewport changed size. It must hold the
* monitor while calling it. * monitor while calling it.
......
...@@ -160,12 +160,12 @@ public class LayerRenderer implements GLSurfaceView.Renderer { ...@@ -160,12 +160,12 @@ public class LayerRenderer implements GLSurfaceView.Renderer {
LayerController controller = view.getController(); LayerController controller = view.getController();
CairoImage backgroundImage = new BufferedCairoImage(controller.getBackgroundPattern()); CairoImage backgroundImage = new BufferedCairoImage(view.getBackgroundPattern());
mBackgroundLayer = new SingleTileLayer(true, backgroundImage); mBackgroundLayer = new SingleTileLayer(true, backgroundImage);
mScreenshotLayer = ScreenshotLayer.create(); mScreenshotLayer = ScreenshotLayer.create();
CairoImage shadowImage = new BufferedCairoImage(controller.getShadowPattern()); CairoImage shadowImage = new BufferedCairoImage(view.getShadowPattern());
mShadowLayer = new NinePatchTileLayer(shadowImage); mShadowLayer = new NinePatchTileLayer(shadowImage);
mHorizScrollLayer = ScrollbarLayer.create(this, false); mHorizScrollLayer = ScrollbarLayer.create(this, false);
......
...@@ -7,7 +7,9 @@ package org.mozilla.gecko.gfx; ...@@ -7,7 +7,9 @@ package org.mozilla.gecko.gfx;
import android.content.Context; import android.content.Context;
import android.content.res.Resources;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.PixelFormat; import android.graphics.PixelFormat;
import android.graphics.SurfaceTexture; import android.graphics.SurfaceTexture;
import android.os.Build; import android.os.Build;
...@@ -235,6 +237,23 @@ public class LayerView extends FrameLayout { ...@@ -235,6 +237,23 @@ public class LayerView extends FrameLayout {
return mGLController; return mGLController;
} }
public Bitmap getDrawable(String name) {
Context context = getContext();
Resources resources = context.getResources();
int resourceID = resources.getIdentifier(name, "drawable", context.getPackageName());
BitmapFactory.Options options = new BitmapFactory.Options();
options.inScaled = false;
return BitmapFactory.decodeResource(context.getResources(), resourceID, options);
}
Bitmap getBackgroundPattern() {
return getDrawable("background");
}
Bitmap getShadowPattern() {
return getDrawable("shadow");
}
private void onSizeChanged(int width, int height) { private void onSizeChanged(int width, int height) {
mGLController.surfaceChanged(width, height); mGLController.surfaceChanged(width, height);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment