Control: remove dependency on Browser and OleClientSite

Thomas Singer · Thomas Singer · commit 6513c6eb4433 · 2025-05-28T17:21:57.000+02:00
This allows to compile SWT without the "bundles\org.eclipse.swt\Eclipse SWT Browser\" source path.
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/Browser.java b/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/Browser.java
@@ -1267,4 +1267,10 @@ public void stop () {
 	checkWidget();
 	webBrowser.stop ();
 }
+
+@Override
+protected boolean embedsWin32Control () {
+	// The Edge browser embeds webView2
+	return !isDisposed() && isVisible() && "edge".equals(getBrowserType());
+}
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleClientSite.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleClientSite.java
@@ -1511,4 +1511,10 @@ private SIZE xFormPixelsToHimetric(SIZE aSize) {
 	size.cy = cy;
 	return size;
 }
+
+@Override
+protected boolean embedsWin32Control () {
+	// OLE objects are always embedded by windows
+	return !isDisposed() && isVisible();
+}
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Composite.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Composite.java
@@ -1321,4 +1321,8 @@ public String toString() {
 	return super.toString() + " [layout=" + layout + "]";
 }
 
+@Override
+protected boolean embedsWin32Control () {
+	return false;
+}
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java
@@ -1898,4 +1898,8 @@ public String toString() {
 	return super.toString() + " [layout=" + layout + "]";
 }
 
+@Override
+protected boolean embedsWin32Control () {
+	return false;
+}
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Composite.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Composite.java
@@ -1986,4 +1986,17 @@ private static void handleDPIChange(Widget widget, int newZoom, float scalingFac
 	}
 	composite.redrawInPixels (null, true);
 }
+
+@Override
+protected boolean embedsWin32Control () {
+	if (isDisposed() || !isVisible()) {
+		return false;
+	}
+	for (Control child : getChildren()) {
+		if (child.embedsWin32Control()) {
+			return true;
+		}
+	}
+	return false;
+}
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Control.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Control.java
@@ -20,7 +20,6 @@
 
 import org.eclipse.swt.*;
 import org.eclipse.swt.accessibility.*;
-import org.eclipse.swt.browser.*;
 import org.eclipse.swt.events.*;
 import org.eclipse.swt.graphics.*;
 import org.eclipse.swt.internal.*;
@@ -3698,25 +3697,7 @@ public void setRedraw (boolean redraw) {
 	}
 }
 
-private boolean embedsWin32Control () {
-	if (this.isDisposed() || !this.isVisible()) {
-		return false;
-	}
-	if (this instanceof Browser browser) {
-		// The Edge browser embeds webView2
-		return "edge".equals(browser.getBrowserType());
-	}
-
-	if (this instanceof OleClientSite) {
-		// OLE objects are always embedded by windows
-		return true;
-	}
-
-	// This needs to be checked AFTER OleClientSite because OleClientSite itself is a Composite
-	if (this instanceof Composite comp) {
-		return Stream.of(comp.getChildren()).anyMatch(Control::embedsWin32Control);
-	}
-
+protected boolean embedsWin32Control () {
 	return false;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1267,4 +1267,10 @@ public void stop () {`
`1267`	`1267`	`checkWidget();`
`1268`	`1268`	`webBrowser.stop ();`
`1269`	`1269`	`}`
	`1270`	`+`
	`1271`	`+@Override`
	`1272`	`+protected boolean embedsWin32Control () {`
	`1273`	`+ // The Edge browser embeds webView2`
	`1274`	`+ return !isDisposed() && isVisible() && "edge".equals(getBrowserType());`
	`1275`	`+}`
`1270`	`1276`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1511,4 +1511,10 @@ private SIZE xFormPixelsToHimetric(SIZE aSize) {`
`1511`	`1511`	`size.cy = cy;`
`1512`	`1512`	`return size;`
`1513`	`1513`	`}`
	`1514`	`+`
	`1515`	`+@Override`
	`1516`	`+protected boolean embedsWin32Control () {`
	`1517`	`+ // OLE objects are always embedded by windows`
	`1518`	`+ return !isDisposed() && isVisible();`
	`1519`	`+}`
`1514`	`1520`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1321,4 +1321,8 @@ public String toString() {`
`1321`	`1321`	`return super.toString() + " [layout=" + layout + "]";`
`1322`	`1322`	`}`
`1323`	`1323`
	`1324`	`+@Override`
	`1325`	`+protected boolean embedsWin32Control () {`
	`1326`	`+ return false;`
	`1327`	`+}`
`1324`	`1328`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1898,4 +1898,8 @@ public String toString() {`
`1898`	`1898`	`return super.toString() + " [layout=" + layout + "]";`
`1899`	`1899`	`}`
`1900`	`1900`
	`1901`	`+@Override`
	`1902`	`+protected boolean embedsWin32Control () {`
	`1903`	`+ return false;`
	`1904`	`+}`
`1901`	`1905`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1986,4 +1986,17 @@ private static void handleDPIChange(Widget widget, int newZoom, float scalingFac`
`1986`	`1986`	`}`
`1987`	`1987`	`composite.redrawInPixels (null, true);`
`1988`	`1988`	`}`
	`1989`	`+`
	`1990`	`+@Override`
	`1991`	`+protected boolean embedsWin32Control () {`
	`1992`	`+ if (isDisposed() \|\| !isVisible()) {`
	`1993`	`+ return false;`
	`1994`	`+ }`
	`1995`	`+ for (Control child : getChildren()) {`
	`1996`	`+ if (child.embedsWin32Control()) {`
	`1997`	`+ return true;`
	`1998`	`+ }`
	`1999`	`+ }`
	`2000`	`+ return false;`
	`2001`	`+}`
`1989`	`2002`	`}`