Diff
Modified: trunk/Source/WebCore/ChangeLog (164467 => 164468)
--- trunk/Source/WebCore/ChangeLog 2014-02-21 04:55:44 UTC (rev 164467)
+++ trunk/Source/WebCore/ChangeLog 2014-02-21 04:59:09 UTC (rev 164468)
@@ -1,3 +1,20 @@
+2014-02-20 ChangSeok Oh <changseok...@collabora.com>
+
+ Remove unused chromium stuff in Extensions3D
+ https://bugs.webkit.org/show_bug.cgi?id=129086
+
+ Reviewed by Anders Carlsson.
+
+ Remove GL_CHROMIUM_copy_texture and GL_CHROMIUM_flipy interfaces since they are used nowhere.
+
+ No new tests since no functionality changed.
+
+ * platform/graphics/Extensions3D.h:
+ * platform/graphics/opengl/Extensions3DOpenGL.cpp:
+ * platform/graphics/opengl/Extensions3DOpenGL.h:
+ * platform/graphics/opengl/Extensions3DOpenGLES.cpp:
+ * platform/graphics/opengl/Extensions3DOpenGLES.h:
+
2014-02-20 Joseph Pecoraro <pecor...@apple.com>
[iOS] Assert / crash trying to draw empty checked input
Modified: trunk/Source/WebCore/platform/graphics/Extensions3D.h (164467 => 164468)
--- trunk/Source/WebCore/platform/graphics/Extensions3D.h 2014-02-21 04:55:44 UTC (rev 164467)
+++ trunk/Source/WebCore/platform/graphics/Extensions3D.h 2014-02-21 04:59:09 UTC (rev 164468)
@@ -71,8 +71,6 @@
// GL_IMG_texture_compression_pvrtc
// EXT_texture_filter_anisotropic
// GL_EXT_debug_marker
- // GL_CHROMIUM_copy_texture
- // GL_CHROMIUM_flipy
// GL_ARB_draw_buffers / GL_EXT_draw_buffers
// GL_ANGLE_instanced_arrays
@@ -155,13 +153,6 @@
TEXTURE_MAX_ANISOTROPY_EXT = 0x84FE,
MAX_TEXTURE_MAX_ANISOTROPY_EXT = 0x84FF,
- // GL_CHROMIUM_flipy
- UNPACK_FLIP_Y_CHROMIUM = 0x9240,
-
- // GL_CHROMIUM_copy_texture
- UNPACK_PREMULTIPLY_ALPHA_CHROMIUM = 0x9241,
- UNPACK_UNPREMULTIPLY_ALPHA_CHROMIUM = 0x9242,
-
// GL_ARB_draw_buffers / GL_EXT_draw_buffers
MAX_DRAW_BUFFERS_EXT = 0x8824,
DRAW_BUFFER0_EXT = 0x8825,
@@ -223,9 +214,6 @@
// GL_ANGLE_translated_shader_source
virtual String getTranslatedShaderSourceANGLE(Platform3DObject) = 0;
- // GL_CHROMIUM_copy_texture
- virtual void copyTextureCHROMIUM(GC3Denum, Platform3DObject, Platform3DObject, GC3Dint, GC3Denum) = 0;
-
// EXT Robustness - uses getGraphicsResetStatusARB
virtual void readnPixelsEXT(int x, int y, GC3Dsizei width, GC3Dsizei height, GC3Denum format, GC3Denum type, GC3Dsizei bufSize, void *data) = 0;
virtual void getnUniformfvEXT(GC3Duint program, int location, GC3Dsizei bufSize, float *params) = 0;
Modified: trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp (164467 => 164468)
--- trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp 2014-02-21 04:55:44 UTC (rev 164467)
+++ trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp 2014-02-21 04:59:09 UTC (rev 164468)
@@ -141,12 +141,6 @@
#endif
}
-void Extensions3DOpenGL::copyTextureCHROMIUM(GC3Denum, Platform3DObject, Platform3DObject, GC3Dint, GC3Denum)
-{
- // FIXME: implement this function and add GL_CHROMIUM_copy_texture in supports().
- return;
-}
-
void Extensions3DOpenGL::insertEventMarkerEXT(const String&)
{
// FIXME: implement this function and add GL_EXT_debug_marker in supports().
Modified: trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.h (164467 => 164468)
--- trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.h 2014-02-21 04:55:44 UTC (rev 164467)
+++ trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.h 2014-02-21 04:59:09 UTC (rev 164468)
@@ -47,7 +47,6 @@
virtual void deleteVertexArrayOES(Platform3DObject);
virtual GC3Dboolean isVertexArrayOES(Platform3DObject);
virtual void bindVertexArrayOES(Platform3DObject);
- virtual void copyTextureCHROMIUM(GC3Denum, Platform3DObject, Platform3DObject, GC3Dint, GC3Denum);
virtual void insertEventMarkerEXT(const String&);
virtual void pushGroupMarkerEXT(const String&);
virtual void popGroupMarkerEXT(void);
Modified: trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.cpp (164467 => 164468)
--- trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.cpp 2014-02-21 04:55:44 UTC (rev 164467)
+++ trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.cpp 2014-02-21 04:59:09 UTC (rev 164468)
@@ -91,11 +91,6 @@
notImplemented();
}
-void Extensions3DOpenGLES::copyTextureCHROMIUM(GC3Denum, Platform3DObject, Platform3DObject, GC3Dint, GC3Denum)
-{
- notImplemented();
-}
-
void Extensions3DOpenGLES::insertEventMarkerEXT(const String&)
{
notImplemented();
Modified: trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.h (164467 => 164468)
--- trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.h 2014-02-21 04:55:44 UTC (rev 164467)
+++ trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.h 2014-02-21 04:59:09 UTC (rev 164468)
@@ -69,7 +69,6 @@
// Extension3D methods
virtual void blitFramebuffer(long srcX0, long srcY0, long srcX1, long srcY1, long dstX0, long dstY0, long dstX1, long dstY1, unsigned long mask, unsigned long filter);
virtual void renderbufferStorageMultisample(unsigned long target, unsigned long samples, unsigned long internalformat, unsigned long width, unsigned long height);
- virtual void copyTextureCHROMIUM(GC3Denum, Platform3DObject, Platform3DObject, GC3Dint, GC3Denum);
virtual void insertEventMarkerEXT(const String&);
virtual void pushGroupMarkerEXT(const String&);
virtual void popGroupMarkerEXT(void);
