Diff
Modified: trunk/Source/Platform/ChangeLog (111248 => 111249)
--- trunk/Source/Platform/ChangeLog 2012-03-19 21:30:43 UTC (rev 111248)
+++ trunk/Source/Platform/ChangeLog 2012-03-19 21:30:47 UTC (rev 111249)
@@ -1,3 +1,14 @@
+2012-03-19 Sheriff Bot <[email protected]>
+
+ 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 <[email protected]>
[chromium] Updating WebGraphicsContext3D MemoryAllocation callback to accept a struct with have backbuffer suggestion.
Modified: trunk/Source/Platform/chromium/public/WebGraphicsContext3D.h (111248 => 111249)
--- trunk/Source/Platform/chromium/public/WebGraphicsContext3D.h 2012-03-19 21:30:43 UTC (rev 111248)
+++ trunk/Source/Platform/chromium/public/WebGraphicsContext3D.h 2012-03-19 21:30:47 UTC (rev 111249)
@@ -402,14 +402,6 @@
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();
Modified: trunk/Source/WebCore/ChangeLog (111248 => 111249)
--- trunk/Source/WebCore/ChangeLog 2012-03-19 21:30:43 UTC (rev 111248)
+++ trunk/Source/WebCore/ChangeLog 2012-03-19 21:30:47 UTC (rev 111249)
@@ -1,3 +1,15 @@
+2012-03-19 Sheriff Bot <[email protected]>
+
+ 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 <[email protected]>
Remove unnecessary CALayer overrides from WebTileCacheLayer
Modified: trunk/Source/WebCore/platform/graphics/chromium/Extensions3DChromium.h (111248 => 111249)
--- trunk/Source/WebCore/platform/graphics/chromium/Extensions3DChromium.h 2012-03-19 21:30:43 UTC (rev 111248)
+++ trunk/Source/WebCore/platform/graphics/chromium/Extensions3DChromium.h 2012-03-19 21:30:47 UTC (rev 111249)
@@ -46,10 +46,8 @@
// 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 @@
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 @@
// 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.
Modified: trunk/Source/WebKit/chromium/ChangeLog (111248 => 111249)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-03-19 21:30:43 UTC (rev 111248)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-03-19 21:30:47 UTC (rev 111249)
@@ -1,3 +1,19 @@
+2012-03-19 Sheriff Bot <[email protected]>
+
+ 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 <[email protected]>
[chromium] MediaStream API (JSEP): Introducing WebMediaHints and WebIceOptions
Modified: trunk/Source/WebKit/chromium/src/Extensions3DChromium.cpp (111248 => 111249)
--- trunk/Source/WebKit/chromium/src/Extensions3DChromium.cpp 2012-03-19 21:30:43 UTC (rev 111248)
+++ trunk/Source/WebKit/chromium/src/Extensions3DChromium.cpp 2012-03-19 21:30:47 UTC (rev 111249)
@@ -160,41 +160,6 @@
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)
Modified: trunk/Source/WebKit/chromium/src/GraphicsContext3DChromium.cpp (111248 => 111249)
--- trunk/Source/WebKit/chromium/src/GraphicsContext3DChromium.cpp 2012-03-19 21:30:43 UTC (rev 111248)
+++ trunk/Source/WebKit/chromium/src/GraphicsContext3DChromium.cpp 2012-03-19 21:30:47 UTC (rev 111249)
@@ -889,14 +889,6 @@
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
//
Modified: trunk/Source/WebKit/chromium/src/GraphicsContext3DPrivate.h (111248 => 111249)
--- trunk/Source/WebKit/chromium/src/GraphicsContext3DPrivate.h 2012-03-19 21:30:43 UTC (rev 111248)
+++ trunk/Source/WebKit/chromium/src/GraphicsContext3DPrivate.h 2012-03-19 21:30:47 UTC (rev 111249)
@@ -307,15 +307,6 @@
// 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);
Modified: trunk/Source/WebKit/chromium/tests/FakeWebGraphicsContext3D.h (111248 => 111249)
--- trunk/Source/WebKit/chromium/tests/FakeWebGraphicsContext3D.h 2012-03-19 21:30:43 UTC (rev 111248)
+++ trunk/Source/WebKit/chromium/tests/FakeWebGraphicsContext3D.h 2012-03-19 21:30:47 UTC (rev 111249)
@@ -255,14 +255,6 @@
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;
};
