Create handles for ImageDataProvider and ImageFilenameProvider on demand

Author: ShahzaibIbrahim

bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Image.java

@@ -552,7 +552,10 @@ public Image(Device device, ImageFileNameProvider imageFileNameProvider) {
 	super(device);
 	this.imageProvider = new ImageFileNameProviderWrapper(imageFileNameProvider);
 	initialNativeZoom = DPIUtil.getNativeDeviceZoom();
-	imageProvider.getImageMetadata(getZoom());
+	if (imageProvider.getImageData(100) == null) {
+		SWT.error(SWT.ERROR_INVALID_ARGUMENT, null,
+				": ImageFileNameProvider [" + imageFileNameProvider + "] returns null ImageData at 100% zoom.");
+	}
 	init();
 	this.device.registerResourceWithZoomSupport(this);
 }
@@ -590,7 +593,10 @@ public Image(Device device, ImageDataProvider imageDataProvider) {
 	super(device);
 	this.imageProvider = new ImageDataProviderWrapper(imageDataProvider);
 	initialNativeZoom = DPIUtil.getNativeDeviceZoom();
-	imageProvider.getImageMetadata(getZoom());
+	if (imageDataProvider.getImageData(100) == null) {
+		SWT.error(SWT.ERROR_INVALID_ARGUMENT, null,
+				": ImageDataProvider [" + imageDataProvider + "] returns null ImageData at 100% zoom.");
+	}
 	init();
 	this.device.registerResourceWithZoomSupport(this);
 }
@@ -1891,18 +1897,23 @@ public static Image win32_new(Device device, int type, long handle, int nativeZo
 }
 
 private abstract class AbstractImageProviderWrapper {
+	private boolean isDestroyed;
+
 	protected abstract Rectangle getBounds(int zoom);
 	abstract ImageData getImageData(int zoom);
 	abstract ImageHandle getImageMetadata(int zoom);
 	abstract AbstractImageProviderWrapper createCopy(Image image);
-	abstract boolean isDisposed();
+
+	protected boolean isDisposed() {
+		return isDestroyed;
+	}
 
 	protected void destroy() {
+		this.isDestroyed = true;
 	}
 }
 
 private class PlainImageProviderWrapper extends AbstractImageProviderWrapper {
-	private boolean isDestroyed;
 	private final int width;
 	private final int height;
 
@@ -1984,16 +1995,6 @@ private long initBaseHandle(int zoom) {
 	AbstractImageProviderWrapper createCopy(Image image) {
 		return image.new PlainImageProviderWrapper(width, height);
 	}
-
-	@Override
-	protected void destroy() {
-		this.isDestroyed = true;
-	}
-
-	@Override
-	boolean isDisposed() {
-		return isDestroyed;
-	}
 }
 
 private abstract class DynamicImageProviderWrapper extends AbstractImageProviderWrapper {
@@ -2016,28 +2017,43 @@ public boolean equals(Object otherProvider) {
 	}
 }
 
-private class ImageFileNameProviderWrapper extends DynamicImageProviderWrapper {
-
-	/**
-	 * ImageFileNameProvider to provide file names at various Zoom levels
-	 */
-	private final ImageFileNameProvider provider;
+private abstract class BaseImageProviderWrapper<T> extends DynamicImageProviderWrapper {
+	protected final T provider;
+	private final Map<Integer, Rectangle> zoomToBounds = new HashMap<>();
 
-	ImageFileNameProviderWrapper(ImageFileNameProvider provider) {
-		checkProvider(provider, ImageFileNameProvider.class);
+	BaseImageProviderWrapper(T provider, Class<T> expectedClass) {
+		checkProvider(provider, expectedClass);
 		this.provider = provider;
 	}
 
+	@Override
+	Object getProvider() {
+		return provider;
+	}
+
 	@Override
 	protected Rectangle getBounds(int zoom) {
-		ImageHandle imageHandle = zoomLevelToImageHandle.values().iterator().next();
-		Rectangle rectangle = new Rectangle(0, 0, imageHandle.width, imageHandle.height);
-		return DPIUtil.scaleBounds(rectangle, zoom, imageHandle.zoom);
+		if (zoomLevelToImageHandle.containsKey(zoom)) {
+			ImageHandle imgHandle = zoomLevelToImageHandle.get(zoom);
+			return new Rectangle(0, 0, imgHandle.width, imgHandle.height);
+		}
+		if (!zoomToBounds.containsKey(zoom)) {
+			ImageData imageData = getImageData(zoom);
+			Rectangle rectangle = new Rectangle(0, 0, imageData.width, imageData.height);
+			zoomToBounds.put(zoom, rectangle);
+		}
+		return zoomToBounds.get(zoom);
+	}
+}
+
+private class ImageFileNameProviderWrapper extends BaseImageProviderWrapper<ImageFileNameProvider> {
+	ImageFileNameProviderWrapper(ImageFileNameProvider provider) {
+		super(provider, ImageFileNameProvider.class);
 	}
 
 	@Override
 	ImageData getImageData(int zoom) {
-		ElementAtZoom<String> fileForZoom = DPIUtil.validateAndGetImagePathAtZoom (provider, zoom);
+		ElementAtZoom<String> fileForZoom = DPIUtil.validateAndGetImagePathAtZoom(provider, zoom);
 		ImageHandle nativeInitializedImage;
 		if (zoomLevelToImageHandle.containsKey(fileForZoom.zoom())) {
 			nativeInitializedImage = zoomLevelToImageHandle.get(fileForZoom.zoom());
@@ -2072,16 +2088,6 @@ ImageHandle getImageMetadata(int zoom) {
 		return zoomLevelToImageHandle.get(zoom);
 	}
 
-	@Override
-	boolean isDisposed() {
-		return zoomLevelToImageHandle.isEmpty();
-	}
-
-	@Override
-	Object getProvider() {
-		return provider;
-	}
-
 	@Override
 	public int hashCode() {
 		return Objects.hash(provider, styleFlag, transparentPixel, getZoom());
@@ -2248,61 +2254,59 @@ ImageHandle initNative(String filename, int zoom) {
 	private int extractDepthForPixelFormat(BitmapData bitmapData) {
 		int depth = 0;
 		switch (bitmapData.PixelFormat) {
-			case Gdip.PixelFormat1bppIndexed: depth = 1; break;
-			case Gdip.PixelFormat4bppIndexed: depth = 4; break;
-			case Gdip.PixelFormat8bppIndexed: depth = 8; break;
-			case Gdip.PixelFormat16bppARGB1555:
-			case Gdip.PixelFormat16bppRGB555:
-			case Gdip.PixelFormat16bppRGB565: depth = 16; break;
-			case Gdip.PixelFormat24bppRGB: depth = 24; break;
-			case Gdip.PixelFormat32bppRGB:
-			case Gdip.PixelFormat32bppARGB: depth = 32; break;
+		case Gdip.PixelFormat1bppIndexed:
+			depth = 1;
+			break;
+		case Gdip.PixelFormat4bppIndexed:
+			depth = 4;
+			break;
+		case Gdip.PixelFormat8bppIndexed:
+			depth = 8;
+			break;
+		case Gdip.PixelFormat16bppARGB1555:
+		case Gdip.PixelFormat16bppRGB555:
+		case Gdip.PixelFormat16bppRGB565:
+			depth = 16;
+			break;
+		case Gdip.PixelFormat24bppRGB:
+			depth = 24;
+			break;
+		case Gdip.PixelFormat32bppRGB:
+		case Gdip.PixelFormat32bppARGB:
+			depth = 32;
+			break;
 		}
 		return depth;
 	}
 
 	private long extractHandleForPixelFormat(int width, int height, int pixelFormat) {
 		long handle = 0;
 		switch (pixelFormat) {
-			case Gdip.PixelFormat16bppRGB555:
-			case Gdip.PixelFormat16bppRGB565:
-				handle = createDIB(width, height, 16);
-				break;
-			case Gdip.PixelFormat24bppRGB:
-			case Gdip.PixelFormat32bppCMYK:
-				handle = createDIB(width, height, 24);
-				break;
-			case Gdip.PixelFormat32bppRGB:
+		case Gdip.PixelFormat16bppRGB555:
+		case Gdip.PixelFormat16bppRGB565:
+			handle = createDIB(width, height, 16);
+			break;
+		case Gdip.PixelFormat24bppRGB:
+		case Gdip.PixelFormat32bppCMYK:
+			handle = createDIB(width, height, 24);
+			break;
+		case Gdip.PixelFormat32bppRGB:
 			// These will lose either precision or transparency
-			case Gdip.PixelFormat16bppGrayScale:
-			case Gdip.PixelFormat48bppRGB:
-			case Gdip.PixelFormat32bppPARGB:
-			case Gdip.PixelFormat64bppARGB:
-			case Gdip.PixelFormat64bppPARGB:
-				handle = createDIB(width, height, 32);
-				break;
+		case Gdip.PixelFormat16bppGrayScale:
+		case Gdip.PixelFormat48bppRGB:
+		case Gdip.PixelFormat32bppPARGB:
+		case Gdip.PixelFormat64bppARGB:
+		case Gdip.PixelFormat64bppPARGB:
+			handle = createDIB(width, height, 32);
+			break;
 		}
 		return handle;
 	}
 }
 
-private class ImageDataProviderWrapper extends DynamicImageProviderWrapper {
-
-	/**
-	 * ImageDataProvider to provide ImageData at various Zoom levels
-	 */
-	private final ImageDataProvider provider;
-
+private class ImageDataProviderWrapper extends BaseImageProviderWrapper<ImageDataProvider> {
 	ImageDataProviderWrapper(ImageDataProvider provider) {
-		checkProvider(provider, ImageDataProvider.class);
-		this.provider = provider;
-	}
-
-	@Override
-	protected Rectangle getBounds(int zoom) {
-		ImageHandle imageHandle = zoomLevelToImageHandle.values().iterator().next();
-		Rectangle rectangle = new Rectangle(0, 0, imageHandle.width, imageHandle.height);
-		return DPIUtil.scaleBounds(rectangle, zoom, imageHandle.zoom);
+		super(provider, ImageDataProvider.class);
 	}
 
 	@Override
@@ -2320,16 +2324,6 @@ ImageHandle getImageMetadata(int zoom) {
 		return zoomLevelToImageHandle.get(zoom);
 	}
 
-	@Override
-	boolean isDisposed() {
-		return zoomLevelToImageHandle.isEmpty();
-	}
-
-	@Override
-	Object getProvider() {
-		return provider;
-	}
-
 	@Override
 	ImageDataProviderWrapper createCopy(Image image) {
 		return image.new ImageDataProviderWrapper(provider);
@@ -2340,7 +2334,6 @@ private class ImageGcDrawerWrapper extends DynamicImageProviderWrapper {
 	private ImageGcDrawer drawer;
 	private int width;
 	private int height;
-	private boolean isDestroyed;
 
 	ImageGcDrawerWrapper(ImageGcDrawer imageGcDrawer, int width, int height) {
 		checkProvider(imageGcDrawer, ImageGcDrawer.class);
@@ -2379,16 +2372,6 @@ ImageHandle getImageMetadata(int zoom) {
 		return zoomLevelToImageHandle.get(zoom);
 	}
 
-	@Override
-	protected void destroy() {
-		isDestroyed = true;
-	}
-
-	@Override
-	boolean isDisposed() {
-		return isDestroyed;
-	}
-
 	@Override
 	Object getProvider() {
 		return drawer;