Title: [291699] trunk/Source
- Revision
- 291699
- Author
- hironori.fu...@sony.com
- Date
- 2022-03-22 14:09:24 -0700 (Tue, 22 Mar 2022)
Log Message
[WinCairo] RemoteGraphicsContextGL.h(78): error C2027: use of undefined type 'WebCore::GraphicsContextGL'
https://bugs.webkit.org/show_bug.cgi?id=238223
Unreviewed build fix.
r291610 renamed GraphicsContextGLTextureMapper to GraphicsContextGLTextureMapperANGLE.
Source/WebCore:
* platform/graphics/texmap/TextureMapperGCGLPlatformLayer.cpp:
(WebCore::TextureMapperGCGLPlatformLayer::TextureMapperGCGLPlatformLayer):
* platform/graphics/texmap/TextureMapperGCGLPlatformLayer.h:
Source/WebKit:
* GPUProcess/graphics/RemoteGraphicsContextGL.h:
* GPUProcess/graphics/RemoteGraphicsContextGLWin.cpp:
(WebKit::RemoteGraphicsContextGLWin::platformWorkQueueInitialize):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (291698 => 291699)
--- trunk/Source/WebCore/ChangeLog 2022-03-22 20:45:29 UTC (rev 291698)
+++ trunk/Source/WebCore/ChangeLog 2022-03-22 21:09:24 UTC (rev 291699)
@@ -1,3 +1,15 @@
+2022-03-22 Fujii Hironori <hironori.fu...@sony.com>
+
+ [WinCairo] RemoteGraphicsContextGL.h(78): error C2027: use of undefined type 'WebCore::GraphicsContextGL'
+ https://bugs.webkit.org/show_bug.cgi?id=238223
+
+ Unreviewed build fix.
+ r291610 renamed GraphicsContextGLTextureMapper to GraphicsContextGLTextureMapperANGLE.
+
+ * platform/graphics/texmap/TextureMapperGCGLPlatformLayer.cpp:
+ (WebCore::TextureMapperGCGLPlatformLayer::TextureMapperGCGLPlatformLayer):
+ * platform/graphics/texmap/TextureMapperGCGLPlatformLayer.h:
+
2022-03-22 Said Abou-Hallawa <s...@apple.com>
[GPU Process] Make GraphicsContextState a class
Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGCGLPlatformLayer.cpp (291698 => 291699)
--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGCGLPlatformLayer.cpp 2022-03-22 20:45:29 UTC (rev 291698)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGCGLPlatformLayer.cpp 2022-03-22 21:09:24 UTC (rev 291699)
@@ -32,7 +32,7 @@
namespace WebCore {
-TextureMapperGCGLPlatformLayer::TextureMapperGCGLPlatformLayer(GraphicsContextGLANGLE& context)
+TextureMapperGCGLPlatformLayer::TextureMapperGCGLPlatformLayer(GraphicsContextGLTextureMapperANGLE& context)
: m_context(context)
{
}
Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGCGLPlatformLayer.h (291698 => 291699)
--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGCGLPlatformLayer.h 2022-03-22 20:45:29 UTC (rev 291698)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGCGLPlatformLayer.h 2022-03-22 21:09:24 UTC (rev 291699)
@@ -21,7 +21,7 @@
#if ENABLE(WEBGL) && USE(TEXTURE_MAPPER) && !USE(NICOSIA)
-#include "GraphicsContextGLANGLE.h"
+#include "GraphicsContextGLTextureMapperANGLE.h"
#include "PlatformLayer.h"
#include "TextureMapperPlatformLayer.h"
#include "TextureMapperPlatformLayerProxyProvider.h"
@@ -33,13 +33,13 @@
class TextureMapperGCGLPlatformLayer : public PlatformLayer {
WTF_MAKE_FAST_ALLOCATED;
public:
- TextureMapperGCGLPlatformLayer(GraphicsContextGLANGLE&);
+ TextureMapperGCGLPlatformLayer(GraphicsContextGLTextureMapperANGLE&);
virtual ~TextureMapperGCGLPlatformLayer();
virtual void paintToTextureMapper(TextureMapper&, const FloatRect& target, const TransformationMatrix&, float opacity);
private:
- GraphicsContextGLANGLE& m_context;
+ GraphicsContextGLTextureMapperANGLE& m_context;
};
} // namespace WebCore
Modified: trunk/Source/WebKit/ChangeLog (291698 => 291699)
--- trunk/Source/WebKit/ChangeLog 2022-03-22 20:45:29 UTC (rev 291698)
+++ trunk/Source/WebKit/ChangeLog 2022-03-22 21:09:24 UTC (rev 291699)
@@ -1,3 +1,15 @@
+2022-03-22 Fujii Hironori <hironori.fu...@sony.com>
+
+ [WinCairo] RemoteGraphicsContextGL.h(78): error C2027: use of undefined type 'WebCore::GraphicsContextGL'
+ https://bugs.webkit.org/show_bug.cgi?id=238223
+
+ Unreviewed build fix.
+ r291610 renamed GraphicsContextGLTextureMapper to GraphicsContextGLTextureMapperANGLE.
+
+ * GPUProcess/graphics/RemoteGraphicsContextGL.h:
+ * GPUProcess/graphics/RemoteGraphicsContextGLWin.cpp:
+ (WebKit::RemoteGraphicsContextGLWin::platformWorkQueueInitialize):
+
2022-03-22 Said Abou-Hallawa <s...@apple.com>
[GPU Process] Make GraphicsContextState a class
Modified: trunk/Source/WebKit/GPUProcess/graphics/RemoteGraphicsContextGL.h (291698 => 291699)
--- trunk/Source/WebKit/GPUProcess/graphics/RemoteGraphicsContextGL.h 2022-03-22 20:45:29 UTC (rev 291698)
+++ trunk/Source/WebKit/GPUProcess/graphics/RemoteGraphicsContextGL.h 2022-03-22 21:09:24 UTC (rev 291699)
@@ -42,7 +42,7 @@
#if PLATFORM(COCOA)
#include <WebCore/GraphicsContextGLCocoa.h>
#else
-#include <WebCore/GraphicsContextGLTextureMapper.h>
+#include <WebCore/GraphicsContextGLTextureMapperANGLE.h>
#endif
#if PLATFORM(MAC)
@@ -141,7 +141,7 @@
#if PLATFORM(COCOA)
using GCGLContext = WebCore::GraphicsContextGLCocoa;
#else
- using GCGLContext = WebCore::GraphicsContextGLTextureMapper;
+ using GCGLContext = WebCore::GraphicsContextGLTextureMapperANGLE;
#endif
RefPtr<GCGLContext> m_context WTF_GUARDED_BY_CAPABILITY(workQueue());
GraphicsContextGLIdentifier m_graphicsContextGLIdentifier;
Modified: trunk/Source/WebKit/GPUProcess/graphics/RemoteGraphicsContextGLWin.cpp (291698 => 291699)
--- trunk/Source/WebKit/GPUProcess/graphics/RemoteGraphicsContextGLWin.cpp 2022-03-22 20:45:29 UTC (rev 291698)
+++ trunk/Source/WebKit/GPUProcess/graphics/RemoteGraphicsContextGLWin.cpp 2022-03-22 21:09:24 UTC (rev 291699)
@@ -30,7 +30,6 @@
#if ENABLE(GPU_PROCESS) && ENABLE(WEBGL) && PLATFORM(WIN)
#include "GPUConnectionToWebProcess.h"
#include "WCContentBufferManager.h"
-#include <WebCore/GraphicsContextGLTextureMapper.h>
namespace WebKit {
@@ -58,7 +57,7 @@
void RemoteGraphicsContextGLWin::platformWorkQueueInitialize(WebCore::GraphicsContextGLAttributes&& attributes)
{
- m_context = WebCore::GraphicsContextGLTextureMapper::create(WTFMove(attributes));
+ m_context = WebCore::GraphicsContextGLTextureMapperANGLE::create(WTFMove(attributes));
}
void RemoteGraphicsContextGLWin::prepareForDisplay(CompletionHandler<void(std::optional<WCContentBufferIdentifier>)>&& completionHandler)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
