diff --git a/modules/javafx.web/src/main/native/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml b/modules/javafx.web/src/main/native/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml index 9ba0cc7a6c..00bec42420 100644 --- a/modules/javafx.web/src/main/native/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml +++ b/modules/javafx.web/src/main/native/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml @@ -430,7 +430,6 @@ IncrementalPDFLoadingEnabled: WebKit: default: WebKit::defaultIncrementalPDFEnabled() -# FIXME: This is on by default in WebKit2. Perhaps we should consider turning it on for WebKitLegacy as well. IntersectionObserverEnabled: type: bool humanReadableName: "Intersection Observer" @@ -438,11 +437,11 @@ IntersectionObserverEnabled: condition: ENABLE(INTERSECTION_OBSERVER) defaultValue: WebKitLegacy: - default: false + default: true WebKit: default: true WebCore: - default: false + default: true # FIXME: The 'Is' prefix is inconsistent with most other preferences and should be removed. IsFirstPartyWebsiteDataRemovalDisabled: diff --git a/tests/system/src/test/java/test/javafx/scene/web/WebIObserverTest.java b/tests/system/src/test/java/test/javafx/scene/web/WebIObserverTest.java new file mode 100644 index 0000000000..cbe6be35ae --- /dev/null +++ b/tests/system/src/test/java/test/javafx/scene/web/WebIObserverTest.java @@ -0,0 +1,126 @@ +/* + * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package test.javafx.scene.web; + +import javafx.application.Application; +import javafx.application.Platform; +import javafx.scene.Scene; +import javafx.scene.web.WebView; +import javafx.stage.Stage; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import test.util.Util; + +import java.net.URL; +import java.util.concurrent.CountDownLatch; + +import static javafx.concurrent.Worker.State.SUCCEEDED; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + +public class WebIObserverTest { + private static final CountDownLatch launchLatch = new CountDownLatch(1); + + private static WebIObserverTestApp WebIObserverTestApp; + + private WebView webView; + + public static class WebIObserverTestApp extends Application { + private Stage primaryStage = null; + + @Override + public void init() { + WebIObserverTest.WebIObserverTestApp = this; + } + + @Override + public void start(Stage primaryStage) throws Exception { + Platform.setImplicitExit(false); + this.primaryStage = primaryStage; + launchLatch.countDown(); + } + } + + @BeforeClass + public static void setupOnce() { + new Thread(() -> Application.launch(WebIObserverTestApp.class, (String[])null)).start(); + + assertTrue("Timeout waiting for FX runtime to start", Util.await(launchLatch)); + } + + @AfterClass + public static void tearDownOnce() { + Platform.exit(); + } + + @Before + public void setupTestObjects() { + Platform.runLater(() -> { + webView = new WebView(); + WebIObserverTestApp.primaryStage.setScene(new Scene(webView)); + WebIObserverTestApp.primaryStage.show(); + }); + } + + @Test public void testIO() { + final CountDownLatch webViewStateLatch = new CountDownLatch(1); + URL resource = WebIObserverTest.class.getResource("testIObserver.html"); + assertNotNull("Resource was null", resource); + + Util.runAndWait(() -> { + assertNotNull(webView); + webView.getEngine().getLoadWorker().stateProperty(). + addListener((observable, oldValue, newValue) -> { + if (newValue == SUCCEEDED) { + webViewStateLatch.countDown(); + } + }); + + webView.getEngine().load(resource.toExternalForm()); + }); + + assertTrue("Timeout waiting for succeeded state", Util.await(webViewStateLatch)); + Util.sleep(500); + + Util.runAndWait(() -> + assertEquals("Unknown intersection ratio", "?", getIntersectionRatio())); + + Util.runAndWait(() -> webView.getEngine().executeScript("testIO()")); + Util.sleep(100); + + Util.runAndWait(() -> + assertEquals("Intersection ratio", "0.5", getIntersectionRatio())); + } + + private String getIntersectionRatio() { + Object object = webView.getEngine().executeScript("document.querySelector('#output pre').innerText"); + assertNotNull("InnerText was null", object); + return String.valueOf(object); + } +} diff --git a/tests/system/src/test/resources/test/javafx/scene/web/testIObserver.html b/tests/system/src/test/resources/test/javafx/scene/web/testIObserver.html new file mode 100644 index 0000000000..03eef94fab --- /dev/null +++ b/tests/system/src/test/resources/test/javafx/scene/web/testIObserver.html @@ -0,0 +1,54 @@ + + + + + test + + + + +
+
+
+
Intersection ratio:
?
+ +