Title: [270385] trunk/Source/WebCore
- Revision
- 270385
- Author
- [email protected]
- Date
- 2020-12-02 20:06:02 -0800 (Wed, 02 Dec 2020)
Log Message
GraphicsContextGL: Remove unused platformTexture and platformGraphicsContextGL interface
https://bugs.webkit.org/show_bug.cgi?id=219461
Reviewed by Daniel Bates.
* platform/graphics/GraphicsContextGL.h:
* platform/graphics/opengl/GraphicsContextGLOpenGL.h:
* platform/graphics/opengl/GraphicsContextGLOpenGLES.cpp:
(WebCore::GraphicsContextGLOpenGL::platformGraphicsContextGL): Deleted.
(WebCore::GraphicsContextGLOpenGL::platformTexture const): Deleted.
* platform/graphics/texmap/GraphicsContextGLTextureMapper.cpp:
(WebCore::GraphicsContextGLOpenGL::platformGraphicsContextGL const): Deleted.
(WebCore::GraphicsContextGLOpenGL::platformTexture const): Deleted.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (270384 => 270385)
--- trunk/Source/WebCore/ChangeLog 2020-12-03 03:58:10 UTC (rev 270384)
+++ trunk/Source/WebCore/ChangeLog 2020-12-03 04:06:02 UTC (rev 270385)
@@ -1,3 +1,19 @@
+2020-12-02 Fujii Hironori <[email protected]>
+
+ GraphicsContextGL: Remove unused platformTexture and platformGraphicsContextGL interface
+ https://bugs.webkit.org/show_bug.cgi?id=219461
+
+ Reviewed by Daniel Bates.
+
+ * platform/graphics/GraphicsContextGL.h:
+ * platform/graphics/opengl/GraphicsContextGLOpenGL.h:
+ * platform/graphics/opengl/GraphicsContextGLOpenGLES.cpp:
+ (WebCore::GraphicsContextGLOpenGL::platformGraphicsContextGL): Deleted.
+ (WebCore::GraphicsContextGLOpenGL::platformTexture const): Deleted.
+ * platform/graphics/texmap/GraphicsContextGLTextureMapper.cpp:
+ (WebCore::GraphicsContextGLOpenGL::platformGraphicsContextGL const): Deleted.
+ (WebCore::GraphicsContextGLOpenGL::platformTexture const): Deleted.
+
2020-12-02 Chris Dumez <[email protected]>
iframe with `sandbox=allow-top-navigation-by-user-activation` can navigate top frame when the user interacts with an iframe from another origin
Modified: trunk/Source/WebCore/platform/graphics/GraphicsContextGL.h (270384 => 270385)
--- trunk/Source/WebCore/platform/graphics/GraphicsContextGL.h 2020-12-03 03:58:10 UTC (rev 270384)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContextGL.h 2020-12-03 04:06:02 UTC (rev 270385)
@@ -785,8 +785,6 @@
Yes
};
- virtual PlatformGraphicsContextGL platformGraphicsContextGL() const = 0;
- virtual PlatformGLObject platformTexture() const = 0;
virtual PlatformLayer* platformLayer() const = 0;
ALWAYS_INLINE static bool hasAlpha(DataFormat format)
Modified: trunk/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGL.h (270384 => 270385)
--- trunk/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGL.h 2020-12-03 03:58:10 UTC (rev 270384)
+++ trunk/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGL.h 2020-12-03 04:06:02 UTC (rev 270385)
@@ -94,8 +94,6 @@
#if PLATFORM(COCOA)
static Ref<GraphicsContextGLOpenGL> createShared(GraphicsContextGLOpenGL& sharedContext);
- PlatformGraphicsContextGL platformGraphicsContextGL() const final { return m_contextObj; }
- PlatformGLObject platformTexture() const final { return m_texture; }
CALayer* platformLayer() const final { return reinterpret_cast<CALayer*>(m_webGLLayer.get()); }
PlatformGraphicsContextGLDisplay platformDisplay() const { return m_displayObj; }
PlatformGraphicsContextGLConfig platformConfig() const { return m_configObj; }
@@ -103,8 +101,6 @@
static GCGLenum IOSurfaceTextureTargetQuery();
static GCGLint EGLIOSurfaceTextureTarget();
#else
- PlatformGraphicsContextGL platformGraphicsContextGL() const final;
- PlatformGLObject platformTexture() const final;
PlatformLayer* platformLayer() const final;
#endif
Modified: trunk/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLES.cpp (270384 => 270385)
--- trunk/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLES.cpp 2020-12-03 03:58:10 UTC (rev 270384)
+++ trunk/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLES.cpp 2020-12-03 04:06:02 UTC (rev 270385)
@@ -395,16 +395,6 @@
{
}
-PlatformGraphicsContextGL GraphicsContextGLOpenGL::platformGraphicsContextGL()
-{
- return m_private->platformContext();
-}
-
-PlatformGLObject GraphicsContextGLOpenGL::platformTexture() const
-{
- return m_texture;
-}
-
bool GraphicsContextGLOpenGL::isGLES2Compliant() const
{
#if USE(OPENGL_ES)
Modified: trunk/Source/WebCore/platform/graphics/texmap/GraphicsContextGLTextureMapper.cpp (270384 => 270385)
--- trunk/Source/WebCore/platform/graphics/texmap/GraphicsContextGLTextureMapper.cpp 2020-12-03 03:58:10 UTC (rev 270384)
+++ trunk/Source/WebCore/platform/graphics/texmap/GraphicsContextGLTextureMapper.cpp 2020-12-03 04:06:02 UTC (rev 270385)
@@ -437,20 +437,6 @@
{
}
-PlatformGraphicsContextGL GraphicsContextGLOpenGL::platformGraphicsContextGL() const
-{
-#if USE(NICOSIA)
- return m_nicosiaLayer->platformContext();
-#else
- return m_texmapLayer->platformContext();
-#endif
-}
-
-PlatformGLObject GraphicsContextGLOpenGL::platformTexture() const
-{
- return m_texture;
-}
-
bool GraphicsContextGLOpenGL::isGLES2Compliant() const
{
#if USE(OPENGL_ES)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
