changeset 8954:39bbac39d4ba 8u45-b01

Automated merge with http://hg.openjdk.java.net/openjfx/8u/rt
author kcr
date Fri, 12 Dec 2014 11:23:44 -0800
parents 7988dea6ec62 4b0711de1ca8
children 85fb225f0b14
files .hgtags build.properties modules/graphics/src/main/docs/javafx/scene/doc-files/cssref.html modules/web/src/main/native/Source/WebCore/platform/java/WebPage.cpp
diffstat 13 files changed, 56 insertions(+), 55 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Dec 09 22:11:34 2014 -0800
+++ b/.hgtags	Fri Dec 12 11:23:44 2014 -0800
@@ -200,13 +200,25 @@
 1eb6f8e62d998b96a66293688e64c2240e26815d 8u25-b15
 2e197f8c8fb43526f2eefca5800a75d1d6374dc1 8u25-b16
 70a91719c7faf3cfed0faaaefb8a400159846f13 8u25-b17
+5dffaa5831fa18ae9376448c8aad7a6f5e5227ef 8u31-b01
 b2021af209c3329ab75d019adf93bf853f2963c2 8u25-b18
+005254e22af36cea855c584b4ae4cf09f285819b 8u31-b02
+cb1597094e0803aa56013d79bd26e54b08b98cef 8u31-b03
+d865ed51c537d80655339bf01928d52bf8e59a35 8u31-b04
+14e5b025761ab156d02dcae28c09239a1c5d33a5 8u31-b05
 3a7f004c4995643995ec71da4512aa9558b01af4 8u40-b10
 6c32224edbf9e9f740040371565823e9bedf4650 8u40-b11
 10ada39be190587bf1e98337d49826e64e23b8e3 8u40-b12
 b90398073b6ade2a5288383d4f924cb42c01e55a 8u40-b13
+14e5b025761ab156d02dcae28c09239a1c5d33a5 8u31-b06
 051a0211defcedc26c4899e3275537672f0300f0 8u40-b14
+1649df8999bff6642c2343993cd5d720437c79d6 8u31-b07
 7a14d29e04c85953ee48adf12365d703a24deacf 8u40-b15
+8424da2018ab0d6823ed8f25c3fca600f7f7b303 8u31-b08
 d094365ab0c5a171f0fdceae5723aae7266bddeb 8u40-b16
+7ee735f22fdc83e45ac04b673c3ea9c2f4aed55c 8u31-b09
 688a5f6a294d33be260deb4d6ac4470ae3e8c4a0 8u40-b17
+55558f35410d2be609303fb564f926eeee780a4b 8u31-b10
 99b445f2721193142a2fd8b206b9f949c134639d 8u40-b18
+1bf4be81c1b486c369130e16ce5904de6f7d4963 8u31-b11
+ce317dfcb9a96943403d88d86abcda4c7f182ff5 8u31-b12
--- a/build.properties	Tue Dec 09 22:11:34 2014 -0800
+++ b/build.properties	Fri Dec 12 11:23:44 2014 -0800
@@ -33,10 +33,10 @@
 jfx.release.milestone=ea
 # Note: For fcs builds the suffix should be blank
 jfx.release.suffix=-ea
-jfx.release.name=8u40
+jfx.release.name=8u45
 jfx.release.major.version=8
 jfx.release.minor.version=0
-jfx.release.micro.version=40
+jfx.release.micro.version=45
 
 ##############################################################################
 #
@@ -44,7 +44,7 @@
 #
 ##############################################################################
 
-javadoc.bottom=<small><a href="http://docs.oracle.com/javase/8/docs/legal/cpyr.html">Copyright</a> (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.</small>
+javadoc.bottom=<small><a href="http://docs.oracle.com/javase/8/docs/legal/cpyr.html">Copyright</a> (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.</small>
 javadoc.title=JavaFX 8
 javadoc.header=JavaFX&nbsp;8
 
--- a/modules/fxml/src/main/docs/javafx/fxml/doc-files/introduction_to_fxml.html	Tue Dec 09 22:11:34 2014 -0800
+++ b/modules/fxml/src/main/docs/javafx/fxml/doc-files/introduction_to_fxml.html	Fri Dec 12 11:23:44 2014 -0800
@@ -1035,7 +1035,7 @@
 
 <hr>
 <p>
-<small><a href="http://docs.oracle.com/javase/8/docs/legal/cpyr.html">Copyright</a> (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.</small>
+<small><a href="http://docs.oracle.com/javase/8/docs/legal/cpyr.html">Copyright</a> (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.</small>
 </p>
 </body>
 </html>
--- a/modules/graphics/src/main/docs/javafx/scene/doc-files/cssref.html	Tue Dec 09 22:11:34 2014 -0800
+++ b/modules/graphics/src/main/docs/javafx/scene/doc-files/cssref.html	Fri Dec 12 11:23:44 2014 -0800
@@ -6192,7 +6192,7 @@
     <p>[5] Uniform Resource Identifier (URI): Generic Syntax <a href="http://www.ietf.org/rfc/rfc3986">RFC-3986</a></p>
     <hr>
     <p>
-<span style="font-size: small;"><a href="http://docs.oracle.com/javase/8/docs/legal/cpyr.html">Copyright</a> (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.</span>
+<span style="font-size: small;"><a href="http://docs.oracle.com/javase/8/docs/legal/cpyr.html">Copyright</a> (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.</span>
     </p>
     <br>
   </body>
--- a/modules/graphics/src/main/java/com/sun/javafx/font/coretext/CTGlyph.java	Tue Dec 09 22:11:34 2014 -0800
+++ b/modules/graphics/src/main/java/com/sun/javafx/font/coretext/CTGlyph.java	Fri Dec 12 11:23:44 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, 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
--- a/modules/graphics/src/main/java/com/sun/javafx/font/freetype/FTFontFile.java	Tue Dec 09 22:11:34 2014 -0800
+++ b/modules/graphics/src/main/java/com/sun/javafx/font/freetype/FTFontFile.java	Fri Dec 12 11:23:44 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, 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
--- a/modules/graphics/src/main/java/com/sun/scenario/effect/impl/sw/sse/SSELinearConvolvePeer.java	Tue Dec 09 22:11:34 2014 -0800
+++ b/modules/graphics/src/main/java/com/sun/scenario/effect/impl/sw/sse/SSELinearConvolvePeer.java	Fri Dec 12 11:23:44 2014 -0800
@@ -155,7 +155,7 @@
         return new ImageData(getFilterContext(), dst, dstBounds);
     }
 
-    protected native void
+    native void
         filterVector(int dstPixels[], int dstw, int dsth, int dstscan,
                      int srcPixels[], int srcw, int srch, int srcscan,
                      float weights[], int count,
@@ -172,7 +172,7 @@
      * Rows are horizontal in the first pass and vertical in the second pass.
      * Cols are vice versa.
      */
-    protected native void
+    native void
         filterHV(int dstPixels[], int dstcols, int dstrows, int dcolinc, int drowinc,
                  int srcPixels[], int srccols, int srcrows, int scolinc, int srowinc,
                  float weights[]);
--- a/modules/graphics/src/main/java/com/sun/scenario/effect/impl/sw/sse/SSELinearConvolveShadowPeer.java	Tue Dec 09 22:11:34 2014 -0800
+++ b/modules/graphics/src/main/java/com/sun/scenario/effect/impl/sw/sse/SSELinearConvolveShadowPeer.java	Fri Dec 12 11:23:44 2014 -0800
@@ -53,7 +53,7 @@
                      float dxcol, float dycol, float dxrow, float dyrow);
 
     @Override
-    protected void
+    void
         filterVector(int dstPixels[], int dstw, int dsth, int dstscan,
                      int srcPixels[], int srcw, int srch, int srcscan,
                      float weights[], int count,
@@ -85,7 +85,7 @@
                  float weights[], float shadowColor[]);
 
     @Override
-    protected void
+    void
         filterHV(int dstPixels[], int dstcols, int dstrows, int dcolinc, int drowinc,
                  int srcPixels[], int srccols, int srcrows, int scolinc, int srowinc,
                  float weights[])
--- a/modules/media/src/main/native/gstreamer/plugins/audioconverter/audioconverter.c	Tue Dec 09 22:11:34 2014 -0800
+++ b/modules/media/src/main/native/gstreamer/plugins/audioconverter/audioconverter.c	Fri Dec 12 11:23:44 2014 -0800
@@ -644,11 +644,8 @@
     // If between FLUSH_START and FLUSH_STOP, reject new buffers.
     if (decode->is_flushing)
     {
-        // Unref the input buffer.
-        // INLINE - gst_buffer_unref()
-        gst_buffer_unref(buf);
-
-        return GST_FLOW_WRONG_STATE;
+        ret = GST_FLOW_WRONG_STATE;
+        goto _exit;
     }
 
     // Reset state on discont buffer if not after FLUSH_STOP.
@@ -746,13 +743,10 @@
                                     decode->isFormatInitialized = TRUE;
                                     decode->isAudioConverterReady = TRUE;
                                 } else {
-                                    // Unref the input buffer.
-                                    // INLINE - gst_buffer_unref()
-                                    gst_buffer_unref(buf);
-
                                     gst_caps_unref(sink_peer_caps);
 
-                                    return GST_FLOW_ERROR;
+                                    ret = GST_FLOW_ERROR;
+                                    goto _exit;
                                 }
                             } else {
                                 gint layer;
@@ -786,14 +780,11 @@
                                             packetListener,
                                             audioStreamTypeHint,
                                             &decode->audioStreamID)) {
-                // Unref the input buffer.
-                // INLINE - gst_buffer_unref()
-                gst_buffer_unref(buf);
-
 #if ENABLE_PRINT_SPEW
                 g_print("AudioFileStreamOpen failed\n");
 #endif
-                return GST_FLOW_ERROR;
+                ret = GST_FLOW_ERROR;
+                goto _exit;
             }
         }
     }
@@ -814,15 +805,12 @@
 
         OSStatus result = AudioFileStreamParseBytes(decode->audioStreamID, buf_size, buf_data, parserFlags);
 
-        // Unref the input buffer.
-        // INLINE - gst_buffer_unref()
-        gst_buffer_unref(buf);
-
         if(noErr != result) {
 #if ENABLE_PRINT_SPEW
             g_print("AudioFileStreamParseBytes %d\n", result);
 #endif
-            return GST_FLOW_ERROR;
+            ret = GST_FLOW_ERROR;
+            goto _exit;
         }
     } else {
         if(!decode->is_synced && NULL != decode->audioConverter) {
@@ -836,10 +824,6 @@
 
         packetListener((void*)decode, buf_size, 1, (const void*)buf_data,
                        &packetDescriptions);
-
-        // Unref the input buffer.
-        // INLINE - gst_buffer_unref()
-        gst_buffer_unref(buf);
     }
 
     // Return without pushing a buffer if format not derived from stream parser.
@@ -849,7 +833,7 @@
 
     // Return without pushing a buffer if format is MPEG audio but no packets are enqueued.
     if(AUDIOCONVERTER_DATA_FORMAT_MPA == decode->data_format && 0 == decode->total_packets) {
-        return GST_FLOW_OK;
+        goto _exit; // GST_FLOW_OK
     }
 
     if(decode->is_synced == FALSE) {
@@ -870,15 +854,12 @@
             // Allocate memory for output packet descriptions.
             decode->outPacketDescription = g_malloc(decode->samples_per_frame*sizeof(AudioStreamPacketDescription));
             if(NULL == decode->outPacketDescription) {
-                return GST_FLOW_ERROR;
+                ret = GST_FLOW_ERROR;
+                goto _exit;
             }
 
             // Save first frame offset.
-            if (GST_BUFFER_OFFSET_IS_VALID(buf)) {
-                decode->initial_offset = GST_BUFFER_OFFSET(buf);
-            } else {
-                decode->initial_offset = 0;
-            }
+            decode->initial_offset = GST_BUFFER_OFFSET_IS_VALID(buf) ? GST_BUFFER_OFFSET(buf) : 0;
 
             // Query for the stream length if it was not set from a header.
             if (AUDIOCONVERTER_STREAM_LENGTH_UNKNOWN == decode->stream_length)
@@ -933,7 +914,8 @@
                                             "mpegversion", G_TYPE_INT, 2,
                                              NULL);
             } else {
-                return GST_FLOW_ERROR;
+                ret = GST_FLOW_ERROR;
+                goto _exit;
             }
 
             if(gst_pad_set_caps (decode->sinkpad, caps) == FALSE)
@@ -983,7 +965,7 @@
 
     if(!decode->isAudioConverterReady) {
         // Return without pushing a buffer if converter is not ready.
-        return GST_FLOW_OK;
+        goto _exit; // GST_FLOW_OK
     } else if(NULL == decode->audioConverter) {
         // Initialize the converter.
         if(noErr != AudioConverterNew(&decode->audioInputFormat,
@@ -993,7 +975,8 @@
             g_print("Failed to initialize AudioConverter\n");
 #endif
             // Return an error if converter cannot be initialized.
-            return GST_FLOW_ERROR;
+            ret = GST_FLOW_ERROR;
+            goto _exit;
         } else if(NULL != decode->cookieData && noErr != AudioConverterSetProperty(decode->audioConverter,
                                                                             kAudioConverterDecompressionMagicCookie,
                                                                             decode->cookieSize, decode->cookieData)) {
@@ -1001,7 +984,8 @@
             g_print("Failed to set AudioConverter magic cookie data\n");
 #endif
             // Return an error if converter cannot be initialized.
-            return GST_FLOW_ERROR;
+            ret = GST_FLOW_ERROR;
+            goto _exit;
         } else if(AUDIOCONVERTER_DATA_FORMAT_AAC == decode->data_format) {
             AudioConverterPrimeInfo primeInfo;
             primeInfo.leadingFrames = 0;
@@ -1023,7 +1007,7 @@
     if(decode->is_priming) {
         // Return without pushing a buffer if there are not enough packets enqueued.
         if(g_queue_get_length(decode->packetDesc) < AUDIOCONVERTER_MPEG_MIN_PACKETS) {
-            return GST_FLOW_OK;
+            goto _exit; // GST_FLOW_OK;
         } else {
             decode->is_priming = FALSE;
         }
@@ -1047,7 +1031,7 @@
                 gst_element_message_full(GST_ELEMENT(decode), GST_MESSAGE_ERROR, GST_CORE_ERROR, GST_CORE_ERROR_SEEK, g_strdup("Decoded audio buffer allocation failed"), NULL, ("audioconverter.c"), ("audioconverter_chain"), 0);
             }
 
-            return ret;
+            goto _exit;
         }
 
         AudioBufferList outputData;
@@ -1067,7 +1051,8 @@
 #endif
             // INLINE - gst_buffer_unref()
             gst_buffer_unref(outbuf);
-            return GST_FLOW_ERROR;
+            ret = GST_FLOW_ERROR;
+            goto _exit;
         }
 
         if(0 == outputDataPacketSize) {
@@ -1095,7 +1080,7 @@
 
         ret = gst_pad_push (decode->srcpad, outbuf);
         if(GST_FLOW_OK != ret) {
-            return ret;
+            goto _exit;
         }
     }
 
@@ -1108,7 +1093,11 @@
         decode->inputOffset = 0;
     }
 
-    return GST_FLOW_OK;
+_exit:
+    // Unref the input buffer.
+    // INLINE - gst_buffer_unref()
+    gst_buffer_unref(buf);
+    return ret;
 }
 
 #if ENABLE_PRINT_SPEW
--- a/modules/media/src/main/native/jfxmedia/jni/JavaInputStreamCallbacks.cpp	Tue Dec 09 22:11:34 2014 -0800
+++ b/modules/media/src/main/native/jfxmedia/jni/JavaInputStreamCallbacks.cpp	Fri Dec 12 11:23:44 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2014, 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
--- a/modules/media/src/main/native/jfxmedia/jni/JavaInputStreamCallbacks.h	Tue Dec 09 22:11:34 2014 -0800
+++ b/modules/media/src/main/native/jfxmedia/jni/JavaInputStreamCallbacks.h	Fri Dec 12 11:23:44 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2014, 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
--- a/modules/web/src/main/native/Source/WebCore/platform/java/BridgeUtils.cpp	Tue Dec 09 22:11:34 2014 -0800
+++ b/modules/web/src/main/native/Source/WebCore/platform/java/BridgeUtils.cpp	Fri Dec 12 11:23:44 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
  */
 #include "config.h"
 
--- a/modules/web/src/main/native/Source/WebCore/platform/java/WebPage.cpp	Tue Dec 09 22:11:34 2014 -0800
+++ b/modules/web/src/main/native/Source/WebCore/platform/java/WebPage.cpp	Fri Dec 12 11:23:44 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
  */
 #include "config.h"
 #include "WebPage.h"