Title: [281620] trunk/Source/WebKit
- Revision
- 281620
- Author
- [email protected]
- Date
- 2021-08-26 05:30:46 -0700 (Thu, 26 Aug 2021)
Log Message
RemoteGraphicsContextGL refers to GraphicsContextGLOpenGL::SimulatedEventForTesting
https://bugs.webkit.org/show_bug.cgi?id=229405
Patch by Kimmo Kinnunen <[email protected]> on 2021-08-26
Reviewed by Kenneth Russell.
Instead, refer via the defining base class, i.e. use
GraphicsContextGL::SimulatedEventForTesting.
Fixes problems if we try to move ANGLE implementation out of
GraphicsContextGLOpenGL.
No new tests, refactor.
* GPUProcess/graphics/RemoteGraphicsContextGL.cpp:
(WebKit::RemoteGraphicsContextGL::simulateEventForTesting):
* GPUProcess/graphics/RemoteGraphicsContextGL.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (281619 => 281620)
--- trunk/Source/WebKit/ChangeLog 2021-08-26 12:28:33 UTC (rev 281619)
+++ trunk/Source/WebKit/ChangeLog 2021-08-26 12:30:46 UTC (rev 281620)
@@ -1,3 +1,21 @@
+2021-08-26 Kimmo Kinnunen <[email protected]>
+
+ RemoteGraphicsContextGL refers to GraphicsContextGLOpenGL::SimulatedEventForTesting
+ https://bugs.webkit.org/show_bug.cgi?id=229405
+
+ Reviewed by Kenneth Russell.
+
+ Instead, refer via the defining base class, i.e. use
+ GraphicsContextGL::SimulatedEventForTesting.
+ Fixes problems if we try to move ANGLE implementation out of
+ GraphicsContextGLOpenGL.
+
+ No new tests, refactor.
+
+ * GPUProcess/graphics/RemoteGraphicsContextGL.cpp:
+ (WebKit::RemoteGraphicsContextGL::simulateEventForTesting):
+ * GPUProcess/graphics/RemoteGraphicsContextGL.h:
+
2021-08-26 Fujii Hironori <[email protected]>
[curl] REGRESSION(r281158): fetch('http://localhost/') from about:blank doesn't emit the console error message
Modified: trunk/Source/WebKit/GPUProcess/graphics/RemoteGraphicsContextGL.cpp (281619 => 281620)
--- trunk/Source/WebKit/GPUProcess/graphics/RemoteGraphicsContextGL.cpp 2021-08-26 12:28:33 UTC (rev 281619)
+++ trunk/Source/WebKit/GPUProcess/graphics/RemoteGraphicsContextGL.cpp 2021-08-26 12:30:46 UTC (rev 281620)
@@ -283,11 +283,11 @@
#endif
}
-void RemoteGraphicsContextGL::simulateEventForTesting(WebCore::GraphicsContextGLOpenGL::SimulatedEventForTesting event)
+void RemoteGraphicsContextGL::simulateEventForTesting(WebCore::GraphicsContextGL::SimulatedEventForTesting event)
{
assertIsCurrent(m_streamThread);
// FIXME: only run this in testing mode. https://bugs.webkit.org/show_bug.cgi?id=222544
- if (event == WebCore::GraphicsContextGLOpenGL::SimulatedEventForTesting::Timeout) {
+ if (event == WebCore::GraphicsContextGL::SimulatedEventForTesting::Timeout) {
// Simulate the timeout by just discarding the context. The subsequent messages act like
// unauthorized or old messages from Web process, they are skipped.
callOnMainRunLoop([gpuConnectionToWebProcess = m_gpuConnectionToWebProcess, identifier = m_graphicsContextGLIdentifier]() {
@@ -296,7 +296,7 @@
});
return;
}
- if (event == WebCore::GraphicsContextGLOpenGL::SimulatedEventForTesting::ContextChange) {
+ if (event == WebCore::GraphicsContextGL::SimulatedEventForTesting::ContextChange) {
#if PLATFORM(MAC)
callOnMainRunLoop([weakConnection = m_gpuConnectionToWebProcess]() {
if (auto connection = weakConnection.get())
Modified: trunk/Source/WebKit/GPUProcess/graphics/RemoteGraphicsContextGL.h (281619 => 281620)
--- trunk/Source/WebKit/GPUProcess/graphics/RemoteGraphicsContextGL.h 2021-08-26 12:28:33 UTC (rev 281619)
+++ trunk/Source/WebKit/GPUProcess/graphics/RemoteGraphicsContextGL.h 2021-08-26 12:30:46 UTC (rev 281620)
@@ -101,7 +101,7 @@
void paintRenderingResultsToCanvas(WebCore::RenderingResourceIdentifier, CompletionHandler<void()>&&);
void paintCompositedResultsToCanvas(WebCore::RenderingResourceIdentifier, CompletionHandler<void()>&&);
void copyTextureFromMedia(WebCore::MediaPlayerIdentifier, uint32_t texture, uint32_t target, int32_t level, uint32_t internalFormat, uint32_t format, uint32_t type, bool premultiplyAlpha, bool flipY, CompletionHandler<void(bool)>&&);
- void simulateEventForTesting(WebCore::GraphicsContextGLOpenGL::SimulatedEventForTesting);
+ void simulateEventForTesting(WebCore::GraphicsContextGL::SimulatedEventForTesting);
#include "RemoteGraphicsContextGLFunctionsGenerated.h" // NOLINT
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
