Unreviewed, rolling out r111207.

http://trac.webkit.org/changeset/111207
https://bugs.webkit.org/show_bug.cgi?id=81561

Causing chromium unit test failure (Requested by reveman on
#webkit).

Patch by Sheriff Bot <webkit.review.bot@gmail.com> on 2012-03-19

Source/Platform:

* chromium/public/WebGraphicsContext3D.h:

Source/WebCore:

* platform/graphics/chromium/Extensions3DChromium.h:
(Extensions3DChromium):

Source/WebKit/chromium:

* src/Extensions3DChromium.cpp:
* src/GraphicsContext3DChromium.cpp:
(WebCore):
* src/GraphicsContext3DPrivate.h:
(GraphicsContext3DPrivate):
* tests/FakeWebGraphicsContext3D.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@111249 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/Platform/ChangeLog b/Source/Platform/ChangeLog
index a30ccd2ac3568660041490f0d36f6adba97ffea3..7a76083cf19661cae3be9fa72b193c7ba451f3e4 100644 (file)
--- a/Source/Platform/ChangeLog
+++ b/Source/Platform/ChangeLog
@@ -1,3 +1,14 @@
+2012-03-19  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r111207.
+        http://trac.webkit.org/changeset/111207
+        https://bugs.webkit.org/show_bug.cgi?id=81561
+
+        Causing chromium unit test failure (Requested by reveman on
+        #webkit).
+
+        * chromium/public/WebGraphicsContext3D.h:
+
 2012-03-19  Michal Mocny  <mmocny@google.com>
 
         [chromium] Updating WebGraphicsContext3D MemoryAllocation callback to accept a struct with have backbuffer suggestion.

diff --git a/Source/Platform/chromium/public/WebGraphicsContext3D.h b/Source/Platform/chromium/public/WebGraphicsContext3D.h
index 84c509c14c3c8e6a6efcf7ad8a82d4aa0d1b7e76..f16447d67d0bcdfc93c6183a79763b6279458052 100644 (file)
--- a/Source/Platform/chromium/public/WebGraphicsContext3D.h
+++ b/Source/Platform/chromium/public/WebGraphicsContext3D.h
@@ -402,14 +402,6 @@ public:
     virtual void texStorage2DEXT(WGC3Denum target, WGC3Dint levels, WGC3Duint internalformat,
                                  WGC3Dint width, WGC3Dint height) { }
 
-    // GL_EXT_occlusion_query
-    virtual WebGLId createQueryEXT() = 0;
-    virtual void deleteQueryEXT(WebGLId query) = 0;
-    virtual WGC3Dboolean isQueryEXT(WebGLId query) = 0;
-    virtual void beginQueryEXT(WGC3Denum target, WebGLId query) = 0;
-    virtual void endQueryEXT(WGC3Denum target) = 0;
-    virtual void getQueryivEXT(WGC3Denum target, WGC3Denum pname, WGC3Dint* params) = 0;
-    virtual void getQueryObjectuivEXT(WebGLId query, WGC3Denum pname, WGC3Duint* params) = 0;
 
 #if WEBKIT_USING_SKIA
     GrGLInterface* createGrGLInterface();

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 969c723818f087b359f4aac37b51fc99ce74add9..f6cb538eb6a7f1788c50a7ef467e23f35566a02d 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2012-03-19  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r111207.
+        http://trac.webkit.org/changeset/111207
+        https://bugs.webkit.org/show_bug.cgi?id=81561
+
+        Causing chromium unit test failure (Requested by reveman on
+        #webkit).
+
+        * platform/graphics/chromium/Extensions3DChromium.h:
+        (Extensions3DChromium):
+
 2012-03-19  Anders Carlsson  <andersca@apple.com>
 
         Remove unnecessary CALayer overrides from WebTileCacheLayer

diff --git a/Source/WebCore/platform/graphics/chromium/Extensions3DChromium.h b/Source/WebCore/platform/graphics/chromium/Extensions3DChromium.h
index f946fe6279ee9784508f85fbc80b6e92692c75f8..6549597aad5548352f6e20aa6eba6972bc88fcb7 100644 (file)
--- a/Source/WebCore/platform/graphics/chromium/Extensions3DChromium.h
+++ b/Source/WebCore/platform/graphics/chromium/Extensions3DChromium.h
@@ -46,10 +46,8 @@ public:
     //   GL_CHROMIUM_rate_limit_offscreen_context
     //   GL_CHROMIUM_paint_framebuffer_canvas
     //   GL_CHROMIUM_iosurface (Mac OS X specific)
-    //   GL_CHROMIUM_command_buffer_query
     //   GL_ANGLE_texture_usage
     //   GL_EXT_texture_storage
-    //   GL_EXT_occlusion_query_boolean
 
     // Extensions3D methods.
     virtual bool supports(const String&);
@@ -77,17 +75,7 @@ public:
         GL_FRAMEBUFFER_ATTACHMENT_ANGLE = 0x93A3,
 
         // GL_EXT_texture_storage
-        BGRA8_EXT = 0x93A1,
-
-        // GL_EXT_occlusion_query_boolean
-        ANY_SAMPLES_PASSED_EXT = 0x8C2F,
-        ANY_SAMPLES_PASSED_CONSERVATIVE_EXT = 0x8D6A,
-        CURRENT_QUERY_EXT = 0x8865,
-        QUERY_RESULT_EXT = 0x8866,
-        QUERY_RESULT_AVAILABLE_EXT = 0x8867,
-
-        // GL_CHROMIUM_command_buffer_query
-        COMMANDS_ISSUED_CHROMIUM = 0x84F2
+        BGRA8_EXT = 0x93A1
     };
 
     // GL_CHROMIUM_post_sub_buffer
@@ -143,15 +131,6 @@ public:
     // GL_EXT_texture_storage
     void texStorage2DEXT(unsigned target, int levels, unsigned internalformat, int width, int height);
 
-    // GL_EXT_occlusion_query
-    Platform3DObject createQueryEXT();
-    void deleteQueryEXT(Platform3DObject);
-    GC3Dboolean isQueryEXT(Platform3DObject);
-    void beginQueryEXT(GC3Denum, Platform3DObject);
-    void endQueryEXT(GC3Denum);
-    void getQueryivEXT(GC3Denum, GC3Denum, GC3Dint*);
-    void getQueryObjectuivEXT(Platform3DObject, GC3Denum, GC3Duint*);
-
 private:
     // Instances of this class are strictly owned by the GraphicsContext3D implementation and do not
     // need to be instantiated by any other code.

diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
index 46b21d3b6f1956eb4c38326a050fb730cdd7cec9..7f43239dbd46b75b866bd37d0f81350dad8e7cd5 100644 (file)
--- a/Source/WebKit/chromium/ChangeLog
+++ b/Source/WebKit/chromium/ChangeLog
@@ -1,3 +1,19 @@
+2012-03-19  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r111207.
+        http://trac.webkit.org/changeset/111207
+        https://bugs.webkit.org/show_bug.cgi?id=81561
+
+        Causing chromium unit test failure (Requested by reveman on
+        #webkit).
+
+        * src/Extensions3DChromium.cpp:
+        * src/GraphicsContext3DChromium.cpp:
+        (WebCore):
+        * src/GraphicsContext3DPrivate.h:
+        (GraphicsContext3DPrivate):
+        * tests/FakeWebGraphicsContext3D.h:
+
 2012-03-19  Tommy Widenflycht  <tommyw@google.com>
 
         [chromium] MediaStream API (JSEP): Introducing WebMediaHints and WebIceOptions

diff --git a/Source/WebKit/chromium/src/Extensions3DChromium.cpp b/Source/WebKit/chromium/src/Extensions3DChromium.cpp
index 6b56cca0c981d0c01e43cbc08b5bc0414fca1743..73397bd2b16a7cccfa182ba12768da0c7a5876db 100644 (file)
--- a/Source/WebKit/chromium/src/Extensions3DChromium.cpp
+++ b/Source/WebKit/chromium/src/Extensions3DChromium.cpp
@@ -160,41 +160,6 @@ void Extensions3DChromium::texStorage2DEXT(unsigned int target, int levels, unsi
     m_private->texStorage2DEXT(target, levels, internalFormat, width, height);
 }
 
-Platform3DObject Extensions3DChromium::createQueryEXT()
-{
-    return m_private->createQueryEXT();
-}
-
-void Extensions3DChromium::deleteQueryEXT(Platform3DObject query)
-{
-    m_private->deleteQueryEXT(query);
-}
-
-GC3Dboolean Extensions3DChromium::isQueryEXT(Platform3DObject query)
-{
-    return m_private->isQueryEXT(query);
-}
-
-void Extensions3DChromium::beginQueryEXT(GC3Denum target, Platform3DObject query)
-{
-    m_private->beginQueryEXT(target, query);
-}
-
-void Extensions3DChromium::endQueryEXT(GC3Denum target)
-{
-    m_private->endQueryEXT(target);
-}
-
-void Extensions3DChromium::getQueryivEXT(GC3Denum target, GC3Denum pname, GC3Dint* params)
-{
-    m_private->getQueryivEXT(target, pname, params);
-}
-
-void Extensions3DChromium::getQueryObjectuivEXT(Platform3DObject query, GC3Denum pname, GC3Duint* params)
-{
-    m_private->getQueryObjectuivEXT(query, pname, params);
-}
-
 } // namespace WebCore
 
 #endif // ENABLE(WEBGL)

diff --git a/Source/WebKit/chromium/src/GraphicsContext3DChromium.cpp b/Source/WebKit/chromium/src/GraphicsContext3DChromium.cpp
index ec14521408a951a795adc339644a01144d83fa26..02c783e713f2c493d3b7a8883c4faa234c21c02e 100644 (file)
--- a/Source/WebKit/chromium/src/GraphicsContext3DChromium.cpp
+++ b/Source/WebKit/chromium/src/GraphicsContext3DChromium.cpp
@@ -889,14 +889,6 @@ DELEGATE_TO_IMPL_1R(getTranslatedShaderSourceANGLE, Platform3DObject, String)
 DELEGATE_TO_IMPL_5(texImageIOSurface2DCHROMIUM, GC3Denum, GC3Dint, GC3Dint, GC3Duint, GC3Duint)
 DELEGATE_TO_IMPL_5(texStorage2DEXT, GC3Denum, GC3Dint, GC3Duint, GC3Dint, GC3Dint)
 
-DELEGATE_TO_IMPL_R(createQueryEXT, Platform3DObject)
-DELEGATE_TO_IMPL_1(deleteQueryEXT, Platform3DObject)
-DELEGATE_TO_IMPL_1R(isQueryEXT, Platform3DObject, GC3Dboolean)
-DELEGATE_TO_IMPL_2(beginQueryEXT, GC3Denum, Platform3DObject)
-DELEGATE_TO_IMPL_1(endQueryEXT, GC3Denum)
-DELEGATE_TO_IMPL_3(getQueryivEXT, GC3Denum, GC3Denum, GC3Dint*)
-DELEGATE_TO_IMPL_3(getQueryObjectuivEXT, Platform3DObject, GC3Denum, GC3Duint*)
-
 //----------------------------------------------------------------------
 // GraphicsContext3D
 //

diff --git a/Source/WebKit/chromium/src/GraphicsContext3DPrivate.h b/Source/WebKit/chromium/src/GraphicsContext3DPrivate.h
index 29bb6ef520b01f02080b90791c6bd5e58eddbc43..be9db4287db6efa3285fccb854fea3483ad15b6c 100644 (file)
--- a/Source/WebKit/chromium/src/GraphicsContext3DPrivate.h
+++ b/Source/WebKit/chromium/src/GraphicsContext3DPrivate.h
@@ -307,15 +307,6 @@ public:
     // GL_EXT_texture_storage
     void texStorage2DEXT(GC3Denum target, GC3Dint levels, GC3Duint internalformat, GC3Dint width, GC3Dint height);
 
-    // GL_EXT_occlusion_query
-    Platform3DObject createQueryEXT();
-    void deleteQueryEXT(Platform3DObject);
-    GC3Dboolean isQueryEXT(Platform3DObject);
-    void beginQueryEXT(GC3Denum, Platform3DObject);
-    void endQueryEXT(GC3Denum);
-    void getQueryivEXT(GC3Denum, GC3Denum, GC3Dint*);
-    void getQueryObjectuivEXT(Platform3DObject, GC3Denum, GC3Duint*);
-
 private:
     GraphicsContext3DPrivate(PassOwnPtr<WebKit::WebGraphicsContext3D>, bool preserveDrawingBuffer);
 

diff --git a/Source/WebKit/chromium/tests/FakeWebGraphicsContext3D.h b/Source/WebKit/chromium/tests/FakeWebGraphicsContext3D.h
index 2c161a8b8d8a0857ebf7bb8a793088d238e9e5a9..268dc1da35dba3535544e09381ca507d34cc8073 100644 (file)
--- a/Source/WebKit/chromium/tests/FakeWebGraphicsContext3D.h
+++ b/Source/WebKit/chromium/tests/FakeWebGraphicsContext3D.h
@@ -255,14 +255,6 @@ public:
     virtual void texStorage2DEXT(WGC3Denum target, WGC3Dint levels, WGC3Duint internalformat,
                                  WGC3Dint width, WGC3Dint height) { }
 
-    virtual WebGLId createQueryEXT() { return 1; }
-    virtual void deleteQueryEXT(WebGLId) { }
-    virtual GC3Dboolean isQueryEXT(WebGLId) { return true; }
-    virtual void beginQueryEXT(GC3Denum, WebGLId) { }
-    virtual void endQueryEXT(GC3Denum) { }
-    virtual void getQueryivEXT(GC3Denum, GC3Denum, GC3Dint*) { }
-    virtual void getQueryObjectuivEXT(WebGLId, GC3Denum, GC3Duint*) { }
-
 protected:
     Attributes m_attrs;
 };