Log Message
[chromium] Add MockWebGraphicsContext3D, for compositor unit testing https://bugs.webkit.org/show_bug.cgi?id=67006
MockWebGraphicsContext3D is a no-op implementation of the pure virtual interface WebGraphicsContext3D. I've included a test with a couple of example usages: subclassing it manually, and using it with GMock. Patch by Iain Merrick <[email protected]> on 2011-08-26 Reviewed by Kenneth Russell. * WebKit.gypi: * tests/MockWebGraphicsContext3D.h: Added. (WebKit::MockWebGraphicsContext3D::initialize): (WebKit::MockWebGraphicsContext3D::makeContextCurrent): (WebKit::MockWebGraphicsContext3D::width): (WebKit::MockWebGraphicsContext3D::height): (WebKit::MockWebGraphicsContext3D::reshape): (WebKit::MockWebGraphicsContext3D::isGLES2Compliant): (WebKit::MockWebGraphicsContext3D::readBackFramebuffer): (WebKit::MockWebGraphicsContext3D::getPlatformTextureId): (WebKit::MockWebGraphicsContext3D::prepareTexture): (WebKit::MockWebGraphicsContext3D::synthesizeGLError): (WebKit::MockWebGraphicsContext3D::isContextLost): (WebKit::MockWebGraphicsContext3D::mapBufferSubDataCHROMIUM): (WebKit::MockWebGraphicsContext3D::unmapBufferSubDataCHROMIUM): (WebKit::MockWebGraphicsContext3D::mapTexSubImage2DCHROMIUM): (WebKit::MockWebGraphicsContext3D::unmapTexSubImage2DCHROMIUM): (WebKit::MockWebGraphicsContext3D::getRequestableExtensionsCHROMIUM): (WebKit::MockWebGraphicsContext3D::requestExtensionCHROMIUM): (WebKit::MockWebGraphicsContext3D::blitFramebufferCHROMIUM): (WebKit::MockWebGraphicsContext3D::renderbufferStorageMultisampleCHROMIUM): (WebKit::MockWebGraphicsContext3D::activeTexture): (WebKit::MockWebGraphicsContext3D::attachShader): (WebKit::MockWebGraphicsContext3D::bindAttribLocation): (WebKit::MockWebGraphicsContext3D::bindBuffer): (WebKit::MockWebGraphicsContext3D::bindFramebuffer): (WebKit::MockWebGraphicsContext3D::bindRenderbuffer): (WebKit::MockWebGraphicsContext3D::bindTexture): (WebKit::MockWebGraphicsContext3D::blendColor): (WebKit::MockWebGraphicsContext3D::blendEquation): (WebKit::MockWebGraphicsContext3D::blendEquationSeparate): (WebKit::MockWebGraphicsContext3D::blendFunc): (WebKit::MockWebGraphicsContext3D::blendFuncSeparate): (WebKit::MockWebGraphicsContext3D::bufferData): (WebKit::MockWebGraphicsContext3D::bufferSubData): (WebKit::MockWebGraphicsContext3D::checkFramebufferStatus): (WebKit::MockWebGraphicsContext3D::clear): (WebKit::MockWebGraphicsContext3D::clearColor): (WebKit::MockWebGraphicsContext3D::clearDepth): (WebKit::MockWebGraphicsContext3D::clearStencil): (WebKit::MockWebGraphicsContext3D::colorMask): (WebKit::MockWebGraphicsContext3D::compileShader): (WebKit::MockWebGraphicsContext3D::copyTexImage2D): (WebKit::MockWebGraphicsContext3D::copyTexSubImage2D): (WebKit::MockWebGraphicsContext3D::cullFace): (WebKit::MockWebGraphicsContext3D::depthFunc): (WebKit::MockWebGraphicsContext3D::depthMask): (WebKit::MockWebGraphicsContext3D::depthRange): (WebKit::MockWebGraphicsContext3D::detachShader): (WebKit::MockWebGraphicsContext3D::disable): (WebKit::MockWebGraphicsContext3D::disableVertexAttribArray): (WebKit::MockWebGraphicsContext3D::drawArrays): (WebKit::MockWebGraphicsContext3D::drawElements): (WebKit::MockWebGraphicsContext3D::enable): (WebKit::MockWebGraphicsContext3D::enableVertexAttribArray): (WebKit::MockWebGraphicsContext3D::finish): (WebKit::MockWebGraphicsContext3D::flush): (WebKit::MockWebGraphicsContext3D::framebufferRenderbuffer): (WebKit::MockWebGraphicsContext3D::framebufferTexture2D): (WebKit::MockWebGraphicsContext3D::frontFace): (WebKit::MockWebGraphicsContext3D::generateMipmap): (WebKit::MockWebGraphicsContext3D::getActiveAttrib): (WebKit::MockWebGraphicsContext3D::getActiveUniform): (WebKit::MockWebGraphicsContext3D::getAttachedShaders): (WebKit::MockWebGraphicsContext3D::getAttribLocation): (WebKit::MockWebGraphicsContext3D::getBooleanv): (WebKit::MockWebGraphicsContext3D::getBufferParameteriv): (WebKit::MockWebGraphicsContext3D::getContextAttributes): (WebKit::MockWebGraphicsContext3D::getError): (WebKit::MockWebGraphicsContext3D::getFloatv): (WebKit::MockWebGraphicsContext3D::getFramebufferAttachmentParameteriv): (WebKit::MockWebGraphicsContext3D::getIntegerv): (WebKit::MockWebGraphicsContext3D::getProgramiv): (WebKit::MockWebGraphicsContext3D::getProgramInfoLog): (WebKit::MockWebGraphicsContext3D::getRenderbufferParameteriv): (WebKit::MockWebGraphicsContext3D::getShaderiv): (WebKit::MockWebGraphicsContext3D::getShaderInfoLog): (WebKit::MockWebGraphicsContext3D::getShaderSource): (WebKit::MockWebGraphicsContext3D::getString): (WebKit::MockWebGraphicsContext3D::getTexParameterfv): (WebKit::MockWebGraphicsContext3D::getTexParameteriv): (WebKit::MockWebGraphicsContext3D::getUniformfv): (WebKit::MockWebGraphicsContext3D::getUniformiv): (WebKit::MockWebGraphicsContext3D::getUniformLocation): (WebKit::MockWebGraphicsContext3D::getVertexAttribfv): (WebKit::MockWebGraphicsContext3D::getVertexAttribiv): (WebKit::MockWebGraphicsContext3D::getVertexAttribOffset): (WebKit::MockWebGraphicsContext3D::hint): (WebKit::MockWebGraphicsContext3D::isBuffer): (WebKit::MockWebGraphicsContext3D::isEnabled): (WebKit::MockWebGraphicsContext3D::isFramebuffer): (WebKit::MockWebGraphicsContext3D::isProgram): (WebKit::MockWebGraphicsContext3D::isRenderbuffer): (WebKit::MockWebGraphicsContext3D::isShader): (WebKit::MockWebGraphicsContext3D::isTexture): (WebKit::MockWebGraphicsContext3D::lineWidth): (WebKit::MockWebGraphicsContext3D::linkProgram): (WebKit::MockWebGraphicsContext3D::pixelStorei): (WebKit::MockWebGraphicsContext3D::polygonOffset): (WebKit::MockWebGraphicsContext3D::readPixels): (WebKit::MockWebGraphicsContext3D::releaseShaderCompiler): (WebKit::MockWebGraphicsContext3D::renderbufferStorage): (WebKit::MockWebGraphicsContext3D::sampleCoverage): (WebKit::MockWebGraphicsContext3D::scissor): (WebKit::MockWebGraphicsContext3D::shaderSource): (WebKit::MockWebGraphicsContext3D::stencilFunc): (WebKit::MockWebGraphicsContext3D::stencilFuncSeparate): (WebKit::MockWebGraphicsContext3D::stencilMask): (WebKit::MockWebGraphicsContext3D::stencilMaskSeparate): (WebKit::MockWebGraphicsContext3D::stencilOp): (WebKit::MockWebGraphicsContext3D::stencilOpSeparate): (WebKit::MockWebGraphicsContext3D::texImage2D): (WebKit::MockWebGraphicsContext3D::texParameterf): (WebKit::MockWebGraphicsContext3D::texParameteri): (WebKit::MockWebGraphicsContext3D::texSubImage2D): (WebKit::MockWebGraphicsContext3D::uniform1f): (WebKit::MockWebGraphicsContext3D::uniform1fv): (WebKit::MockWebGraphicsContext3D::uniform1i): (WebKit::MockWebGraphicsContext3D::uniform1iv): (WebKit::MockWebGraphicsContext3D::uniform2f): (WebKit::MockWebGraphicsContext3D::uniform2fv): (WebKit::MockWebGraphicsContext3D::uniform2i): (WebKit::MockWebGraphicsContext3D::uniform2iv): (WebKit::MockWebGraphicsContext3D::uniform3f): (WebKit::MockWebGraphicsContext3D::uniform3fv): (WebKit::MockWebGraphicsContext3D::uniform3i): (WebKit::MockWebGraphicsContext3D::uniform3iv): (WebKit::MockWebGraphicsContext3D::uniform4f): (WebKit::MockWebGraphicsContext3D::uniform4fv): (WebKit::MockWebGraphicsContext3D::uniform4i): (WebKit::MockWebGraphicsContext3D::uniform4iv): (WebKit::MockWebGraphicsContext3D::uniformMatrix2fv): (WebKit::MockWebGraphicsContext3D::uniformMatrix3fv): (WebKit::MockWebGraphicsContext3D::uniformMatrix4fv): (WebKit::MockWebGraphicsContext3D::useProgram): (WebKit::MockWebGraphicsContext3D::validateProgram): (WebKit::MockWebGraphicsContext3D::vertexAttrib1f): (WebKit::MockWebGraphicsContext3D::vertexAttrib1fv): (WebKit::MockWebGraphicsContext3D::vertexAttrib2f): (WebKit::MockWebGraphicsContext3D::vertexAttrib2fv): (WebKit::MockWebGraphicsContext3D::vertexAttrib3f): (WebKit::MockWebGraphicsContext3D::vertexAttrib3fv): (WebKit::MockWebGraphicsContext3D::vertexAttrib4f): (WebKit::MockWebGraphicsContext3D::vertexAttrib4fv): (WebKit::MockWebGraphicsContext3D::vertexAttribPointer): (WebKit::MockWebGraphicsContext3D::viewport): (WebKit::MockWebGraphicsContext3D::createBuffer): (WebKit::MockWebGraphicsContext3D::createFramebuffer): (WebKit::MockWebGraphicsContext3D::createProgram): (WebKit::MockWebGraphicsContext3D::createRenderbuffer): (WebKit::MockWebGraphicsContext3D::createShader): (WebKit::MockWebGraphicsContext3D::createTexture): (WebKit::MockWebGraphicsContext3D::deleteBuffer): (WebKit::MockWebGraphicsContext3D::deleteFramebuffer): (WebKit::MockWebGraphicsContext3D::deleteProgram): (WebKit::MockWebGraphicsContext3D::deleteRenderbuffer): (WebKit::MockWebGraphicsContext3D::deleteShader): (WebKit::MockWebGraphicsContext3D::deleteTexture): * tests/MockWebGraphicsContext3DTest.cpp: Added. (TEST): (FrameCountingContext::FrameCountingContext): (FrameCountingContext::prepareTexture): (FrameCountingContext::frameCount):
Modified Paths
Added Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (93927 => 93928)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-08-27 00:38:50 UTC (rev 93927)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-08-27 00:41:33 UTC (rev 93928)
@@ -1,3 +1,178 @@
+2011-08-26 Iain Merrick <[email protected]>
+
+ [chromium] Add MockWebGraphicsContext3D, for compositor unit testing
+ https://bugs.webkit.org/show_bug.cgi?id=67006
+
+ MockWebGraphicsContext3D is a no-op implementation of the pure virtual
+ interface WebGraphicsContext3D. I've included a test with a couple of
+ example usages: subclassing it manually, and using it with GMock.
+
+ Reviewed by Kenneth Russell.
+
+ * WebKit.gypi:
+ * tests/MockWebGraphicsContext3D.h: Added.
+ (WebKit::MockWebGraphicsContext3D::initialize):
+ (WebKit::MockWebGraphicsContext3D::makeContextCurrent):
+ (WebKit::MockWebGraphicsContext3D::width):
+ (WebKit::MockWebGraphicsContext3D::height):
+ (WebKit::MockWebGraphicsContext3D::reshape):
+ (WebKit::MockWebGraphicsContext3D::isGLES2Compliant):
+ (WebKit::MockWebGraphicsContext3D::readBackFramebuffer):
+ (WebKit::MockWebGraphicsContext3D::getPlatformTextureId):
+ (WebKit::MockWebGraphicsContext3D::prepareTexture):
+ (WebKit::MockWebGraphicsContext3D::synthesizeGLError):
+ (WebKit::MockWebGraphicsContext3D::isContextLost):
+ (WebKit::MockWebGraphicsContext3D::mapBufferSubDataCHROMIUM):
+ (WebKit::MockWebGraphicsContext3D::unmapBufferSubDataCHROMIUM):
+ (WebKit::MockWebGraphicsContext3D::mapTexSubImage2DCHROMIUM):
+ (WebKit::MockWebGraphicsContext3D::unmapTexSubImage2DCHROMIUM):
+ (WebKit::MockWebGraphicsContext3D::getRequestableExtensionsCHROMIUM):
+ (WebKit::MockWebGraphicsContext3D::requestExtensionCHROMIUM):
+ (WebKit::MockWebGraphicsContext3D::blitFramebufferCHROMIUM):
+ (WebKit::MockWebGraphicsContext3D::renderbufferStorageMultisampleCHROMIUM):
+ (WebKit::MockWebGraphicsContext3D::activeTexture):
+ (WebKit::MockWebGraphicsContext3D::attachShader):
+ (WebKit::MockWebGraphicsContext3D::bindAttribLocation):
+ (WebKit::MockWebGraphicsContext3D::bindBuffer):
+ (WebKit::MockWebGraphicsContext3D::bindFramebuffer):
+ (WebKit::MockWebGraphicsContext3D::bindRenderbuffer):
+ (WebKit::MockWebGraphicsContext3D::bindTexture):
+ (WebKit::MockWebGraphicsContext3D::blendColor):
+ (WebKit::MockWebGraphicsContext3D::blendEquation):
+ (WebKit::MockWebGraphicsContext3D::blendEquationSeparate):
+ (WebKit::MockWebGraphicsContext3D::blendFunc):
+ (WebKit::MockWebGraphicsContext3D::blendFuncSeparate):
+ (WebKit::MockWebGraphicsContext3D::bufferData):
+ (WebKit::MockWebGraphicsContext3D::bufferSubData):
+ (WebKit::MockWebGraphicsContext3D::checkFramebufferStatus):
+ (WebKit::MockWebGraphicsContext3D::clear):
+ (WebKit::MockWebGraphicsContext3D::clearColor):
+ (WebKit::MockWebGraphicsContext3D::clearDepth):
+ (WebKit::MockWebGraphicsContext3D::clearStencil):
+ (WebKit::MockWebGraphicsContext3D::colorMask):
+ (WebKit::MockWebGraphicsContext3D::compileShader):
+ (WebKit::MockWebGraphicsContext3D::copyTexImage2D):
+ (WebKit::MockWebGraphicsContext3D::copyTexSubImage2D):
+ (WebKit::MockWebGraphicsContext3D::cullFace):
+ (WebKit::MockWebGraphicsContext3D::depthFunc):
+ (WebKit::MockWebGraphicsContext3D::depthMask):
+ (WebKit::MockWebGraphicsContext3D::depthRange):
+ (WebKit::MockWebGraphicsContext3D::detachShader):
+ (WebKit::MockWebGraphicsContext3D::disable):
+ (WebKit::MockWebGraphicsContext3D::disableVertexAttribArray):
+ (WebKit::MockWebGraphicsContext3D::drawArrays):
+ (WebKit::MockWebGraphicsContext3D::drawElements):
+ (WebKit::MockWebGraphicsContext3D::enable):
+ (WebKit::MockWebGraphicsContext3D::enableVertexAttribArray):
+ (WebKit::MockWebGraphicsContext3D::finish):
+ (WebKit::MockWebGraphicsContext3D::flush):
+ (WebKit::MockWebGraphicsContext3D::framebufferRenderbuffer):
+ (WebKit::MockWebGraphicsContext3D::framebufferTexture2D):
+ (WebKit::MockWebGraphicsContext3D::frontFace):
+ (WebKit::MockWebGraphicsContext3D::generateMipmap):
+ (WebKit::MockWebGraphicsContext3D::getActiveAttrib):
+ (WebKit::MockWebGraphicsContext3D::getActiveUniform):
+ (WebKit::MockWebGraphicsContext3D::getAttachedShaders):
+ (WebKit::MockWebGraphicsContext3D::getAttribLocation):
+ (WebKit::MockWebGraphicsContext3D::getBooleanv):
+ (WebKit::MockWebGraphicsContext3D::getBufferParameteriv):
+ (WebKit::MockWebGraphicsContext3D::getContextAttributes):
+ (WebKit::MockWebGraphicsContext3D::getError):
+ (WebKit::MockWebGraphicsContext3D::getFloatv):
+ (WebKit::MockWebGraphicsContext3D::getFramebufferAttachmentParameteriv):
+ (WebKit::MockWebGraphicsContext3D::getIntegerv):
+ (WebKit::MockWebGraphicsContext3D::getProgramiv):
+ (WebKit::MockWebGraphicsContext3D::getProgramInfoLog):
+ (WebKit::MockWebGraphicsContext3D::getRenderbufferParameteriv):
+ (WebKit::MockWebGraphicsContext3D::getShaderiv):
+ (WebKit::MockWebGraphicsContext3D::getShaderInfoLog):
+ (WebKit::MockWebGraphicsContext3D::getShaderSource):
+ (WebKit::MockWebGraphicsContext3D::getString):
+ (WebKit::MockWebGraphicsContext3D::getTexParameterfv):
+ (WebKit::MockWebGraphicsContext3D::getTexParameteriv):
+ (WebKit::MockWebGraphicsContext3D::getUniformfv):
+ (WebKit::MockWebGraphicsContext3D::getUniformiv):
+ (WebKit::MockWebGraphicsContext3D::getUniformLocation):
+ (WebKit::MockWebGraphicsContext3D::getVertexAttribfv):
+ (WebKit::MockWebGraphicsContext3D::getVertexAttribiv):
+ (WebKit::MockWebGraphicsContext3D::getVertexAttribOffset):
+ (WebKit::MockWebGraphicsContext3D::hint):
+ (WebKit::MockWebGraphicsContext3D::isBuffer):
+ (WebKit::MockWebGraphicsContext3D::isEnabled):
+ (WebKit::MockWebGraphicsContext3D::isFramebuffer):
+ (WebKit::MockWebGraphicsContext3D::isProgram):
+ (WebKit::MockWebGraphicsContext3D::isRenderbuffer):
+ (WebKit::MockWebGraphicsContext3D::isShader):
+ (WebKit::MockWebGraphicsContext3D::isTexture):
+ (WebKit::MockWebGraphicsContext3D::lineWidth):
+ (WebKit::MockWebGraphicsContext3D::linkProgram):
+ (WebKit::MockWebGraphicsContext3D::pixelStorei):
+ (WebKit::MockWebGraphicsContext3D::polygonOffset):
+ (WebKit::MockWebGraphicsContext3D::readPixels):
+ (WebKit::MockWebGraphicsContext3D::releaseShaderCompiler):
+ (WebKit::MockWebGraphicsContext3D::renderbufferStorage):
+ (WebKit::MockWebGraphicsContext3D::sampleCoverage):
+ (WebKit::MockWebGraphicsContext3D::scissor):
+ (WebKit::MockWebGraphicsContext3D::shaderSource):
+ (WebKit::MockWebGraphicsContext3D::stencilFunc):
+ (WebKit::MockWebGraphicsContext3D::stencilFuncSeparate):
+ (WebKit::MockWebGraphicsContext3D::stencilMask):
+ (WebKit::MockWebGraphicsContext3D::stencilMaskSeparate):
+ (WebKit::MockWebGraphicsContext3D::stencilOp):
+ (WebKit::MockWebGraphicsContext3D::stencilOpSeparate):
+ (WebKit::MockWebGraphicsContext3D::texImage2D):
+ (WebKit::MockWebGraphicsContext3D::texParameterf):
+ (WebKit::MockWebGraphicsContext3D::texParameteri):
+ (WebKit::MockWebGraphicsContext3D::texSubImage2D):
+ (WebKit::MockWebGraphicsContext3D::uniform1f):
+ (WebKit::MockWebGraphicsContext3D::uniform1fv):
+ (WebKit::MockWebGraphicsContext3D::uniform1i):
+ (WebKit::MockWebGraphicsContext3D::uniform1iv):
+ (WebKit::MockWebGraphicsContext3D::uniform2f):
+ (WebKit::MockWebGraphicsContext3D::uniform2fv):
+ (WebKit::MockWebGraphicsContext3D::uniform2i):
+ (WebKit::MockWebGraphicsContext3D::uniform2iv):
+ (WebKit::MockWebGraphicsContext3D::uniform3f):
+ (WebKit::MockWebGraphicsContext3D::uniform3fv):
+ (WebKit::MockWebGraphicsContext3D::uniform3i):
+ (WebKit::MockWebGraphicsContext3D::uniform3iv):
+ (WebKit::MockWebGraphicsContext3D::uniform4f):
+ (WebKit::MockWebGraphicsContext3D::uniform4fv):
+ (WebKit::MockWebGraphicsContext3D::uniform4i):
+ (WebKit::MockWebGraphicsContext3D::uniform4iv):
+ (WebKit::MockWebGraphicsContext3D::uniformMatrix2fv):
+ (WebKit::MockWebGraphicsContext3D::uniformMatrix3fv):
+ (WebKit::MockWebGraphicsContext3D::uniformMatrix4fv):
+ (WebKit::MockWebGraphicsContext3D::useProgram):
+ (WebKit::MockWebGraphicsContext3D::validateProgram):
+ (WebKit::MockWebGraphicsContext3D::vertexAttrib1f):
+ (WebKit::MockWebGraphicsContext3D::vertexAttrib1fv):
+ (WebKit::MockWebGraphicsContext3D::vertexAttrib2f):
+ (WebKit::MockWebGraphicsContext3D::vertexAttrib2fv):
+ (WebKit::MockWebGraphicsContext3D::vertexAttrib3f):
+ (WebKit::MockWebGraphicsContext3D::vertexAttrib3fv):
+ (WebKit::MockWebGraphicsContext3D::vertexAttrib4f):
+ (WebKit::MockWebGraphicsContext3D::vertexAttrib4fv):
+ (WebKit::MockWebGraphicsContext3D::vertexAttribPointer):
+ (WebKit::MockWebGraphicsContext3D::viewport):
+ (WebKit::MockWebGraphicsContext3D::createBuffer):
+ (WebKit::MockWebGraphicsContext3D::createFramebuffer):
+ (WebKit::MockWebGraphicsContext3D::createProgram):
+ (WebKit::MockWebGraphicsContext3D::createRenderbuffer):
+ (WebKit::MockWebGraphicsContext3D::createShader):
+ (WebKit::MockWebGraphicsContext3D::createTexture):
+ (WebKit::MockWebGraphicsContext3D::deleteBuffer):
+ (WebKit::MockWebGraphicsContext3D::deleteFramebuffer):
+ (WebKit::MockWebGraphicsContext3D::deleteProgram):
+ (WebKit::MockWebGraphicsContext3D::deleteRenderbuffer):
+ (WebKit::MockWebGraphicsContext3D::deleteShader):
+ (WebKit::MockWebGraphicsContext3D::deleteTexture):
+ * tests/MockWebGraphicsContext3DTest.cpp: Added.
+ (TEST):
+ (FrameCountingContext::FrameCountingContext):
+ (FrameCountingContext::prepareTexture):
+ (FrameCountingContext::frameCount):
+
2011-08-26 Nate Chapin <[email protected]>
Use enums instead of bools for ThreadableLoaderOptions
Modified: trunk/Source/WebKit/chromium/WebKit.gypi (93927 => 93928)
--- trunk/Source/WebKit/chromium/WebKit.gypi 2011-08-27 00:38:50 UTC (rev 93927)
+++ trunk/Source/WebKit/chromium/WebKit.gypi 2011-08-27 00:41:33 UTC (rev 93928)
@@ -63,6 +63,8 @@
'tests/InnerGestureRecognizerTest.cpp',
'tests/KeyboardTest.cpp',
'tests/KURLTest.cpp',
+ 'tests/MockWebGraphicsContext3D.h',
+ 'tests/MockWebGraphicsContext3DTest.cpp',
'tests/PODArenaTest.cpp',
'tests/PODIntervalTreeTest.cpp',
'tests/PODRedBlackTreeTest.cpp',
Added: trunk/Source/WebKit/chromium/tests/MockWebGraphicsContext3D.h (0 => 93928)
--- trunk/Source/WebKit/chromium/tests/MockWebGraphicsContext3D.h (rev 0)
+++ trunk/Source/WebKit/chromium/tests/MockWebGraphicsContext3D.h 2011-08-27 00:41:33 UTC (rev 93928)
@@ -0,0 +1,230 @@
+/*
+ * Copyright (C) 2011 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef MockWebGraphicsContext3D_h
+#define MockWebGraphicsContext3D_h
+
+#include "WebGraphicsContext3D.h"
+
+namespace WebKit {
+
+// WebGraphicsContext3D base class for use in WebKit unit tests.
+// All operations are no-ops (returning 0 if necessary).
+class MockWebGraphicsContext3D : public WebGraphicsContext3D {
+public:
+ virtual bool initialize(Attributes, WebView*, bool renderDirectlyToWebView) { return false; }
+
+ virtual bool makeContextCurrent() { return false; }
+
+ virtual int width() { return 0; }
+ virtual int height() { return 0; }
+
+ virtual void reshape(int width, int height) { }
+
+ virtual bool isGLES2Compliant() { return false; }
+
+ virtual bool readBackFramebuffer(unsigned char* pixels, size_t bufferSize, WebGLId framebuffer, int width, int height) { return false; }
+
+ virtual WebGLId getPlatformTextureId() { return 0; }
+
+ virtual void prepareTexture() { }
+
+ virtual void synthesizeGLError(WGC3Denum) { }
+
+ virtual bool isContextLost() { return false; }
+
+ virtual void* mapBufferSubDataCHROMIUM(WGC3Denum target, WGC3Dintptr offset, WGC3Dsizeiptr size, WGC3Denum access) { return 0; }
+ virtual void unmapBufferSubDataCHROMIUM(const void*) { }
+ virtual void* mapTexSubImage2DCHROMIUM(WGC3Denum target, WGC3Dint level, WGC3Dint xoffset, WGC3Dint yoffset, WGC3Dsizei width, WGC3Dsizei height, WGC3Denum format, WGC3Denum type, WGC3Denum access) { return 0; }
+ virtual void unmapTexSubImage2DCHROMIUM(const void*) { }
+
+ virtual WebString getRequestableExtensionsCHROMIUM() { return WebString(); }
+ virtual void requestExtensionCHROMIUM(const char*) { }
+
+ virtual void blitFramebufferCHROMIUM(WGC3Dint srcX0, WGC3Dint srcY0, WGC3Dint srcX1, WGC3Dint srcY1, WGC3Dint dstX0, WGC3Dint dstY0, WGC3Dint dstX1, WGC3Dint dstY1, WGC3Dbitfield mask, WGC3Denum filter) { }
+ virtual void renderbufferStorageMultisampleCHROMIUM(WGC3Denum target, WGC3Dsizei samples, WGC3Denum internalformat, WGC3Dsizei width, WGC3Dsizei height) { }
+
+ virtual void activeTexture(WGC3Denum texture) { }
+ virtual void attachShader(WebGLId program, WebGLId shader) { }
+ virtual void bindAttribLocation(WebGLId program, WGC3Duint index, const WGC3Dchar* name) { }
+ virtual void bindBuffer(WGC3Denum target, WebGLId buffer) { }
+ virtual void bindFramebuffer(WGC3Denum target, WebGLId framebuffer) { }
+ virtual void bindRenderbuffer(WGC3Denum target, WebGLId renderbuffer) { }
+ virtual void bindTexture(WGC3Denum target, WebGLId texture) { }
+ virtual void blendColor(WGC3Dclampf red, WGC3Dclampf green, WGC3Dclampf blue, WGC3Dclampf alpha) { }
+ virtual void blendEquation(WGC3Denum mode) { }
+ virtual void blendEquationSeparate(WGC3Denum modeRGB, WGC3Denum modeAlpha) { }
+ virtual void blendFunc(WGC3Denum sfactor, WGC3Denum dfactor) { }
+ virtual void blendFuncSeparate(WGC3Denum srcRGB, WGC3Denum dstRGB, WGC3Denum srcAlpha, WGC3Denum dstAlpha) { }
+
+ virtual void bufferData(WGC3Denum target, WGC3Dsizeiptr size, const void* data, WGC3Denum usage) { }
+ virtual void bufferSubData(WGC3Denum target, WGC3Dintptr offset, WGC3Dsizeiptr size, const void* data) { }
+
+ virtual WGC3Denum checkFramebufferStatus(WGC3Denum target) { return 0; }
+ virtual void clear(WGC3Dbitfield mask) { }
+ virtual void clearColor(WGC3Dclampf red, WGC3Dclampf green, WGC3Dclampf blue, WGC3Dclampf alpha) { }
+ virtual void clearDepth(WGC3Dclampf depth) { }
+ virtual void clearStencil(WGC3Dint s) { }
+ virtual void colorMask(WGC3Dboolean red, WGC3Dboolean green, WGC3Dboolean blue, WGC3Dboolean alpha) { }
+ virtual void compileShader(WebGLId shader) { }
+
+ virtual void copyTexImage2D(WGC3Denum target, WGC3Dint level, WGC3Denum internalformat, WGC3Dint x, WGC3Dint y, WGC3Dsizei width, WGC3Dsizei height, WGC3Dint border) { }
+ virtual void copyTexSubImage2D(WGC3Denum target, WGC3Dint level, WGC3Dint xoffset, WGC3Dint yoffset, WGC3Dint x, WGC3Dint y, WGC3Dsizei width, WGC3Dsizei height) { }
+ virtual void cullFace(WGC3Denum mode) { }
+ virtual void depthFunc(WGC3Denum func) { }
+ virtual void depthMask(WGC3Dboolean flag) { }
+ virtual void depthRange(WGC3Dclampf zNear, WGC3Dclampf zFar) { }
+ virtual void detachShader(WebGLId program, WebGLId shader) { }
+ virtual void disable(WGC3Denum cap) { }
+ virtual void disableVertexAttribArray(WGC3Duint index) { }
+ virtual void drawArrays(WGC3Denum mode, WGC3Dint first, WGC3Dsizei count) { }
+ virtual void drawElements(WGC3Denum mode, WGC3Dsizei count, WGC3Denum type, WGC3Dintptr offset) { }
+
+ virtual void enable(WGC3Denum cap) { }
+ virtual void enableVertexAttribArray(WGC3Duint index) { }
+ virtual void finish() { }
+ virtual void flush() { }
+ virtual void framebufferRenderbuffer(WGC3Denum target, WGC3Denum attachment, WGC3Denum renderbuffertarget, WebGLId renderbuffer) { }
+ virtual void framebufferTexture2D(WGC3Denum target, WGC3Denum attachment, WGC3Denum textarget, WebGLId texture, WGC3Dint level) { }
+ virtual void frontFace(WGC3Denum mode) { }
+ virtual void generateMipmap(WGC3Denum target) { }
+
+ virtual bool getActiveAttrib(WebGLId program, WGC3Duint index, ActiveInfo&) { return false; }
+ virtual bool getActiveUniform(WebGLId program, WGC3Duint index, ActiveInfo&) { return false; }
+ virtual void getAttachedShaders(WebGLId program, WGC3Dsizei maxCount, WGC3Dsizei* count, WebGLId* shaders) { }
+ virtual WGC3Dint getAttribLocation(WebGLId program, const WGC3Dchar* name) { return 0; }
+ virtual void getBooleanv(WGC3Denum pname, WGC3Dboolean* value) { }
+ virtual void getBufferParameteriv(WGC3Denum target, WGC3Denum pname, WGC3Dint* value) { }
+ virtual Attributes getContextAttributes() { return Attributes(); }
+ virtual WGC3Denum getError() { return 0; }
+ virtual void getFloatv(WGC3Denum pname, WGC3Dfloat* value) { }
+ virtual void getFramebufferAttachmentParameteriv(WGC3Denum target, WGC3Denum attachment, WGC3Denum pname, WGC3Dint* value) { }
+ virtual void getIntegerv(WGC3Denum pname, WGC3Dint* value) { }
+ virtual void getProgramiv(WebGLId program, WGC3Denum pname, WGC3Dint* value) { }
+ virtual WebString getProgramInfoLog(WebGLId program) { return WebString(); }
+ virtual void getRenderbufferParameteriv(WGC3Denum target, WGC3Denum pname, WGC3Dint* value) { }
+ virtual void getShaderiv(WebGLId shader, WGC3Denum pname, WGC3Dint* value) { }
+ virtual WebString getShaderInfoLog(WebGLId shader) { return WebString(); }
+
+ virtual WebString getShaderSource(WebGLId shader) { return WebString(); }
+ virtual WebString getString(WGC3Denum name) { return WebString(); }
+ virtual void getTexParameterfv(WGC3Denum target, WGC3Denum pname, WGC3Dfloat* value) { }
+ virtual void getTexParameteriv(WGC3Denum target, WGC3Denum pname, WGC3Dint* value) { }
+ virtual void getUniformfv(WebGLId program, WGC3Dint location, WGC3Dfloat* value) { }
+ virtual void getUniformiv(WebGLId program, WGC3Dint location, WGC3Dint* value) { }
+ virtual WGC3Dint getUniformLocation(WebGLId program, const WGC3Dchar* name) { return 0; }
+ virtual void getVertexAttribfv(WGC3Duint index, WGC3Denum pname, WGC3Dfloat* value) { }
+ virtual void getVertexAttribiv(WGC3Duint index, WGC3Denum pname, WGC3Dint* value) { }
+ virtual WGC3Dsizeiptr getVertexAttribOffset(WGC3Duint index, WGC3Denum pname) { return 0; }
+
+ virtual void hint(WGC3Denum target, WGC3Denum mode) { }
+ virtual WGC3Dboolean isBuffer(WebGLId buffer) { return false; }
+ virtual WGC3Dboolean isEnabled(WGC3Denum cap) { return false; }
+ virtual WGC3Dboolean isFramebuffer(WebGLId framebuffer) { return false; }
+ virtual WGC3Dboolean isProgram(WebGLId program) { return false; }
+ virtual WGC3Dboolean isRenderbuffer(WebGLId renderbuffer) { return false; }
+ virtual WGC3Dboolean isShader(WebGLId shader) { return false; }
+ virtual WGC3Dboolean isTexture(WebGLId texture) { return false; }
+ virtual void lineWidth(WGC3Dfloat) { }
+ virtual void linkProgram(WebGLId program) { }
+ virtual void pixelStorei(WGC3Denum pname, WGC3Dint param) { }
+ virtual void polygonOffset(WGC3Dfloat factor, WGC3Dfloat units) { }
+
+ virtual void readPixels(WGC3Dint x, WGC3Dint y, WGC3Dsizei width, WGC3Dsizei height, WGC3Denum format, WGC3Denum type, void* pixels) { }
+
+ virtual void releaseShaderCompiler() { }
+
+ virtual void renderbufferStorage(WGC3Denum target, WGC3Denum internalformat, WGC3Dsizei width, WGC3Dsizei height) { }
+ virtual void sampleCoverage(WGC3Dclampf value, WGC3Dboolean invert) { }
+ virtual void scissor(WGC3Dint x, WGC3Dint y, WGC3Dsizei width, WGC3Dsizei height) { }
+ virtual void shaderSource(WebGLId shader, const WGC3Dchar* string) { }
+ virtual void stencilFunc(WGC3Denum func, WGC3Dint ref, WGC3Duint mask) { }
+ virtual void stencilFuncSeparate(WGC3Denum face, WGC3Denum func, WGC3Dint ref, WGC3Duint mask) { }
+ virtual void stencilMask(WGC3Duint mask) { }
+ virtual void stencilMaskSeparate(WGC3Denum face, WGC3Duint mask) { }
+ virtual void stencilOp(WGC3Denum fail, WGC3Denum zfail, WGC3Denum zpass) { }
+ virtual void stencilOpSeparate(WGC3Denum face, WGC3Denum fail, WGC3Denum zfail, WGC3Denum zpass) { }
+
+ virtual void texImage2D(WGC3Denum target, WGC3Dint level, WGC3Denum internalformat, WGC3Dsizei width, WGC3Dsizei height, WGC3Dint border, WGC3Denum format, WGC3Denum type, const void* pixels) { }
+
+ virtual void texParameterf(WGC3Denum target, WGC3Denum pname, WGC3Dfloat param) { }
+ virtual void texParameteri(WGC3Denum target, WGC3Denum pname, WGC3Dint param) { }
+
+ virtual void texSubImage2D(WGC3Denum target, WGC3Dint level, WGC3Dint xoffset, WGC3Dint yoffset, WGC3Dsizei width, WGC3Dsizei height, WGC3Denum format, WGC3Denum type, const void* pixels) { }
+
+ virtual void uniform1f(WGC3Dint location, WGC3Dfloat x) { }
+ virtual void uniform1fv(WGC3Dint location, WGC3Dsizei count, const WGC3Dfloat* v) { }
+ virtual void uniform1i(WGC3Dint location, WGC3Dint x) { }
+ virtual void uniform1iv(WGC3Dint location, WGC3Dsizei count, const WGC3Dint* v) { }
+ virtual void uniform2f(WGC3Dint location, WGC3Dfloat x, WGC3Dfloat y) { }
+ virtual void uniform2fv(WGC3Dint location, WGC3Dsizei count, const WGC3Dfloat* v) { }
+ virtual void uniform2i(WGC3Dint location, WGC3Dint x, WGC3Dint y) { }
+ virtual void uniform2iv(WGC3Dint location, WGC3Dsizei count, const WGC3Dint* v) { }
+ virtual void uniform3f(WGC3Dint location, WGC3Dfloat x, WGC3Dfloat y, WGC3Dfloat z) { }
+ virtual void uniform3fv(WGC3Dint location, WGC3Dsizei count, const WGC3Dfloat* v) { }
+ virtual void uniform3i(WGC3Dint location, WGC3Dint x, WGC3Dint y, WGC3Dint z) { }
+ virtual void uniform3iv(WGC3Dint location, WGC3Dsizei count, const WGC3Dint* v) { }
+ virtual void uniform4f(WGC3Dint location, WGC3Dfloat x, WGC3Dfloat y, WGC3Dfloat z, WGC3Dfloat w) { }
+ virtual void uniform4fv(WGC3Dint location, WGC3Dsizei count, const WGC3Dfloat* v) { }
+ virtual void uniform4i(WGC3Dint location, WGC3Dint x, WGC3Dint y, WGC3Dint z, WGC3Dint w) { }
+ virtual void uniform4iv(WGC3Dint location, WGC3Dsizei count, const WGC3Dint* v) { }
+ virtual void uniformMatrix2fv(WGC3Dint location, WGC3Dsizei count, WGC3Dboolean transpose, const WGC3Dfloat* value) { }
+ virtual void uniformMatrix3fv(WGC3Dint location, WGC3Dsizei count, WGC3Dboolean transpose, const WGC3Dfloat* value) { }
+ virtual void uniformMatrix4fv(WGC3Dint location, WGC3Dsizei count, WGC3Dboolean transpose, const WGC3Dfloat* value) { }
+
+ virtual void useProgram(WebGLId program) { }
+ virtual void validateProgram(WebGLId program) { }
+
+ virtual void vertexAttrib1f(WGC3Duint index, WGC3Dfloat x) { }
+ virtual void vertexAttrib1fv(WGC3Duint index, const WGC3Dfloat* values) { }
+ virtual void vertexAttrib2f(WGC3Duint index, WGC3Dfloat x, WGC3Dfloat y) { }
+ virtual void vertexAttrib2fv(WGC3Duint index, const WGC3Dfloat* values) { }
+ virtual void vertexAttrib3f(WGC3Duint index, WGC3Dfloat x, WGC3Dfloat y, WGC3Dfloat z) { }
+ virtual void vertexAttrib3fv(WGC3Duint index, const WGC3Dfloat* values) { }
+ virtual void vertexAttrib4f(WGC3Duint index, WGC3Dfloat x, WGC3Dfloat y, WGC3Dfloat z, WGC3Dfloat w) { }
+ virtual void vertexAttrib4fv(WGC3Duint index, const WGC3Dfloat* values) { }
+ virtual void vertexAttribPointer(WGC3Duint index, WGC3Dint size, WGC3Denum type, WGC3Dboolean normalized,
+ WGC3Dsizei stride, WGC3Dintptr offset) { }
+
+ virtual void viewport(WGC3Dint x, WGC3Dint y, WGC3Dsizei width, WGC3Dsizei height) { }
+
+ virtual WebGLId createBuffer() { return 0; }
+ virtual WebGLId createFramebuffer() { return 0; }
+ virtual WebGLId createProgram() { return 0; }
+ virtual WebGLId createRenderbuffer() { return 0; }
+ virtual WebGLId createShader(WGC3Denum) { return 0; }
+ virtual WebGLId createTexture() { return 0; }
+
+ virtual void deleteBuffer(WebGLId) { }
+ virtual void deleteFramebuffer(WebGLId) { }
+ virtual void deleteProgram(WebGLId) { }
+ virtual void deleteRenderbuffer(WebGLId) { }
+ virtual void deleteShader(WebGLId) { }
+ virtual void deleteTexture(WebGLId) { }
+};
+
+} // namespace WebKit
+
+#endif // MockWebGraphicsContext3D_h
Added: trunk/Source/WebKit/chromium/tests/MockWebGraphicsContext3DTest.cpp (0 => 93928)
--- trunk/Source/WebKit/chromium/tests/MockWebGraphicsContext3DTest.cpp (rev 0)
+++ trunk/Source/WebKit/chromium/tests/MockWebGraphicsContext3DTest.cpp 2011-08-27 00:41:33 UTC (rev 93928)
@@ -0,0 +1,100 @@
+/*
+ * Copyright (C) 2011 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+
+#include "MockWebGraphicsContext3D.h"
+
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
+using namespace WebKit;
+using namespace testing;
+
+TEST(MockWebGraphicsContext3DTest, BasicMockDoesNothing)
+{
+ MockWebGraphicsContext3D context;
+ EXPECT_FALSE(context.makeContextCurrent());
+}
+
+class FrameCountingContext : public MockWebGraphicsContext3D {
+public:
+ FrameCountingContext() : m_frame(0) { }
+
+ // This method would normally do a glSwapBuffers under the hood.
+ virtual void prepareTexture() { m_frame++; }
+
+ int frameCount() { return m_frame; }
+
+private:
+ int m_frame;
+};
+
+TEST(MockWebGraphicsContext3DTest, CanOverrideManually)
+{
+ FrameCountingContext context;
+
+ context.makeContextCurrent();
+ for (int i = 0; i < 10; i++) {
+ context.clearColor(0, 0, 0, 1);
+ context.prepareTexture();
+ }
+ context.finish();
+
+ EXPECT_EQ(10, context.frameCount());
+}
+
+class GMockContext : public MockWebGraphicsContext3D {
+public:
+ MOCK_METHOD0(width, int());
+ MOCK_METHOD0(height, int());
+ MOCK_METHOD1(synthesizeGLError, void(WGC3Denum error));
+ MOCK_METHOD0(getError, WGC3Denum());
+};
+
+TEST(MockWebGraphicsContext3DTest, CanUseGMock)
+{
+ GMockContext context;
+
+ EXPECT_CALL(context, width())
+ .WillRepeatedly(Return(512));
+
+ EXPECT_CALL(context, height())
+ .WillRepeatedly(Return(384));
+
+ EXPECT_CALL(context, synthesizeGLError(_)) // Any parameter accepted
+ .Times(Exactly(10));
+
+ // No expectation for getError(), so calling that would make our test fail.
+
+ for (int i = 0; i < 10; i++) {
+ context.synthesizeGLError(i);
+ EXPECT_EQ(512, context.width());
+ EXPECT_EQ(384, context.height());
+
+ // It's OK to call methods GMock doesn't know about.
+ EXPECT_FALSE(context.makeContextCurrent());
+ }
+}
_______________________________________________ webkit-changes mailing list [email protected] http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
