[Win32] Remove obsolete HandleAtSizeConsumer

With latest refactorings, the HandleAtSizeConsumer inside Image became
obsolete as the ImageHandle passed to it already contains the other
information encapsulated in that consumer. Thus, this follow-up
refactoring replaces the HandleAtSizeConsumer with a simple ImageHandle
consumer. To do so, it properly encapsulates and exposes the
width/height information in an ImageHandle. It also aligns the name of
the method processing such a consumer to fit the actual behavior and the
according MacOS implementation.

Author: HeikoKlare

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

@@ -1233,10 +1233,11 @@ void apply() {
 }
 
 private void drawImage(Image image, int destX, int destY, int destWidth, int destHeight, int imageZoom) {
-	Rectangle destPixels = Win32DPIUtils.pointToPixel(drawable, new Rectangle(destX, destY, destWidth, destHeight), imageZoom);
-	image.executeOnImageHandleAtSize((tempHandle, handleSize) -> {
-		drawImage(image, 0, 0, handleSize.x, handleSize.y, destPixels.x, destPixels.y, destPixels.width,
-				destPixels.height, false, tempHandle);
+	Rectangle destPixels = Win32DPIUtils.pointToPixel(drawable, new Rectangle(destX, destY, destWidth, destHeight),
+			imageZoom);
+	image.executeOnImageHandleAtBestFittingSize(tempHandle -> {
+		drawImage(image, 0, 0, tempHandle.getWidth(), tempHandle.getHeight(), destPixels.x, destPixels.y,
+				destPixels.width, destPixels.height, false, tempHandle);
 	}, destPixels.width, destPixels.height);
 }
 

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

@@ -845,21 +845,15 @@ ImageHandle getHandle (int targetZoom, int nativeZoom) {
 	return getImageMetadata(zoomContext);
 }
 
-@FunctionalInterface
-interface HandleAtSizeConsumer {
-	void accept(ImageHandle imageHandle, Point handleSize);
-}
-
-void executeOnImageHandleAtSize(HandleAtSizeConsumer handleAtSizeConsumer, int widthHint, int heightHint) {
+void executeOnImageHandleAtBestFittingSize(Consumer<ImageHandle> handleAtSizeConsumer, int widthHint, int heightHint) {
 	if (!lastRequestedHandle.isReusable(heightHint, widthHint)) {
 		ImageData imageData;
 		imageData = this.imageProvider.loadImageDataAtSize(widthHint, heightHint);
 		lastRequestedHandle.destroy();
 		ImageHandle handleContainer = init(imageData, -1);
 		lastRequestedHandle = new CachedHandle(handleContainer, widthHint, heightHint);
 	}
-	handleAtSizeConsumer.accept(lastRequestedHandle.getHandle(),
-			new Point(lastRequestedHandle.handleContainer().width, lastRequestedHandle.handleContainer().height));
+	handleAtSizeConsumer.accept(lastRequestedHandle.getHandle());
 }
 
 /**
@@ -2817,13 +2811,15 @@ public void internal_dispose_GC(long handle, GCData data) {
 class ImageHandle {
 	private long handle;
 	private final int zoom;
-	private int height;
-	private int width;
+	private final int height;
+	private final int width;
 
-	public ImageHandle(long handle, int zoom) {
+	ImageHandle(long handle, int zoom) {
 		this.handle = handle;
 		this.zoom = zoom;
-		updateBoundsInPixelsFromNative();
+		Point bounds = getBoundsInPixelsFromNative();
+		this.width = bounds.x;
+		this.height = bounds.y;
 		if (backgroundColor != null) {
 			setBackground(backgroundColor);
 		}
@@ -2834,7 +2830,15 @@ long getHandle() {
 		return handle;
 	}
 
-	public Rectangle getBounds() {
+	int getWidth() {
+		return width;
+	}
+
+	int getHeight() {
+		return height;
+	}
+
+	Rectangle getBounds() {
 		return new Rectangle(0, 0, width, height);
 	}
 
@@ -2863,14 +2867,12 @@ private void setBackground(RGB color) {
 		device.internal_dispose_GC(hDC, null);
 	}
 
-	private void updateBoundsInPixelsFromNative() {
+	private Point getBoundsInPixelsFromNative() {
 		switch (type) {
 		case SWT.BITMAP:
 			BITMAP bm = new BITMAP();
 			OS.GetObject(handle, BITMAP.sizeof, bm);
-			width = bm.bmWidth;
-			height = bm.bmHeight;
-			return;
+			return new Point(bm.bmWidth, bm.bmHeight);
 		case SWT.ICON:
 			ICONINFO info = new ICONINFO();
 			OS.GetIconInfo(handle, info);
@@ -2881,11 +2883,10 @@ private void updateBoundsInPixelsFromNative() {
 			if (hBitmap == info.hbmMask) bm.bmHeight /= 2;
 			if (info.hbmColor != 0) OS.DeleteObject(info.hbmColor);
 			if (info.hbmMask != 0) OS.DeleteObject(info.hbmMask);
-			width = bm.bmWidth;
-			height = bm.bmHeight;
-			return;
+			return new Point(bm.bmWidth, bm.bmHeight);
 		default:
 			SWT.error(SWT.ERROR_INVALID_IMAGE);
+			return null;
 		}
 	}