241062 - [consistency] Font#getFontData() not safe from non-ui thread on MacOS (back port to 3.4.1)

1 files changed, 2 insertions, 18 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/graphics/Font.java b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/graphics/Font.java
index ae55795855..5050738e94 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/graphics/Font.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/graphics/Font.java
@@ -298,25 +298,11 @@ public FontData[] getFontData() {
 	if ((this.style & OS.bold) != 0) style |= SWT.BOLD;
 	if (atsName.indexOf("Italic") != -1) style |= SWT.ITALIC;
 	if (atsName.indexOf("Bold") != -1) style |= SWT.BOLD;
-	int deviceDPI = device.getDPI().y;
-	int screenDPI = getScreenDPI().y;
-	FontData data = new FontData(name, size * screenDPI/deviceDPI, style);
+	FontData data = new FontData(name, size, style);
 	data.atsName = atsName;
 	return new FontData[]{data};
 }
 
-Point getScreenDPI() {
-	int gdevice = OS.GetMainDevice();
-	int[] ptr = new int[1];
-	OS.memmove(ptr, gdevice, 4);
-	GDevice device = new GDevice();
-	OS.memmove(device, ptr[0], GDevice.sizeof);
-	OS.memmove(ptr, device.gdPMap, 4);
-	PixMap pixmap = new PixMap();
-	OS.memmove(pixmap, ptr[0], PixMap.sizeof);
-	return new Point (OS.Fix2Long (pixmap.hRes), OS.Fix2Long (pixmap.vRes));
-}
-
 /**	 
  * Invokes platform specific functionality to allocate a new font.
  * <p>
@@ -395,9 +381,7 @@ void init(String name, float height, int style, String atsName) {
 			}
 		}
 	}
-	int deviceDPI = device.getDPI().y;
-	int screenDPI = getScreenDPI().y;
-	this.size = height * deviceDPI/screenDPI;
+	this.size = height;
 	if (font == 0) {
 		Font systemFont = device.systemFont;
 		this.handle = systemFont.handle;