Merge branch 'JFXWCMathMLRenderingPatch201806241013' into WebCorePatc…

…h2018062102_work
javafxports · Jun 24, 2018 · 9e5a033 · 9e5a033
2 parents 241ad57 + 4039615
commit 9e5a033
Show file tree

Hide file tree

Showing 819 changed files with 137,189 additions and 81,432 deletions.
diff --git a/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/NativeMediaPlayer.java b/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/NativeMediaPlayer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2018, 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
@@ -828,6 +828,9 @@ public void addMediaPlayerListener(PlayerStateListener listener) {
                             case FINISHED:
                                 listener.onFinish(evt);
                                 break;
+                            case HALTED:
+                                listener.onHalt(evt);
+                                break;
                             default:
                                 break;
                         }

diff --git a/modules/javafx.media/src/main/legal/glib.md b/modules/javafx.media/src/main/legal/glib.md
@@ -1,10 +1,10 @@
-## GNU Glib v2.42.1
+## GNU Glib v2.56.1
 
 ### Glib Notice
 <pre>
-You are receiving a copy of GNU Glib, Version: 2.42.1 in either source or
+You are receiving a copy of GNU Glib, Version: 2.56.1 in either source or
 object code in the JavaFX runtime or JavaFX SDK. The terms of the
-Oracle license do NOT apply to the GNU Glib, Version: 2.42.1; it is
+Oracle license do NOT apply to the GNU Glib, Version: 2.56.1; it is
 licensed under the following license, separately from the Oracle programs
 you receive. If you do not wish to install this library, you may delete
 this library:

diff --git a/modules/javafx.media/src/main/legal/gstreamer.md b/modules/javafx.media/src/main/legal/gstreamer.md
@@ -1,10 +1,10 @@
-## GStreamer v1.4.4
+## GStreamer v1.14.0
 
 ### GStreamer Notice
 <pre>
-You are receiving a copy of GStreamer, Version: 1.4.4 in either source or
+You are receiving a copy of GStreamer, Version: 1.14.0 in either source or
 object code in the JavaFX runtime or JavaFX SDK. The terms of the
-Oracle license do NOT apply to the GStreamer, Version: 1.4.4; it is
+Oracle license do NOT apply to the GStreamer, Version: 1.14.0; it is
 licensed under the following license, separately from the Oracle programs
 you receive. If you do not wish to install this library, you may delete
 this library: