Merge

Author: kevinrushforth

modules/javafx.graphics/src/main/native-font/pango.c

@@ -50,6 +50,12 @@ JNI_OnLoad_javafx_font_pango(JavaVM * vm, void * reserved) {
 
 #define OS_NATIVE(func) Java_com_sun_javafx_font_freetype_OSPango_##func
 
+#define SAFE_FREE(PTR)  \
+    if ((PTR) != NULL) {  \
+        free(PTR);     \
+        (PTR) = NULL;     \
+    }
+
 extern jboolean checkAndClearException(JNIEnv *env);
 
 #ifndef STATIC_BUILD // can't have this twice in a static build
@@ -159,15 +165,28 @@ JNIEXPORT jobject JNICALL OS_NATIVE(pango_1shape)
     jobject result = NULL;
     pango_shape(text, item->length, &analysis, glyphString);
     int count = glyphString->num_glyphs;
-    if(count == 0) goto fail;
+    jint *glyphs = NULL;
+    jint *widths = NULL;
+    jint *cluster = NULL;
+    if (count <= 0) goto fail;
+    if ((size_t)count >= INT_MAX / sizeof(jint)) {
+        fprintf(stderr, "OS_NATIVE error: large glyph count value in pango_1shape\n");
+        goto fail;
+    }
 
     jintArray glyphsArray = (*env)->NewIntArray(env, count);
     jintArray widthsArray = (*env)->NewIntArray(env, count);
     jintArray clusterArray = (*env)->NewIntArray(env, count);
     if (glyphsArray && widthsArray && clusterArray) {
-        jint glyphs[count];
-        jint widths[count];
-        jint cluster[count];
+        glyphs = (jint*) malloc(count * sizeof(jint));
+        widths = (jint*) malloc(count * sizeof(jint));
+        cluster = (jint*) malloc(count * sizeof(jint));
+        if (glyphs == NULL ||
+            widths == NULL ||
+            cluster == NULL) {
+            fprintf(stderr, "OS_NATIVE error: Unable to allocate memory in pango_1shape\n");
+            goto fail;
+        }
         int i;
         for (i = 0; i < count; i++) {
             glyphs[i] = glyphString->glyphs[i].glyph;
@@ -206,6 +225,9 @@ JNIEXPORT jobject JNICALL OS_NATIVE(pango_1shape)
 
 fail:
     pango_glyph_string_free(glyphString);
+    SAFE_FREE(glyphs);
+    SAFE_FREE(widths);
+    SAFE_FREE(cluster);
     return result;
 }
 

modules/javafx.media/src/main/native/jfxmedia/jni/NativeAudioSpectrum.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2023, 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
@@ -55,6 +55,10 @@ Java_com_sun_media_jfxmediaimpl_NativeAudioSpectrum_nativeSetBands(JNIEnv *env,
 {
     CAudioSpectrum *pSpectrum = (CAudioSpectrum*)jlong_to_ptr(nativeRef);
     CJavaBandsHolder *pHolder = new (std::nothrow) CJavaBandsHolder();
+    if (pHolder == NULL) {
+        return;
+    }
+
     if (!pHolder->Init(env, bands, magnitudes, phases)) {
         delete pHolder;
         pHolder = NULL;

modules/javafx.media/src/main/native/jfxmedia/jni/NativeVideoBuffer.cpp

@@ -206,7 +206,14 @@ JNIEXPORT jintArray JNICALL Java_com_sun_media_jfxmediaimpl_NativeVideoBuffer_na
         }
 
         jintArray strides = env->NewIntArray(count);
-        jint *strideArray = new jint[count];
+        if (strides == NULL) {
+            return NULL;
+        }
+
+        jint *strideArray = new (std::nothrow) jint[count];
+        if (strideArray == NULL) {
+            return NULL;
+        }
 
         for (int ii=0; ii < count; ii++) {
             strideArray[ii] = frame->GetStrideForPlane(ii);

modules/javafx.web/src/main/native/Source/WTF/wtf/Platform.h

@@ -158,6 +158,6 @@
 #endif
 
 /* FIXME: This is used to "turn on a specific feature of WebKit", so should be converted to an ENABLE macro. */
-#if (PLATFORM(COCOA) || PLATFORM(GTK) || PLATFORM(WPE)) && ENABLE(ACCESSIBILITY)
+#if (PLATFORM(COCOA) || PLATFORM(GTK) || PLATFORM(JAVA) || PLATFORM(WPE)) && ENABLE(ACCESSIBILITY)
 #define USE_ACCESSIBILITY_CONTEXT_MENUS 1
 #endif

modules/javafx.web/src/main/native/Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp

@@ -127,7 +127,7 @@ String MediaControlsHost::layoutTraitsClassName() const
     return "IOSLayoutTraits"_s;
 #elif PLATFORM(WATCHOS)
     return "WatchOSLayoutTraits"_s;
-#elif PLATFORM(GTK) || PLATFORM(WPE) || PLATFORM(WIN_CAIRO)
+#elif PLATFORM(GTK) || PLATFORM(WPE) || PLATFORM(WIN_CAIRO) || PLATFORM(JAVA)
     return "AdwaitaLayoutTraits"_s;
 #else
     ASSERT_NOT_REACHED();

modules/javafx.web/src/main/native/Source/WebCore/Modules/modern-media-controls/images/adwaita/invalid-placard@1x.png

@@ -57,6 +57,7 @@ platform/java/PluginInfoStoreJava.cpp
 platform/java/PluginViewJava.cpp
 platform/java/PluginWidgetJava.cpp
 platform/java/RenderThemeJava.cpp
+platform/java/ModernMediaControlResource.cpp
 platform/java/ScrollbarThemeJava.cpp
 platform/java/SharedBufferJava.cpp
 platform/java/MainThreadSharedTimerJava.cpp

modules/javafx.web/src/main/native/Source/WebCore/Modules/modern-media-controls/images/adwaita/invalid-placard@2x.png

@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2023, 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.
+ */
+
+#pragma once
+
+#include <map>
+#include <string>
+#include <wtf/text/WTFString.h>
+#include <wtf/HashMap.h>
+
+class MediaControlResource {
+public:
+    virtual String getValue(const String &key) = 0;
+    virtual ~MediaControlResource() { }
+};
+
+class ModernMediaControlResource : public MediaControlResource {
+private:
+    HashMap<String, String> imageMap;
+public:
+    ModernMediaControlResource();
+    String getValue(const String &resource_key) override;
+};
+
+// Factory for creating MediaControlResource objects
+class MediaControlResourceFactory {
+public:
+    static std::unique_ptr<MediaControlResource> createResource() {
+        return std::make_unique<ModernMediaControlResource>();
+    }
+};

modules/javafx.web/src/main/native/Source/WebCore/SourcesJava.txt

@@ -67,7 +67,7 @@ RenderTheme& RenderTheme::singleton()
     return sm_defaultInstance;
 }
 
-RenderThemeJava::RenderThemeJava()
+RenderThemeJava::RenderThemeJava() : mediaResource(MediaControlResourceFactory::createResource())
 {
 }
 
@@ -494,8 +494,7 @@ Vector<String, 2> RenderThemeJava::mediaControlsScripts()
 
 String RenderThemeJava::extraMediaControlsStyleSheet()
 {
-
-    return String(ModernMediaControlsUserAgentStyleSheet, sizeof(ModernMediaControlsUserAgentStyleSheet));
+    return emptyString();
 
 }
 
@@ -553,7 +552,15 @@ bool RenderThemeJava::paintMediaControl(jint type, const RenderObject&, const Pa
     return true;
 }
 
+String RenderThemeJava::mediaControlsStyleSheet()
+{
+    return String(ModernMediaControlsUserAgentStyleSheet, sizeof(ModernMediaControlsUserAgentStyleSheet));
+}
 
+String RenderThemeJava::mediaControlsBase64StringForIconNameAndType(const String& iconName, const String& iconType)
+{
+    return mediaResource->getValue(iconName);
+}
 #undef JNI_EXPAND_MEDIA
 
 #endif  // ENABLE(VIDEO)

modules/javafx.web/src/main/native/Source/WebCore/platform/java/ModernMediaControlResource.cpp

@@ -26,6 +26,7 @@
 #pragma once
 
 #include "RenderTheme.h"
+#include "ModernMediaControlResource.h"
 #include "GraphicsContext.h"
 #include "StyleResolver.h"
 
@@ -107,7 +108,8 @@ class RenderThemeJava final : public RenderTheme {
 
     void adjustSliderTrackStyle(RenderStyle&, const Element*) const override;
     bool paintSliderTrack(const RenderObject&, const PaintInfo&, const IntRect&) override;
-
+    String mediaControlsBase64StringForIconNameAndType(const String&, const String&);
+    String mediaControlsStyleSheet();
 
 private:
     int createWidgetState(const RenderObject& o);
@@ -116,6 +118,7 @@ class RenderThemeJava final : public RenderTheme {
     bool paintWidget(int widgetIndex, const RenderObject& o,
                      const PaintInfo& i, const FloatRect& rect);
     Color getSelectionColor(int index) const;
+    std::unique_ptr<MediaControlResource> mediaResource;
 #if ENABLE(VIDEO)
     bool paintMediaControl(jint type, const RenderObject&, const PaintInfo&, const IntRect&);
 #endif

modules/javafx.web/src/main/native/Source/WebCore/platform/java/ModernMediaControlResource.h

@@ -110,6 +110,7 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PUBLIC_SUFFIX_LIST PRIVATE OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTL_JIT PUBLIC OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBASSEMBLY PRIVATE OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MODERN_MEDIA_CONTROLS PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_CONTROLS_CONTEXT_MENUS PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(USE_AVIF PRIVATE OFF)
 
 

modules/javafx.web/src/main/native/Source/WebCore/platform/java/RenderThemeJava.cpp

@@ -0,0 +1,74 @@
+#!/usr/bin/env python3
+
+'''
+/*
+ * Copyright (c) 2023, 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.
+ */
+'''
+'''
+Tool to generate base64 code
+'''
+import os
+import base64
+import sys
+
+class ImageProcessor:
+    def __init__(self, directory_path):
+        self.directory_path = directory_path
+
+    def read_images(self):
+        image_data = {}
+        for filename in os.listdir(self.directory_path):
+            if filename.lower().endswith(('.png', '.svg')):
+                with open(os.path.join(self.directory_path, filename), 'rb') as image_file:
+                    image_data[filename] = image_file.read()
+        return image_data
+
+    def generate_base64(self, image_data):
+        base64_images = {}
+        for filename, data in image_data.items():
+            base64_images[filename] = base64.b64encode(data).decode('utf-8')
+        return base64_images
+
+if __name__ == "__main__":
+    if len(sys.argv) != 2:
+        print("Usage: python script_name.py directory_path")
+        sys.exit(1)
+
+    image_directory = sys.argv[1]
+
+    if not os.path.isdir(image_directory):
+        print("Invalid directory path.")
+        sys.exit(1)
+
+    image_processor = ImageProcessor(image_directory)
+
+    images = image_processor.read_images()
+    base64_images = image_processor.generate_base64(images)
+    size_of_list = len(images)
+    print("imageMap = {")
+    for filename, base64_code in base64_images.items():
+        file_name_without_extension = os.path.splitext(filename)[0]
+        print("{"+file_name_without_extension +"_s, " +  base64_code + "_s},")
+    print("};")

modules/javafx.web/src/main/native/Source/WebCore/platform/java/RenderThemeJava.h

@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2023, 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.
+ */
+
+import javafx.application.Application;
+import javafx.scene.Scene;
+import javafx.scene.control.Label;
+import javafx.scene.layout.VBox;
+import javafx.scene.web.WebView;
+import javafx.stage.Stage;
+
+public class HTML5VideoControlTest extends Application {
+    @Override
+    public void start(Stage primaryStage) {
+        WebView webView = new WebView();
+        webView.getEngine().loadContent(
+            "<video width=\"320\" height=\"240\" controls>\n" +
+            "  <source src=\"https://download.oracle.com/otndocs/products/javafx/oow2010-2.mp4\">\n" +
+            "  Your browser does not support the video tag.\n" +
+            "</video>"
+        );
+
+        VBox root = new VBox();
+        root.setSpacing(20);
+
+        root.getChildren().addAll(createInstructionsBox(), webView);
+
+        Scene scene = new Scene(root, 800, 400);
+        primaryStage.setScene(scene);
+        primaryStage.setTitle("HTML5 Video Player with Instructions");
+        primaryStage.show();
+    }
+
+    private VBox createInstructionsBox() {
+        VBox instructionsBox = new VBox();
+        instructionsBox.setStyle("-fx-background-color: #f0f0f0;");
+        instructionsBox.setPrefWidth(400);
+
+        instructionsBox.getChildren().addAll(
+            new Label("Instructions:"),
+            new Label("1. Click 'Play' to start the video."),
+            new Label("2. The media controls should be visible once the video starts playing."),
+            new Label("3. Use the media controls to play/pause/seek the video.")
+        );
+
+        return instructionsBox;
+    }
+
+    public static void main(String[] args) {
+        launch(args);
+    }
+}