# HG changeset patch
# User almatvee
# Date 1566267570 25200
#      Mon Aug 19 19:19:30 2019 -0700
# Node ID 4d99c78ec7556a2fd24bdc099776e7a30fe2ae4d
# Parent  43b70da0a7c9f632a390aa3e7ad2488e4576b66d
8227473: Improve gstreamer media support
Reviewed-by: kcr, rhalade

diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-bad/gst/aiff/aiffparse.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-bad/gst/aiff/aiffparse.c
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-bad/gst/aiff/aiffparse.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-bad/gst/aiff/aiffparse.c
@@ -643,7 +643,11 @@
   return FALSE;
 }
 
+#ifdef GSTREAMER_LITE
+static gboolean
+#else
 static void
+#endif
 gst_aiff_parse_ignore_chunk (GstAiffParse * aiff, guint32 tag, guint32 size)
 {
 #ifdef GSTREAMER_LITE
@@ -654,7 +658,11 @@
 
   if (aiff->streaming) {
     if (!gst_aiff_parse_peek_chunk (aiff, &tag, &size))
+#ifdef GSTREAMER_LITE
+      return FALSE;
+#else
       return;
+#endif
   }
   GST_WARNING_OBJECT (aiff, "Ignoring tag %" GST_FOURCC_FORMAT,
       GST_FOURCC_ARGS (tag));
@@ -667,6 +675,10 @@
   if (aiff->streaming) {
     gst_adapter_flush (aiff->adapter, flush);
   }
+
+#ifdef GSTREAMER_LITE
+  return TRUE;
+#endif
 }
 
 static double
@@ -1124,11 +1136,23 @@
       }
       case GST_MAKE_FOURCC ('C', 'H', 'A', 'N'):{
         GST_FIXME_OBJECT (aiff, "Handle CHAN chunk with channel layouts");
+#ifdef GSTREAMER_LITE
+        if (!gst_aiff_parse_ignore_chunk (aiff, tag, size)) {
+          return GST_FLOW_OK;
+        }
+#else
         gst_aiff_parse_ignore_chunk (aiff, tag, size);
+#endif
         break;
       }
       default:
+#ifdef GSTREAMER_LITE
+        if (!gst_aiff_parse_ignore_chunk (aiff, tag, size)) {
+          return GST_FLOW_OK;
+        }
+#else
         gst_aiff_parse_ignore_chunk (aiff, tag, size);
+#endif
     }
 
     buf = NULL;
# HG changeset patch
# User kcr
# Date 1571249584 0
#      Wed Oct 16 18:13:04 2019 +0000
# Node ID c2897e8e32f36671f8c98900df20b119699a1208
# Parent  4d99c78ec7556a2fd24bdc099776e7a30fe2ae4d
8232121: Better numbering system
Reviewed-by: rhalade, ghb

diff --git a/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/numbers.c b/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/numbers.c
--- a/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/numbers.c
+++ b/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/numbers.c
@@ -382,6 +382,9 @@
         tokens->tokens[tokens->nTokens].token = val - 1;
         ix += len;
         val = xmlStringCurrentChar(NULL, format+ix, &len);
+        } else {
+            tokens->tokens[tokens->nTokens].token = (xmlChar)'0';
+            tokens->tokens[tokens->nTokens].width = 1;
         }
     } else if ( (val == (xmlChar)'A') ||
             (val == (xmlChar)'a') ||
# HG changeset patch
# User kcr
# Date 1571249736 0
#      Wed Oct 16 18:15:36 2019 +0000
# Node ID 2f2cd52730b9d775d2086b28a88e80babf573c82
# Parent  c2897e8e32f36671f8c98900df20b119699a1208
8232128: Better formatting for numbers
Reviewed-by: rhalade, ghb

diff --git a/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/numbers.c b/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/numbers.c
--- a/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/numbers.c
+++ b/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/numbers.c
@@ -1277,13 +1277,14 @@
     number = floor((scale * number + 0.5)) / scale;
     if ((self->grouping != NULL) &&
         (self->grouping[0] != 0)) {
+        int gchar;
 
     len = xmlStrlen(self->grouping);
-    pchar = xsltGetUTF8Char(self->grouping, &len);
+    gchar = xsltGetUTF8Char(self->grouping, &len);
     xsltNumberFormatDecimal(buffer, floor(number), self->zeroDigit[0],
                 format_info.integer_digits,
                 format_info.group,
-                pchar, len);
+                gchar, len);
     } else
     xsltNumberFormatDecimal(buffer, floor(number), self->zeroDigit[0],
                 format_info.integer_digits,
# HG changeset patch
# User kcr
# Date 1571249852 0
#      Wed Oct 16 18:17:32 2019 +0000
# Node ID 0fad64a49a529924f2cddfd66acc033a2b05551b
# Parent  2f2cd52730b9d775d2086b28a88e80babf573c82
8232214: Improved internal validations
Reviewed-by: ghb, rhalade

diff --git a/modules/javafx.web/src/main/native/Source/ThirdParty/sqlite/sqlite3.c b/modules/javafx.web/src/main/native/Source/ThirdParty/sqlite/sqlite3.c
--- a/modules/javafx.web/src/main/native/Source/ThirdParty/sqlite/sqlite3.c
+++ b/modules/javafx.web/src/main/native/Source/ThirdParty/sqlite/sqlite3.c
@@ -105489,7 +105489,9 @@
       if( sqlite3_strglob("unordered*", z)==0 ){
         pIndex->bUnordered = 1;
       }else if( sqlite3_strglob("sz=[0-9]*", z)==0 ){
-        pIndex->szIdxRow = sqlite3LogEst(sqlite3Atoi(z+3));
+        int sz = sqlite3Atoi(z+3);
+        if( sz<2 ) sz = 2;
+        pIndex->szIdxRow = sqlite3LogEst(sz);
       }else if( sqlite3_strglob("noskipscan*", z)==0 ){
         pIndex->noSkipScan = 1;
       }
@@ -142704,6 +142706,7 @@
     ** it to pNew->rRun, which is currently set to the cost of the index
     ** seek only. Then, if this is a non-covering index, add the cost of
     ** visiting the rows in the main table.  */
+    assert( pSrc->pTab->szTabRow>0 );
     rCostIdx = pNew->nOut + 1 + (15*pProbe->szIdxRow)/pSrc->pTab->szTabRow;
     pNew->rRun = sqlite3LogEstAdd(rLogSize, rCostIdx);
     if( (pNew->wsFlags & (WHERE_IDX_ONLY|WHERE_IPK))==0 ){