WebGL sends nonstandard webglcontextchanged event

https://bugs.webkit.org/show_bug.cgi?id=260018 rdar://113677584 Reviewed by Dan Glastonbury. Remove the code to send the webglcontextchanged event. The event was not in the specification. It was only dispatched for OpenGL based dual-GPU machines, e.g. on specific machines on Big Sur. Remove the code to test the delivering webglcontextchanged. Note: preserve the code for changing WebGL contexts to current GPU. So for example, if user plugs external monitor to such a computer, the WebGL contexts will still migrate to dGPU. This is just not observable through webglcontextchanged. Naturally, the intention is that this is not observable in any way other than performance difference. * LayoutTests/fast/canvas/webgl/context-update-on-display-configuration-expected.txt: Removed. * LayoutTests/fast/canvas/webgl/context-update-on-display-configuration.html: Removed. * LayoutTests/fast/canvas/webgl/webglcontextchangedevent-expected.txt: Removed. * LayoutTests/fast/canvas/webgl/webglcontextchangedevent.html: Removed. * Source/WebCore/dom/EventNames.h: * Source/WebCore/html/HTMLCanvasElement.cpp: (WebCore::HTMLCanvasElement::virtualHasPendingActivity const): (WebCore::HTMLCanvasElement::eventListenersDidChange): * Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp: (WebCore::WebGLRenderingContextBase::dispatchContextChangedNotification): Deleted. * Source/WebCore/html/canvas/WebGLRenderingContextBase.h: * Source/WebCore/platform/graphics/GraphicsContextGL.cpp: (WebCore::GraphicsContextGL::dispatchContextChangedNotification): Deleted. * Source/WebCore/platform/graphics/GraphicsContextGL.h: * Source/WebCore/platform/graphics/GraphicsContextGLEnums.h: * Source/WebCore/platform/graphics/angle/GraphicsContextGLANGLE.cpp: (WebCore::GraphicsContextGLANGLE::simulateEventForTesting): * Source/WebCore/platform/graphics/cocoa/GraphicsContextGLCocoa.mm: (WebCore::GraphicsContextGLCocoa::updateContextOnDisplayReconfiguration): * Source/WebCore/testing/Internals.cpp: (WebCore::Internals::simulateEventForWebGLContext): * Source/WebCore/testing/Internals.h: * Source/WebCore/testing/Internals.idl: * Source/WebKit/GPUProcess/graphics/RemoteGraphicsContextGL.cpp: (WebKit::RemoteGraphicsContextGL::simulateEventForTesting): (WebKit::RemoteGraphicsContextGL::dispatchContextChangedNotification): Deleted. * Source/WebKit/GPUProcess/graphics/RemoteGraphicsContextGL.h: * Source/WebKit/Headers.cmake: * Source/WebKit/Modules/OSX_Private.modulemap: * Source/WebKit/Modules/iOS_Private.modulemap: * Source/WebKit/Shared/WebCoreArgumentCoders.h: * Source/WebKit/Sources.txt: * Source/WebKit/UIProcess/API/C/WKMockDisplay.cpp: Removed. * Source/WebKit/UIProcess/API/C/WKMockDisplay.h: Removed. * Source/WebKit/UIProcess/WebProcessPool.cpp: (WebKit::WebProcessPool::sendDisplayConfigurationChangedMessageForTesting): Deleted. * Source/WebKit/UIProcess/WebProcessPool.h: * Source/WebKit/WebKit.xcodeproj/project.pbxproj: * Source/WebKit/WebProcess/GPU/graphics/RemoteGraphicsContextGLProxy.cpp: (WebKit::RemoteGraphicsContextGLProxy::handleMessageToRemovedDestination): (WebKit::RemoteGraphicsContextGLProxy::wasChanged): Deleted. * Source/WebKit/WebProcess/GPU/graphics/RemoteGraphicsContextGLProxy.h: * Source/WebKit/WebProcess/GPU/graphics/RemoteGraphicsContextGLProxy.messages.in: * Tools/TestWebKitAPI/Tests/WebCore/cocoa/TestGraphicsContextGLCocoa.mm: * Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl: * Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp: (WTR::TestRunner::sendDisplayConfigurationChangedMessageForTesting): Deleted. * Tools/WebKitTestRunner/InjectedBundle/TestRunner.h: * Tools/WebKitTestRunner/TestController.cpp: (WTR::TestController::sendDisplayConfigurationChangedMessageForTesting): Deleted. * Tools/WebKitTestRunner/TestController.h: * Tools/WebKitTestRunner/TestInvocation.cpp: (WTR::TestInvocation::didReceiveSynchronousMessageFromInjectedBundle): Canonical link: https://commits.webkit.org/266861@main
WebKit · Aug 14, 2023 · 5e5018b · 5e5018b
1 parent fb99b56
commit 5e5018b
Show file tree

Hide file tree

Showing 42 changed files with 3 additions and 315 deletions.
diff --git a/LayoutTests/TestExpectations b/LayoutTests/TestExpectations
@@ -1244,9 +1244,6 @@ fast/forms/file/entries-api/pages-jpeg-open-panel.html [ Skip ]
 fast/forms/file/entries-api/pdf-jpeg-open-panel.html [ Skip ]
 fast/forms/file/entries-api/png-raw-open-panel.html [ Skip ]
 
-# This test is currently only relevant on mac-wk2
-fast/canvas/webgl/context-update-on-display-configuration.html [ Skip ]
-
 fast/misc/valid-primary-screen-displayID.html [ Skip ]
 
 fast/events/detect-caps-lock.html [ Skip ]

diff --git a/LayoutTests/fast/canvas/webgl/context-update-on-display-configuration-expected.txt b/LayoutTests/fast/canvas/webgl/context-update-on-display-configuration-expected.txt
diff --git a/LayoutTests/fast/canvas/webgl/context-update-on-display-configuration.html b/LayoutTests/fast/canvas/webgl/context-update-on-display-configuration.html
diff --git a/LayoutTests/fast/canvas/webgl/webglcontextchangedevent-expected.txt b/LayoutTests/fast/canvas/webgl/webglcontextchangedevent-expected.txt
diff --git a/LayoutTests/fast/canvas/webgl/webglcontextchangedevent.html b/LayoutTests/fast/canvas/webgl/webglcontextchangedevent.html
diff --git a/LayoutTests/platform/ios/TestExpectations b/LayoutTests/platform/ios/TestExpectations
@@ -2646,7 +2646,6 @@ webkit.org/b/171617 perf/object-keys.html [ Pass Failure ]
 fast/canvas/webgl/webgl-compressed-texture-size-limit.html [ Failure ]
 fast/canvas/webgl/webgl2-texture-upload-enums.html [ Failure ]
 fast/canvas/webgl/read-pixels-test.html [ Skip ]
-fast/canvas/webgl/webglcontextchangedevent.html [ Skip ]
 
 fast/canvas/webgl/texImage2D-mse-flipY-false.html [ Skip ]
 fast/canvas/webgl/texImage2D-mse-flipY-true.html [ Skip ]

diff --git a/LayoutTests/platform/mac-wk2/TestExpectations b/LayoutTests/platform/mac-wk2/TestExpectations
@@ -108,8 +108,6 @@ webkit.org/b/187183 http/tests/security/pasteboard-file-url.html [ Pass ]
 
 webkit.org/b/231328 http/tests/preload/onload_event.html [ Pass Failure ]
 
-fast/canvas/webgl/context-update-on-display-configuration.html [ Pass ]
-
 fast/misc/valid-primary-screen-displayID.html [ Pass ]
 
 ipc/webpageproxy-correctionpanel-no-crash.html [ Pass ]

diff --git a/LayoutTests/platform/wincairo/TestExpectations b/LayoutTests/platform/wincairo/TestExpectations
@@ -1955,7 +1955,6 @@ fast/canvas/webgl/webgl-compressed-texture-astc.html [ Failure ]
 fast/canvas/webgl/webgl-compressed-texture-size-limit.html [ Failure ]
 fast/canvas/webgl/webgl-depth-texture.html [ Failure ]
 fast/canvas/webgl/webgl2-texture-upload-enums.html [ Failure ]
-fast/canvas/webgl/webglcontextchangedevent.html [ Skip ] # Timeout
 fast/css-grid-layout/grid-align-baseline-vertical.html [ Failure ]
 fast/css/font-face-multiple-faces.html [ Failure Pass ]
 fast/css/font-face-synthetic-bold-italic.html [ Failure ]

diff --git a/Source/WebCore/dom/EventNames.h b/Source/WebCore/dom/EventNames.h
@@ -314,7 +314,6 @@ namespace WebCore {
     macro(volumechange) \
     macro(waiting) \
     macro(waitingforkey) \
-    macro(webglcontextchanged) \
     macro(webglcontextcreationerror) \
     macro(webglcontextlost) \
     macro(webglcontextrestored) \

diff --git a/Source/WebCore/html/HTMLCanvasElement.cpp b/Source/WebCore/html/HTMLCanvasElement.cpp
@@ -965,7 +965,7 @@ bool HTMLCanvasElement::virtualHasPendingActivity() const
 {
 #if ENABLE(WEBGL)
     if (is<WebGLRenderingContextBase>(m_context)) {
-        // WebGL rendering context may fire contextlost / contextchange / contextrestored events at any point.
+        // WebGL rendering context may fire contextlost / contextrestored events at any point.
         return m_hasRelevantWebGLEventListener && !downcast<WebGLRenderingContextBase>(*m_context).isContextUnrecoverablyLost();
     }
 #endif
@@ -977,8 +977,7 @@ void HTMLCanvasElement::eventListenersDidChange()
 {
 #if ENABLE(WEBGL)
     auto& eventNames = WebCore::eventNames();
-    m_hasRelevantWebGLEventListener = hasEventListeners(eventNames.webglcontextchangedEvent)
-        || hasEventListeners(eventNames.webglcontextlostEvent)
+    m_hasRelevantWebGLEventListener = hasEventListeners(eventNames.webglcontextlostEvent)
         || hasEventListeners(eventNames.webglcontextrestoredEvent);
 #endif
 }

diff --git a/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp b/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp
@@ -6072,15 +6072,6 @@ void WebGLRenderingContextBase::recycleContext()
     destroyGraphicsContextGL();
 }
 
-void WebGLRenderingContextBase::dispatchContextChangedNotification()
-{
-    auto* canvas = htmlCanvas();
-    if (!canvas)
-        return;
-
-    queueTaskToDispatchEvent(*canvas, TaskSource::WebGL, WebGLContextEvent::create(eventNames().webglcontextchangedEvent, Event::CanBubble::No, Event::IsCancelable::Yes, emptyString()));
-}
-
 void WebGLRenderingContextBase::addMembersToOpaqueRoots(JSC::AbstractSlotVisitor& visitor)
 {
     Locker locker { objectGraphLock() };

diff --git a/Source/WebCore/html/canvas/WebGLRenderingContextBase.h b/Source/WebCore/html/canvas/WebGLRenderingContextBase.h
@@ -475,7 +475,6 @@ class WebGLRenderingContextBase : public GraphicsContextGL::Client, public GPUBa
 
     // GraphicsContextGL::Client
     void forceContextLost() override;
-    void dispatchContextChangedNotification() override;
 
     void recycleContext();
 

diff --git a/Source/WebCore/platform/graphics/GraphicsContextGL.cpp b/Source/WebCore/platform/graphics/GraphicsContextGL.cpp
@@ -645,12 +645,6 @@ void GraphicsContextGL::forceContextLost()
         m_client->forceContextLost();
 }
 
-void GraphicsContextGL::dispatchContextChangedNotification()
-{
-    if (m_client)
-        m_client->dispatchContextChangedNotification();
-}
-
 #if ENABLE(VIDEO)
 RefPtr<Image> GraphicsContextGL::videoFrameToImage(VideoFrame& frame)
 {

diff --git a/Source/WebCore/platform/graphics/GraphicsContextGL.h b/Source/WebCore/platform/graphics/GraphicsContextGL.h
@@ -1185,7 +1185,6 @@ class GraphicsContextGL : public RefCounted<GraphicsContextGL> {
         WEBCORE_EXPORT Client();
         WEBCORE_EXPORT virtual ~Client();
         virtual void forceContextLost() = 0;
-        virtual void dispatchContextChangedNotification() = 0;
     };
 
     WEBCORE_EXPORT GraphicsContextGL(GraphicsContextGLAttributes);
@@ -1711,7 +1710,6 @@ class GraphicsContextGL : public RefCounted<GraphicsContextGL> {
     bool isContextLost() const { return m_contextLost; }
 protected:
     WEBCORE_EXPORT virtual void forceContextLost();
-    WEBCORE_EXPORT void dispatchContextChangedNotification();
 
     int m_currentWidth { 0 };
     int m_currentHeight { 0 };

diff --git a/Source/WebCore/platform/graphics/GraphicsContextGLEnums.h b/Source/WebCore/platform/graphics/GraphicsContextGLEnums.h
@@ -30,7 +30,6 @@
 namespace WebCore {
 
 enum class GraphicsContextGLSimulatedEventForTesting {
-    ContextChange,
     GPUStatusFailure,
     Timeout,
     DisplayBufferAllocationFailure

diff --git a/Source/WebCore/platform/graphics/angle/GraphicsContextGLANGLE.cpp b/Source/WebCore/platform/graphics/angle/GraphicsContextGLANGLE.cpp
@@ -3183,10 +3183,6 @@ void GraphicsContextGLANGLE::polygonOffsetClampEXT(GCGLfloat factor, GCGLfloat u
 
 void GraphicsContextGLANGLE::simulateEventForTesting(SimulatedEventForTesting event)
 {
-    if (event == SimulatedEventForTesting::ContextChange) {
-        dispatchContextChangedNotification();
-        return;
-    }
     if (event == SimulatedEventForTesting::GPUStatusFailure || event == SimulatedEventForTesting::DisplayBufferAllocationFailure) {
         m_failNextStatusCheck = true;
         return;

diff --git a/Source/WebCore/platform/graphics/cocoa/GraphicsContextGLCocoa.mm b/Source/WebCore/platform/graphics/cocoa/GraphicsContextGLCocoa.mm
@@ -552,7 +552,6 @@ static bool needsEAGLOnMac()
 {
     if (m_switchesGPUOnDisplayReconfiguration)
         EGL_HandleGPUSwitchANGLE(m_displayObj);
-    dispatchContextChangedNotification();
 }
 #endif
 

diff --git a/Source/WebCore/testing/Internals.cpp b/Source/WebCore/testing/Internals.cpp
@@ -5692,9 +5692,6 @@ void Internals::simulateEventForWebGLContext(SimulatedWebGLContextEvent event, W
 {
     WebGLRenderingContext::SimulatedEventForTesting contextEvent;
     switch (event) {
-    case SimulatedWebGLContextEvent::ContextChange:
-        contextEvent = WebGLRenderingContext::SimulatedEventForTesting::ContextChange;
-        break;
     case SimulatedWebGLContextEvent::GPUStatusFailure:
         contextEvent = WebGLRenderingContext::SimulatedEventForTesting::GPUStatusFailure;
         break;

diff --git a/Source/WebCore/testing/Internals.h b/Source/WebCore/testing/Internals.h
@@ -902,7 +902,6 @@ class Internals final : public RefCounted<Internals>, private ContextDestruction
 
 #if ENABLE(WEBGL)
     enum class SimulatedWebGLContextEvent {
-        ContextChange,
         GPUStatusFailure,
         Timeout
     };

diff --git a/Source/WebCore/testing/Internals.idl b/Source/WebCore/testing/Internals.idl
@@ -101,7 +101,6 @@ enum TreeType {
 };
 
 [Conditional=WEBGL] enum SimulatedWebGLContextEvent {
-    "ContextChange",
     "GPUStatusFailure",
     "Timeout"
 };

diff --git a/Source/WebKit/GPUProcess/graphics/RemoteGraphicsContextGL.cpp b/Source/WebKit/GPUProcess/graphics/RemoteGraphicsContextGL.cpp
@@ -166,12 +166,6 @@ void RemoteGraphicsContextGL::forceContextLost()
     send(Messages::RemoteGraphicsContextGLProxy::WasLost());
 }
 
-void RemoteGraphicsContextGL::dispatchContextChangedNotification()
-{
-    assertIsCurrent(workQueue());
-    send(Messages::RemoteGraphicsContextGLProxy::WasChanged());
-}
-
 void RemoteGraphicsContextGL::createAndBindEGLImage(GCGLenum target, WebCore::GraphicsContextGL::EGLImageSource source, CompletionHandler<void(uint64_t handle, WebCore::IntSize size)>&& completionHandler)
 {
     assertIsCurrent(workQueue());
@@ -302,15 +296,6 @@ void RemoteGraphicsContextGL::simulateEventForTesting(WebCore::GraphicsContextGL
         });
         return;
     }
-    if (event == WebCore::GraphicsContextGL::SimulatedEventForTesting::ContextChange) {
-#if PLATFORM(MAC)
-        callOnMainRunLoop([weakConnection = m_gpuConnectionToWebProcess]() {
-            if (auto connection = weakConnection.get())
-                connection->dispatchDisplayWasReconfiguredForTesting();
-        });
-#endif
-        return;
-    }
     m_context->simulateEventForTesting(event);
 }
 

diff --git a/Source/WebKit/GPUProcess/graphics/RemoteGraphicsContextGL.h b/Source/WebKit/GPUProcess/graphics/RemoteGraphicsContextGL.h
@@ -105,7 +105,6 @@ class RemoteGraphicsContextGL : private WebCore::GraphicsContextGL::Client, publ
 
     // GraphicsContextGL::Client overrides.
     void forceContextLost() final;
-    void dispatchContextChangedNotification() final;
 
     // Messages to be received.
     void ensureExtensionEnabled(String&&);

diff --git a/Source/WebKit/Headers.cmake b/Source/WebKit/Headers.cmake
@@ -64,7 +64,6 @@ set(WebKit_PUBLIC_FRAMEWORK_HEADERS
     UIProcess/API/C/WKLayoutMode.h
     UIProcess/API/C/WKMediaKeySystemPermissionCallback.h
     UIProcess/API/C/WKMessageListener.h
-    UIProcess/API/C/WKMockDisplay.h
     UIProcess/API/C/WKMockMediaDevice.h
     UIProcess/API/C/WKNativeEvent.h
     UIProcess/API/C/WKNavigationActionRef.h

diff --git a/Source/WebKit/Modules/OSX_Private.modulemap b/Source/WebKit/Modules/OSX_Private.modulemap
@@ -714,11 +714,6 @@ framework module WebKit_Private [system] {
     export *
   }
 
-  explicit module WKMockDisplay {
-    header "WKMockDisplay.h"
-    export *
-  }
-
   explicit module WKMockMediaDevice {
     header "WKMockMediaDevice.h"
     export *

diff --git a/Source/WebKit/Modules/iOS_Private.modulemap b/Source/WebKit/Modules/iOS_Private.modulemap
@@ -1414,11 +1414,6 @@ framework module WebKit_Private [system] {
     export *
   }
 
-  explicit module WKMockDisplay {
-    header "WKMockDisplay.h"
-    export *
-  }
-
   explicit module WKMockMediaDevice {
     header "WKMockMediaDevice.h"
     export *

diff --git a/Source/WebKit/Shared/WebCoreArgumentCoders.h b/Source/WebKit/Shared/WebCoreArgumentCoders.h
@@ -591,7 +591,6 @@ template <> struct EnumTraits<WebCore::CDMInstance::HDCPStatus> {
 template <> struct EnumTraits<WebCore::GraphicsContextGLSimulatedEventForTesting> {
     using values = EnumValues<
     WebCore::GraphicsContextGLSimulatedEventForTesting,
-    WebCore::GraphicsContextGLSimulatedEventForTesting::ContextChange,
     WebCore::GraphicsContextGLSimulatedEventForTesting::GPUStatusFailure,
     WebCore::GraphicsContextGLSimulatedEventForTesting::Timeout
     >;

diff --git a/Source/WebKit/Sources.txt b/Source/WebKit/Sources.txt
@@ -511,7 +511,6 @@ UIProcess/API/C/WKInspector.cpp
 UIProcess/API/C/WKKeyValueStorageManager.cpp
 UIProcess/API/C/WKMediaKeySystemPermissionCallback.cpp
 UIProcess/API/C/WKMessageListener.cpp
-UIProcess/API/C/WKMockDisplay.cpp
 UIProcess/API/C/WKMockMediaDevice.cpp
 UIProcess/API/C/WKNavigationActionRef.cpp
 UIProcess/API/C/WKNavigationDataRef.cpp