changeset 7797:6a782ee05c58

Merged changes
author mchicharro
date Tue, 26 Aug 2014 19:29:07 +0100
parents 8889a4892b7d 507a38bed103
children 5705e881dc1f
files .idea/copyright/profiles_settings.xml
diffstat 2 files changed, 21 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/.idea/copyright/profiles_settings.xml	Tue Aug 26 18:29:47 2014 +0100
+++ b/.idea/copyright/profiles_settings.xml	Tue Aug 26 19:29:07 2014 +0100
@@ -1,5 +1,3 @@
 <component name="CopyrightManager">
-  <settings default="">
-    <module2copyright />
-  </settings>
+  <settings default="" />
 </component>
\ No newline at end of file
--- a/modules/graphics/src/main/java/com/sun/javafx/application/PlatformImpl.java	Tue Aug 26 18:29:47 2014 +0100
+++ b/modules/graphics/src/main/java/com/sun/javafx/application/PlatformImpl.java	Tue Aug 26 19:29:07 2014 +0100
@@ -731,11 +731,31 @@
                 if (isMediaSupported == null) {
                     isMediaSupported = checkForClass(
                             "javafx.scene.media.MediaView");
+                    if (isMediaSupported && PlatformUtil.isEmbedded()) {
+                        AccessController.doPrivileged((PrivilegedAction<Void>) () -> {
+                            String s = System.getProperty(
+                                    "com.sun.javafx.experimental.embedded.media", 
+                                    "false");
+                            isMediaSupported = Boolean.valueOf(s);
+                            return null;
+
+                        });
+                    }
                 }
                 return isMediaSupported;
             case WEB:
                 if (isWebSupported == null) {
                     isWebSupported = checkForClass("javafx.scene.web.WebView");
+                    if (isWebSupported && PlatformUtil.isEmbedded()) {
+                        AccessController.doPrivileged((PrivilegedAction<Void>) () -> {
+                            String s = System.getProperty(
+                                    "com.sun.javafx.experimental.embedded.web", 
+                                    "false");
+                            isWebSupported = Boolean.valueOf(s);
+                            return null;
+
+                        });
+                    }
                 }
                 return isWebSupported;
             case SWT: