Logic for SVG rasterization

Author: Michael5601

bundles/org.eclipse.jface/src/org/eclipse/jface/resource/CompositeImageDescriptor.java

@@ -450,7 +450,7 @@ protected boolean supportsZoomLevel(int zoom) {
 		// Currently only support integer zoom levels, because getZoomedImageData(..)
 		// suffers from Bug 97506: [HiDPI] ImageData.scaledTo() should use a
 		// better interpolation method.
-		return zoom > 0 && zoom % 100 == 0;
+		return true;
 	}
 
 	private ImageData getZoomedImageData(ImageDataProvider srcProvider) {

bundles/org.eclipse.jface/src/org/eclipse/jface/resource/FileImageDescriptor.java

@@ -126,7 +126,7 @@ public ImageData getImageData(int zoom) {
 		InputStream in = getStream(zoom);
 		if (in != null) {
 			try (BufferedInputStream stream = new BufferedInputStream(in)) {
-				return new ImageData(stream);
+				return new ImageData(stream, zoom);
 			} catch (SWTException e) {
 				if (e.code != SWT.ERROR_INVALID_IMAGE) {
 					throw e;

bundles/org.eclipse.jface/src/org/eclipse/jface/resource/URLImageDescriptor.java

@@ -35,10 +35,13 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.SWTException;
 import org.eclipse.swt.graphics.Device;
+import org.eclipse.swt.graphics.ISVGRasterizer;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.graphics.ImageData;
 import org.eclipse.swt.graphics.ImageDataProvider;
 import org.eclipse.swt.graphics.ImageFileNameProvider;
+import org.eclipse.swt.graphics.SVGRasterizerRegistry;
+import org.eclipse.swt.graphics.SVGUtil;
 
 /**
  * An ImageDescriptor that gets its information from a URL. This class is not
@@ -59,6 +62,16 @@ public URLImageFileNameProvider(String url) {
 		public String getImagePath(int zoom) {
 			URL tempURL = getURL(url);
 			if (tempURL != null) {
+				ISVGRasterizer rasterizer = SVGRasterizerRegistry.getRasterizer();
+				if (rasterizer != null) {
+					try (InputStream in = getStream(tempURL)) {
+						if (SVGUtil.isSVGFile(in)) {
+							return getFilePath(tempURL, false);
+						}
+					} catch (IOException e) {
+						// ignore.
+					}
+				}
 				final boolean logIOException = zoom == 100;
 				if (zoom == 100) {
 					return getFilePath(tempURL, logIOException);
@@ -139,12 +152,24 @@ public ImageData getImageData(int zoom) {
 	private static ImageData getImageData(String url, int zoom) {
 		URL tempURL = getURL(url);
 		if (tempURL != null) {
+			ISVGRasterizer rasterizer = SVGRasterizerRegistry.getRasterizer();
+			if (rasterizer != null) {
+				try {
+					try (InputStream in = getStream(tempURL)) {
+						if (SVGUtil.isSVGFile(in)) {
+							return getImageData(tempURL, zoom);
+						}
+					}
+				} catch (IOException e) {
+					// ignore.
+				}
+			}
 			if (zoom == 100) {
-				return getImageData(tempURL);
+				return getImageData(tempURL, zoom);
 			}
 			URL xUrl = getxURL(tempURL, zoom);
 			if (xUrl != null) {
-				ImageData xdata = getImageData(xUrl);
+				ImageData xdata = getImageData(xUrl, zoom);
 				if (xdata != null) {
 					return xdata;
 				}
@@ -153,18 +178,22 @@ private static ImageData getImageData(String url, int zoom) {
 			if (xpath != null) {
 				URL xPathUrl = getURL(xpath);
 				if (xPathUrl != null) {
-					return getImageData(xPathUrl);
+					return getImageData(xPathUrl, zoom);
 				}
 			}
 		}
 		return null;
 	}
 
 	private static ImageData getImageData(URL url) {
+		return getImageData(url, 0);
+	}
+
+	private static ImageData getImageData(URL url, int zoom) {
 		ImageData result = null;
 		try (InputStream in = getStream(url)) {
 			if (in != null) {
-				result = new ImageData(in);
+				result = new ImageData(in, zoom);
 			}
 		} catch (SWTException e) {
 			if (e.code != SWT.ERROR_INVALID_IMAGE) {

bundles/org.eclipse.ui.workbench/META-INF/MANIFEST.MF

@@ -113,7 +113,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)",
  org.eclipse.e4.ui.workbench.addons.swt;bundle-version="0.10.0",
  org.eclipse.e4.ui.services;bundle-version="1.3.0",
  org.eclipse.emf.ecore.xmi;bundle-version="2.11.0",
- org.eclipse.e4.core.di.extensions;bundle-version="0.13.0"
+ org.eclipse.e4.core.di.extensions;bundle-version="0.13.0",
+ org.eclipse.swt.svg;bundle-version="1.0.0"
 Import-Package: com.ibm.icu.util,
  jakarta.annotation;version="[2.1.0,3.0.0)",
  jakarta.inject;version="[2.0.0,3.0.0)",

bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/Workbench.java

@@ -156,6 +156,7 @@
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.graphics.Transform;
+import org.eclipse.swt.svg.SVGRasterizer;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.Monitor;
@@ -567,6 +568,7 @@ public static Workbench getInstance() {
 	 */
 	public static int createAndRunWorkbench(final Display display, final WorkbenchAdvisor advisor) {
 		final int[] returnCode = new int[1];
+		SVGRasterizer.intializeSVGRasterizer();
 		Realm.runWithDefault(DisplayRealm.getRealm(display), () -> {
 			boolean showProgress = PrefUtil.getAPIPreferenceStore()
 					.getBoolean(IWorkbenchPreferenceConstants.SHOW_PROGRESS_ON_STARTUP);