Broadcom Nexus API support for ANGLE WebGL

Source/JavaScriptCore/API/glib/JSCContextPrivate.h

@@ -33,7 +33,7 @@ typedef const struct OpaqueJSValue* JSValueRef;
 typedef struct OpaqueJSValue* JSObjectRef;
 
 JS_EXPORT_PRIVATE GRefPtr<JSCContext> jscContextGetOrCreate(JSGlobalContextRef);
-JS_EXPORT_PRIVATE JSGlobalContextRef jscContextGetJSContext(JSCContext*);
+G_BEGIN_DECLS JSC_API JS_EXPORT_PRIVATE JSGlobalContextRef jscContextGetJSContext(JSCContext*); G_END_DECLS
 JS_EXPORT_PRIVATE GRefPtr<JSCValue> jscContextGetOrCreateValue(JSCContext*, JSValueRef);
 void jscContextValueDestroyed(JSCContext*, JSValueRef);
 JSC::JSObject* jscContextGetJSWrapper(JSCContext*, gpointer);

Source/JavaScriptCore/PlatformWPE.cmake

@@ -14,6 +14,10 @@ list(APPEND JavaScriptCore_PRIVATE_DEFINITIONS
     PKGLIBDIR="${CMAKE_INSTALL_FULL_LIBDIR}/wpe-webkit-${WPE_API_VERSION}"
 )
 
+install(FILES ${JavaScriptCore_PUBLIC_FRAMEWORK_HEADERS}
+    DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/wpe-webkit-${WPE_API_VERSION}/JavaScriptCore"
+)
+
 install(FILES ${JavaScriptCore_INSTALLED_HEADERS}
     DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/wpe-webkit-${WPE_API_VERSION}/jsc"
     COMPONENT "Development"

Source/JavaScriptCore/inspector/remote/glib/RemoteInspectorServer.cpp

@@ -241,7 +241,7 @@ GVariant* RemoteInspectorServer::setupInspectorClient(SocketConnection& clientCo
     m_clientConnection = &clientConnection;
 
     GVariant* backendCommands;
-    if (strcmp(clientBackendCommandsHash, backendCommandsHash().data())) {
+    if (!backendCommandsHash().isNull() && strcmp(clientBackendCommandsHash, backendCommandsHash().data())) {
         auto bytes = Inspector::backendCommands();
         backendCommands = g_variant_new_bytestring(static_cast<const char*>(g_bytes_get_data(bytes.get(), nullptr)));
     } else

Source/JavaScriptCore/inspector/remote/glib/RemoteInspectorUtils.cpp

@@ -40,25 +40,18 @@ namespace Inspector {
 GRefPtr<GBytes> backendCommands()
 {
 #if PLATFORM(WPE)
-    static std::once_flag flag;
-    std::call_once(flag, [] {
-        const char* libDir = PKGLIBDIR;
-#if ENABLE(DEVELOPER_MODE)
-        // Probably no need for a specific env var here. Assume the inspector resources.so file is
-        // in the same directory as the injected bundle lib, for developer builds.
-        const char* path = g_getenv("WEBKIT_INJECTED_BUNDLE_PATH");
-        if (path && g_file_test(path, G_FILE_TEST_IS_DIR))
-            libDir = path;
-#endif
-        GUniquePtr<char> bundleFilename(g_build_filename(libDir, "libWPEWebInspectorResources.so", nullptr));
-        GModule* resourcesModule = g_module_open(bundleFilename.get(), G_MODULE_BIND_LAZY);
+    static bool moduleLoaded = false;
+
+    if (!moduleLoaded) {
+        GModule* resourcesModule = g_module_open(PKGLIBDIR G_DIR_SEPARATOR_S "libWPEWebInspectorResources.so", G_MODULE_BIND_LAZY);
         if (!resourcesModule) {
             WTFLogAlways("Error loading libWPEWebInspectorResources.so: %s", g_module_error());
-            return;
+            return nullptr;
         }
 
         g_module_make_resident(resourcesModule);
-    });
+        moduleLoaded = true;
+    }
 #endif
     GRefPtr<GBytes> bytes = adoptGRef(g_resources_lookup_data(INSPECTOR_BACKEND_COMMANDS_PATH, G_RESOURCE_LOOKUP_FLAGS_NONE, nullptr));
     ASSERT(bytes);
@@ -70,6 +63,9 @@ const CString& backendCommandsHash()
     static CString hexDigest;
     if (hexDigest.isNull()) {
         auto bytes = backendCommands();
+        if (!bytes)
+            return hexDigest;
+
         size_t dataSize;
         gconstpointer data = g_bytes_get_data(bytes.get(), &dataSize);
         ASSERT(dataSize);

Source/JavaScriptCore/runtime/ConsoleObject.cpp

@@ -28,6 +28,7 @@
 
 #include "ConsoleClient.h"
 #include "JSCInlines.h"
+#include "Options.h"
 #include "ScriptArguments.h"
 #include "ScriptCallStackFactory.h"
 
@@ -133,6 +134,9 @@ static EncodedJSValue consoleLogWithLevel(JSGlobalObject* globalObject, CallFram
     if (!client)
         return JSValue::encode(jsUndefined());
 
+    if (Options::disableConsoleLog())
+        return JSValue::encode(jsUndefined());
+
     client->logWithLevel(globalObject, Inspector::createScriptArguments(globalObject, callFrame, 0), level);
     return JSValue::encode(jsUndefined());
 }

Source/JavaScriptCore/runtime/OptionsList.h

@@ -594,7 +594,7 @@ bool hasCapacityToUseLargeGigacage();
     v(Bool, usePromiseTryMethod, false, Normal, "Expose the Promise.try() method.") \
     v(Bool, useRegExpEscape, false, Normal, "Expose RegExp.escape feature.") \
     v(Bool, useResizableArrayBuffer, true, Normal, "Expose ResizableArrayBuffer feature.") \
-    v(Bool, useSharedArrayBuffer, false, Normal, nullptr) \
+    v(Bool, useSharedArrayBuffer, true, Normal, nullptr) \
     v(Bool, useShadowRealm, false, Normal, "Expose the ShadowRealm object.") \
     v(Bool, useStringWellFormed, true, Normal, "Expose the String well-formed methods.") \
     v(Bool, useTemporal, false, Normal, "Expose the Temporal object.") \
@@ -605,7 +605,7 @@ bool hasCapacityToUseLargeGigacage();
     v(Bool, useWebAssemblyRelaxedSIMD, false, Normal, "Allow the relaxed simd instructions and types from the wasm relaxed simd spec.") \
     v(Bool, useWebAssemblyTailCalls, false, Normal, "Allow the new instructions from the wasm tail calls spec.") \
     v(Bool, useWebAssemblyExtendedConstantExpressions, true, Normal, "Allow the use of global, element, and data init expressions from the extended constant expressions proposal.") \
-
+    v(Bool, disableConsoleLog, false, Normal, "Disable printing of JS console logs.") \
 
 
 enum OptionEquivalence {

Source/ThirdParty/ANGLE/src/common/utilities.cpp

@@ -1305,6 +1305,7 @@ bool IsExternalImageTarget(EGLenum target)
         case EGL_LINUX_DMA_BUF_EXT:
         case EGL_METAL_TEXTURE_ANGLE:
         case EGL_VULKAN_IMAGE_ANGLE:
+        case EGL_NATIVE_PIXMAP_KHR:
             return true;
 
         default:

Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/DisplayEGL.cpp

@@ -842,8 +842,7 @@ void DisplayEGL::generateExtensions(egl::DisplayExtensions *outExtensions) const
 
     outExtensions->image     = mEGL->hasExtension("EGL_KHR_image");
     outExtensions->imageBase = mEGL->hasExtension("EGL_KHR_image_base");
-    // Pixmaps are not supported in ANGLE's EGL implementation.
-    // outExtensions->imagePixmap = mEGL->hasExtension("EGL_KHR_image_pixmap");
+    outExtensions->imagePixmap           = mEGL->hasExtension("EGL_KHR_image_pixmap");
     outExtensions->glTexture2DImage      = mEGL->hasExtension("EGL_KHR_gl_texture_2D_image");
     outExtensions->glTextureCubemapImage = mEGL->hasExtension("EGL_KHR_gl_texture_cubemap_image");
     outExtensions->glTexture3DImage      = mEGL->hasExtension("EGL_KHR_gl_texture_3D_image");
@@ -1023,6 +1022,9 @@ ExternalImageSiblingImpl *DisplayEGL::createExternalImageSibling(const gl::Conte
             ASSERT(buffer == nullptr);
             return new DmaBufImageSiblingEGL(attribs);
 
+        case EGL_NATIVE_PIXMAP_KHR:
+            return new PixmapImageSiblingEGL(buffer, attribs);
+
         default:
             return DisplayGL::createExternalImageSibling(context, target, buffer, attribs);
     }

Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/DmaBufImageSiblingEGL.cpp

@@ -122,4 +122,66 @@ void DmaBufImageSiblingEGL::getImageCreationAttributes(std::vector<EGLint> *outA
     }
 }
 
+PixmapImageSiblingEGL::PixmapImageSiblingEGL(EGLClientBuffer buffer, const egl::AttributeMap &attribs)
+    : mBuffer(buffer), mAttribs(attribs), mFormat(GL_NONE)
+{
+    ASSERT(mAttribs.contains(EGL_WIDTH));
+    mSize.width = mAttribs.getAsInt(EGL_WIDTH);
+    ASSERT(mAttribs.contains(EGL_HEIGHT));
+    mSize.height         = mAttribs.getAsInt(EGL_HEIGHT);
+
+    mFormat = gl::Format(GL_RGBA8);
+}
+
+PixmapImageSiblingEGL::~PixmapImageSiblingEGL() {}
+
+egl::Error PixmapImageSiblingEGL::initialize(const egl::Display *display)
+{
+    return egl::NoError();
+}
+
+gl::Format PixmapImageSiblingEGL::getFormat() const
+{
+    return mFormat;
+}
+
+bool PixmapImageSiblingEGL::isRenderable(const gl::Context *context) const
+{
+    return true;
+}
+
+bool PixmapImageSiblingEGL::isTexturable(const gl::Context *context) const
+{
+    return true;
+}
+
+bool PixmapImageSiblingEGL::isYUV() const
+{
+    return false;
+}
+
+bool PixmapImageSiblingEGL::hasProtectedContent() const
+{
+    return false;
+}
+
+gl::Extents PixmapImageSiblingEGL::getSize() const
+{
+    return mSize;
+}
+
+size_t PixmapImageSiblingEGL::getSamples() const
+{
+    return 0;
+}
+
+EGLClientBuffer PixmapImageSiblingEGL::getBuffer() const
+{
+    return mBuffer;
+}
+
+void PixmapImageSiblingEGL::getImageCreationAttributes(std::vector<EGLint> *outAttributes) const
+{
+}
+
 }  // namespace rx

Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/DmaBufImageSiblingEGL.h

@@ -44,6 +44,34 @@ class DmaBufImageSiblingEGL : public ExternalImageSiblingEGL
     bool mHasProtectedContent;
 };
 
+class PixmapImageSiblingEGL : public ExternalImageSiblingEGL
+{
+  public:
+    PixmapImageSiblingEGL(EGLClientBuffer buffer, const egl::AttributeMap &attribs);
+    ~PixmapImageSiblingEGL() override;
+
+    egl::Error initialize(const egl::Display *display) override;
+
+    // ExternalImageSiblingImpl interface
+    gl::Format getFormat() const override;
+    bool isRenderable(const gl::Context *context) const override;
+    bool isTexturable(const gl::Context *context) const override;
+    bool isYUV() const override;
+    bool hasProtectedContent() const override;
+    gl::Extents getSize() const override;
+    size_t getSamples() const override;
+
+    // ExternalImageSiblingEGL interface
+    EGLClientBuffer getBuffer() const override;
+    void getImageCreationAttributes(std::vector<EGLint> *outAttributes) const override;
+
+  private:
+    EGLClientBuffer mBuffer;
+    egl::AttributeMap mAttribs;
+    gl::Extents mSize;
+    gl::Format mFormat;
+};
+
 }  // namespace rx
 
 #endif  // LIBANGLE_RENDERER_GL_EGL_DMABUFIMAGESIBLINGEGL_H_

Source/ThirdParty/ANGLE/src/libANGLE/validationEGL.cpp

@@ -3525,7 +3525,7 @@ bool ValidateCreateImage(const ValidationContext *val,
 
             case EGL_WIDTH:
             case EGL_HEIGHT:
-                if (target != EGL_LINUX_DMA_BUF_EXT)
+                if (target != EGL_LINUX_DMA_BUF_EXT && target != EGL_NATIVE_PIXMAP_KHR)
                 {
                     val->setError(
                         EGL_BAD_PARAMETER,
@@ -4080,6 +4080,25 @@ bool ValidateCreateImage(const ValidationContext *val,
                 display->validateImageClientBuffer(context, target, buffer, attributes),
                 val->entryPoint, val->labeledObject, false);
             break;
+        case EGL_NATIVE_PIXMAP_KHR:
+            if (!displayExtensions.imagePixmap)
+            {
+                val->setError(EGL_BAD_PARAMETER, "EGL_KHR_image_pixmap not supported.");
+                return false;
+            }
+
+            if (context != nullptr)
+            {
+                val->setError(EGL_BAD_PARAMETER, "ctx must be EGL_NO_CONTEXT.");
+                return false;
+            }
+
+            if (buffer == nullptr)
+            {
+                val->setError(EGL_BAD_PARAMETER, "buffer must not be NULL.");
+                return false;
+            }
+            break;
         default:
             val->setError(EGL_BAD_PARAMETER, "invalid target: 0x%X", target);
             return false;

Source/WTF/Scripts/Preferences/UnifiedWebPreferences.yaml

@@ -268,6 +268,20 @@ AllowMediaContentTypesRequiringHardwareSupportAsFallback:
     WebCore:
       default: false
 
+AllowMoveToSuspendOnWindowClose:
+  type: bool
+  status: embedder
+  humanReadableName: "Allow move to suspend on window.close()"
+  humanReadableDescription: "Allow to suspend browser instead of closing window on window.close()"
+  condition: PLATFORM(WPE)
+  defaultValue:
+    WebKitLegacy:
+      default: false
+    WebKit:
+      default: false
+    WebCore:
+      default: false
+
 AllowMultiElementImplicitSubmission:
   type: bool
   status: embedder
@@ -291,6 +305,20 @@ AllowRunningOfInsecureContent:
     WebCore:
       default: false
 
+AllowScriptsToCloseWindows:
+  type: bool
+  status: embedder
+  humanReadableName: "Allow scripts to close windows"
+  humanReadableDescription: "Allow scripts to close windows"
+  condition: PLATFORM(WPE)
+  defaultValue:
+    WebKitLegacy:
+      default: false
+    WebKit:
+      default: false
+    WebCore:
+      default: false
+
 AllowSettingAnyXHRHeaderFromFileURLs:
   type: bool
   status: embedder