Bug 576422 - Remove chromium sources

* Additional cleanup of build scripts
* Cleanup tests


Change-Id: I87eda0b582d1df7b122fffb91f8d8380503b59c8
Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.swt/+/186290
Tested-by: Platform Bot <[email protected]>
Reviewed-by: Alexander Kurtakov <[email protected]>

Author: akurtakov

bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/Browser.java

@@ -197,7 +197,7 @@ static int checkStyle(int style) {
 		}
 	}
 	/* If particular backend isn't specified, use the value from the system property. */
-	if ((style & (SWT.WEBKIT | SWT.CHROMIUM | SWT.EDGE)) == 0) {
+	if ((style & (SWT.WEBKIT | SWT.EDGE)) == 0) {
 		style |= DefaultType;
 	}
 	if ("win32".equals (platform) && (style & SWT.EDGE) != 0) { //$NON-NLS-1$

bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak

@@ -51,7 +51,6 @@ CAIRO_LIB = lib$(CAIRO_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
 ATK_LIB = lib$(ATK_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
 GLX_LIB = lib$(GLX_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
 WEBKIT_LIB = lib$(WEBKIT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
-CHROMIUM_LIB = lib$(CHROMIUM_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
 ALL_SWT_LIBS = $(SWT_LIB) $(AWT_LIB) $(SWTPI_LIB) $(CAIRO_LIB) $(ATK_LIB) $(GLX_LIB) $(WEBKIT_LIB)
 
 # Webkit extension lib has to be put into a separate folder and is treated differently from the other libraries.

bundles/org.eclipse.swt/buildFragment.xml

@@ -260,7 +260,7 @@
 		<copy todir="${destination.temp.folder}/${full.name}">
 			<fileset dir="${fragmentdir}" includes="fragment.properties,about.html,about_files/,swt*.dll,libswt*.so,libswt*.sl,libswt*.a,libswt*.jnilib,libXm.so.2,webkitextensions*/libswt*.so,META-INF/,WebView2Loader.dll" />
 		</copy>
-		<chmod perm="755" dir="${destination.temp.folder}/${full.name}" includes="swt*.dll,libswt*.so,libswt*.sl,libswt*.a,libswt*.jnilib,libXm.so.2,webkitextensions*/libswt*.so,chromium-*/*.so,WebView2Loader.dll" />
+		<chmod perm="755" dir="${destination.temp.folder}/${full.name}" includes="swt*.dll,libswt*.so,libswt*.sl,libswt*.a,libswt*.jnilib,libXm.so.2,webkitextensions*/libswt*.so,WebView2Loader.dll" />
 		<eclipse.versionReplacer path="${destination.temp.folder}/${full.name}" version="${version.suffix}" />
 	</target>
 

tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_Browser.java

@@ -86,7 +86,7 @@ public class Test_org_eclipse_swt_browser_Browser extends Test_org_eclipse_swt_w
 	public TestName name = new TestName();
 
 	Browser browser;
-	boolean isChromium = false, isEdge = false;
+	boolean isEdge = false;
 
 	static int[] webkitGtkVersionInts = new int[3];
 
@@ -112,7 +112,6 @@ public void setUp() {
 	shell.setLayout(new FillLayout());
 	browser = new Browser(shell, SWT.NONE);
 
-	isChromium = browser.getBrowserType().equals("chromium");
 	isEdge = browser.getBrowserType().equals("edge");
 
 	String shellTitle = name.getMethodName();
@@ -226,7 +225,7 @@ public void test_get_set_Cookies() {
 public void test_getChildren() {
 	// Win32's Browser is a special case. It has 1 child by default, the OleFrame.
 	// See Bug 499387 and Bug 511874
-	if (SwtTestUtil.isWindows && !isChromium && !isEdge) {
+	if (SwtTestUtil.isWindows && !isEdge) {
 		int childCount = composite.getChildren().length;
 		String msg = "Browser on Win32 is a special case, the first child is an OleFrame (ActiveX control). Actual child count is: " + childCount;
 		assertTrue(msg, childCount == 1);
@@ -313,11 +312,7 @@ public void test_LocationListener_changing() {
 	AtomicBoolean changingFired = new AtomicBoolean(false);
 	browser.addLocationListener(changingAdapter(e -> changingFired.set(true)));
 	shell.open();
-	if (isChromium) {
-		browser.setUrl("about:version");
-	} else { // Chromium cannot fire changing event for setText
-		browser.setText("Hello world");
-	}
+	browser.setText("Hello world");
 	boolean passed = waitForPassCondition(changingFired::get);
 	assertTrue("LocationListener.changing() event was never fired", passed);
 }
@@ -354,11 +349,7 @@ public void changed(LocationEvent event) {
 		}
 	});
 	shell.open();
-	if (isChromium) {
-		browser.setUrl("about:version");
-	} else { // Chromium cannot fire changing event for setText
-		browser.setText("Hello world");
-	}
+	browser.setText("Hello world");
 	waitForPassCondition(finished::get);
 
 	if (finished.get() && changingFired.get() && changedFired.get() && !changedFiredTooEarly.get()) {
@@ -435,11 +426,7 @@ public void changed(LocationEvent event) {
 		}
 	}));
 	shell.open();
-	if (isChromium) {
-	    browser.setUrl("about:version");
-	} else { // Chromium cannot fire changing event for setText
-	    browser.setText("You should not see this message.");
-	}
+	browser.setText("You should not see this message.");
 
 	// We must wait for events *not* to fire.
 	// On Gtk, Quadcore (Intel i7-4870HQ pci-e SSD, all events fire after ~80ms.
@@ -993,7 +980,6 @@ public void show(WindowEvent event) {
 /** Verify that if multiple child shells are open, no duplicate visibility events are sent. */
 @Test
 public void test_VisibilityWindowListener_multiple_shells() {
-		assumeTrue(!isChromium); // this fails sometimes due cef limitation, can be enabled on newer versions.
 		AtomicBoolean secondChildCompleted = new AtomicBoolean(false);
 		AtomicInteger childCount = new AtomicInteger(0);
 
@@ -1257,13 +1243,9 @@ public void changed(LocationEvent event) {
 	});
 
 	shell.open();
-	if (isChromium) {
-		browser.setUrl("about:version");
-	} else { // Chromium cannot fire changing event for setText
-		browser.setText("<body>Hello <b>World</b></body>");
-	}
+	browser.setText("<body>Hello <b>World</b></body>");
 	// Wait till both listeners were fired.
-	if (SwtTestUtil.isWindows && !isChromium) {
+	if (SwtTestUtil.isWindows) {
 		waitForPassCondition(changingFinished::get); // Windows doesn't reach changedFinished.get();
 	} else
 		waitForPassCondition(() -> (changingFinished.get() && changedFinished.get()));
@@ -1279,10 +1261,7 @@ public void changed(LocationEvent event) {
 					"\n  changed:   fired:" + changedFinished.get() + "    evaluated:" + changed;
 	boolean passed = false;
 
-	if (isChromium) {
-		// On Chromium, evaluation in 'changing' fails.
-		passed = changingFinished.get() && changedFinished.get() && changed; // && changing (broken)
-	} else if (SwtTestUtil.isGTK) {
+	if (SwtTestUtil.isGTK) {
 		// Evaluation works in all cases.
 		passed = changingFinished.get() && changedFinished.get() && changed && changing;
 	} else if (SwtTestUtil.isCocoa) {
@@ -1299,7 +1278,6 @@ public void changed(LocationEvent event) {
 /** Verify that evaluation works inside an OpenWindowListener */
 @Test
 public void test_OpenWindowListener_evaluateInCallback() {
-	assumeTrue(!isChromium); // This works on Webkit1, but can sporadically fail, see Bug 509411
 	AtomicBoolean eventFired = new AtomicBoolean(false);
 	browser.addOpenWindowListener(event -> {
 		browser.evaluate("SWTopenListener = true");
@@ -1401,7 +1379,7 @@ public void test_setFocus_toChild_beforeOpen() {
 /** Text without html tags */
 @Test
 public void test_getText() {
-	if (SwtTestUtil.isWindows || isChromium) {
+	if (SwtTestUtil.isWindows) {
 		// Windows' Browser implementation returns the processed HTML rather than the original one.
 		// The processed webpage has html tags added to it.
 		getText_helper("helloWorld", "<html><head></head><body>helloWorld</body></html>");
@@ -1423,7 +1401,7 @@ public void test_getText_html() {
 @Test
 public void test_getText_script() {
 	String testString = "<html><head></head><body>hello World<script>document.body.style.backgroundColor = \"red\";</script></body></html>";
-	if (SwtTestUtil.isWindows || isChromium) {
+	if (SwtTestUtil.isWindows) {
 		// Windows' Browser implementation returns the processed HTML rather than the original one.
 		// The processed page injects "style" property into the body from the script.
 		getText_helper(testString, "<html><head></head><body style=\"background-color: red;\">hello World<script>document.body.style.backgroundColor = \"red\";</script></body></html>");
@@ -1439,7 +1417,7 @@ public void test_getText_script() {
 @Test
 public void test_getText_doctype() {
 	String testString = "<!DOCTYPE html><html><head></head><body>hello World</body></html>";
-	if (SwtTestUtil.isWindows && !isChromium) {
+	if (SwtTestUtil.isWindows) {
 		// Windows' Browser implementation returns the processed HTML rather than the original one.
 		// The processed page strips out DOCTYPE.
 		getText_helper(testString, "<html><head></head><body>hello World</body></html>");