| Index: cc/test/test_web_graphics_context_3d.cc
|
| diff --git a/cc/test/fake_web_graphics_context_3d.cc b/cc/test/test_web_graphics_context_3d.cc
|
| similarity index 53%
|
| rename from cc/test/fake_web_graphics_context_3d.cc
|
| rename to cc/test/test_web_graphics_context_3d.cc
|
| index b5ee8055cf01154e4a3e8b10b806beeddf991d0c..07b17ff1ffbe3e03b42f112095260ea18ca9ddc2 100644
|
| --- a/cc/test/fake_web_graphics_context_3d.cc
|
| +++ b/cc/test/test_web_graphics_context_3d.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "cc/test/fake_web_graphics_context_3d.h"
|
| +#include "cc/test/test_web_graphics_context_3d.h"
|
|
|
| #include <algorithm>
|
| #include <string>
|
| @@ -27,10 +27,11 @@ static const WebGLId kShaderId = 5;
|
|
|
| static unsigned s_context_id = 1;
|
|
|
| -const WebGLId FakeWebGraphicsContext3D::kExternalTextureId = 1337;
|
| +const WebGLId TestWebGraphicsContext3D::kExternalTextureId = 1337;
|
|
|
| -FakeWebGraphicsContext3D::FakeWebGraphicsContext3D()
|
| - : context_id_(s_context_id++),
|
| +TestWebGraphicsContext3D::TestWebGraphicsContext3D()
|
| + : FakeWebGraphicsContext3D(),
|
| + context_id_(s_context_id++),
|
| next_texture_id_(1),
|
| have_extension_io_surface_(false),
|
| have_extension_egl_image_(false),
|
| @@ -43,9 +44,10 @@ FakeWebGraphicsContext3D::FakeWebGraphicsContext3D()
|
| height_(0) {
|
| }
|
|
|
| -FakeWebGraphicsContext3D::FakeWebGraphicsContext3D(
|
| +TestWebGraphicsContext3D::TestWebGraphicsContext3D(
|
| const WebGraphicsContext3D::Attributes& attributes)
|
| - : context_id_(s_context_id++),
|
| + : FakeWebGraphicsContext3D(),
|
| + context_id_(s_context_id++),
|
| next_texture_id_(1),
|
| attributes_(attributes),
|
| have_extension_io_surface_(false),
|
| @@ -59,10 +61,10 @@ FakeWebGraphicsContext3D::FakeWebGraphicsContext3D(
|
| height_(0) {
|
| }
|
|
|
| -FakeWebGraphicsContext3D::~FakeWebGraphicsContext3D() {
|
| +TestWebGraphicsContext3D::~TestWebGraphicsContext3D() {
|
| }
|
|
|
| -bool FakeWebGraphicsContext3D::makeContextCurrent() {
|
| +bool TestWebGraphicsContext3D::makeContextCurrent() {
|
| if (times_make_current_succeeds_ >= 0) {
|
| if (!times_make_current_succeeds_) {
|
| loseContextCHROMIUM(GL_GUILTY_CONTEXT_RESET_ARB,
|
| @@ -73,144 +75,40 @@ bool FakeWebGraphicsContext3D::makeContextCurrent() {
|
| return !context_lost_;
|
| }
|
|
|
| -int FakeWebGraphicsContext3D::width() {
|
| +int TestWebGraphicsContext3D::width() {
|
| return width_;
|
| }
|
|
|
| -int FakeWebGraphicsContext3D::height() {
|
| +int TestWebGraphicsContext3D::height() {
|
| return height_;
|
| }
|
|
|
| -void FakeWebGraphicsContext3D::reshape(int width, int height) {
|
| +void TestWebGraphicsContext3D::reshape(int width, int height) {
|
| width_ = width;
|
| height_ = height;
|
| }
|
|
|
| -bool FakeWebGraphicsContext3D::isGLES2Compliant() {
|
| - return false;
|
| -}
|
| -
|
| -bool FakeWebGraphicsContext3D::readBackFramebuffer(
|
| - unsigned char* pixels,
|
| - size_t bufferSize,
|
| - WebGLId framebuffer,
|
| - int width,
|
| - int height) {
|
| - return false;
|
| -}
|
| -
|
| -WebGLId FakeWebGraphicsContext3D::getPlatformTextureId() {
|
| - return 0;
|
| -}
|
| -
|
| -bool FakeWebGraphicsContext3D::isContextLost() {
|
| +bool TestWebGraphicsContext3D::isContextLost() {
|
| return context_lost_;
|
| }
|
|
|
| -WGC3Denum FakeWebGraphicsContext3D::getGraphicsResetStatusARB() {
|
| +WGC3Denum TestWebGraphicsContext3D::getGraphicsResetStatusARB() {
|
| return context_lost_ ? GL_UNKNOWN_CONTEXT_RESET_ARB : GL_NO_ERROR;
|
| }
|
|
|
| -void* FakeWebGraphicsContext3D::mapBufferSubDataCHROMIUM(
|
| - WGC3Denum target,
|
| - WebKit::WGC3Dintptr offset,
|
| - WebKit::WGC3Dsizeiptr size,
|
| - WGC3Denum access) {
|
| - return 0;
|
| -}
|
| -
|
| -void* FakeWebGraphicsContext3D::mapTexSubImage2DCHROMIUM(
|
| - WGC3Denum target,
|
| - WebKit::WGC3Dint level,
|
| - WebKit::WGC3Dint xoffset,
|
| - WebKit::WGC3Dint yoffset,
|
| - WebKit::WGC3Dsizei width,
|
| - WebKit::WGC3Dsizei height,
|
| - WGC3Denum format,
|
| - WGC3Denum type,
|
| - WGC3Denum access) {
|
| - return 0;
|
| -}
|
| -
|
| -WebKit::WebString FakeWebGraphicsContext3D::getRequestableExtensionsCHROMIUM() {
|
| - return WebKit::WebString();
|
| -}
|
| -
|
| -WGC3Denum FakeWebGraphicsContext3D::checkFramebufferStatus(
|
| +WGC3Denum TestWebGraphicsContext3D::checkFramebufferStatus(
|
| WGC3Denum target) {
|
| if (context_lost_)
|
| return GL_FRAMEBUFFER_UNDEFINED_OES;
|
| return GL_FRAMEBUFFER_COMPLETE;
|
| }
|
|
|
| -bool FakeWebGraphicsContext3D::getActiveAttrib(
|
| - WebGLId program,
|
| - WebKit::WGC3Duint index,
|
| - ActiveInfo&) {
|
| - return false;
|
| -}
|
| -
|
| -bool FakeWebGraphicsContext3D::getActiveUniform(
|
| - WebGLId program,
|
| - WebKit::WGC3Duint index,
|
| - ActiveInfo&) {
|
| - return false;
|
| -}
|
| -
|
| -WebKit::WGC3Dint FakeWebGraphicsContext3D::getAttribLocation(
|
| - WebGLId program,
|
| - const WebKit::WGC3Dchar* name) {
|
| - return 0;
|
| -}
|
| -
|
| WebGraphicsContext3D::Attributes
|
| - FakeWebGraphicsContext3D::getContextAttributes() {
|
| + TestWebGraphicsContext3D::getContextAttributes() {
|
| return attributes_;
|
| }
|
|
|
| -WGC3Denum FakeWebGraphicsContext3D::getError() {
|
| - return 0;
|
| -}
|
| -
|
| -void FakeWebGraphicsContext3D::getIntegerv(
|
| - WGC3Denum pname,
|
| - WebKit::WGC3Dint* value) {
|
| - if (pname == GL_MAX_TEXTURE_SIZE)
|
| - *value = 1024;
|
| -}
|
| -
|
| -void FakeWebGraphicsContext3D::getProgramiv(
|
| - WebGLId program,
|
| - WGC3Denum pname,
|
| - WebKit::WGC3Dint* value) {
|
| - if (pname == GL_LINK_STATUS)
|
| - *value = 1;
|
| -}
|
| -
|
| -WebKit::WebString FakeWebGraphicsContext3D::getProgramInfoLog(
|
| - WebGLId program) {
|
| - return WebKit::WebString();
|
| -}
|
| -
|
| -void FakeWebGraphicsContext3D::getShaderiv(
|
| - WebGLId shader,
|
| - WGC3Denum pname,
|
| - WebKit::WGC3Dint* value) {
|
| - if (pname == GL_COMPILE_STATUS)
|
| - *value = 1;
|
| -}
|
| -
|
| -WebKit::WebString FakeWebGraphicsContext3D::getShaderInfoLog(
|
| - WebGLId shader) {
|
| - return WebKit::WebString();
|
| -}
|
| -
|
| -WebKit::WebString FakeWebGraphicsContext3D::getShaderSource(
|
| - WebGLId shader) {
|
| - return WebKit::WebString();
|
| -}
|
| -
|
| -WebKit::WebString FakeWebGraphicsContext3D::getString(WGC3Denum name) {
|
| +WebKit::WebString TestWebGraphicsContext3D::getString(WGC3Denum name) {
|
| std::string string;
|
|
|
| if (name == GL_EXTENSIONS) {
|
| @@ -223,138 +121,138 @@ WebKit::WebString FakeWebGraphicsContext3D::getString(WGC3Denum name) {
|
| return WebKit::WebString::fromUTF8(string.c_str());
|
| }
|
|
|
| -WebKit::WGC3Dint FakeWebGraphicsContext3D::getUniformLocation(
|
| +WebKit::WGC3Dint TestWebGraphicsContext3D::getUniformLocation(
|
| WebGLId program,
|
| const WebKit::WGC3Dchar* name) {
|
| return 0;
|
| }
|
|
|
| -WebKit::WGC3Dsizeiptr FakeWebGraphicsContext3D::getVertexAttribOffset(
|
| +WebKit::WGC3Dsizeiptr TestWebGraphicsContext3D::getVertexAttribOffset(
|
| WebKit::WGC3Duint index,
|
| WGC3Denum pname) {
|
| return 0;
|
| }
|
|
|
| -WGC3Dboolean FakeWebGraphicsContext3D::isBuffer(
|
| +WGC3Dboolean TestWebGraphicsContext3D::isBuffer(
|
| WebGLId buffer) {
|
| return false;
|
| }
|
|
|
| -WGC3Dboolean FakeWebGraphicsContext3D::isEnabled(
|
| +WGC3Dboolean TestWebGraphicsContext3D::isEnabled(
|
| WGC3Denum cap) {
|
| return false;
|
| }
|
|
|
| -WGC3Dboolean FakeWebGraphicsContext3D::isFramebuffer(
|
| +WGC3Dboolean TestWebGraphicsContext3D::isFramebuffer(
|
| WebGLId framebuffer) {
|
| return false;
|
| }
|
|
|
| -WGC3Dboolean FakeWebGraphicsContext3D::isProgram(
|
| +WGC3Dboolean TestWebGraphicsContext3D::isProgram(
|
| WebGLId program) {
|
| return false;
|
| }
|
|
|
| -WGC3Dboolean FakeWebGraphicsContext3D::isRenderbuffer(
|
| +WGC3Dboolean TestWebGraphicsContext3D::isRenderbuffer(
|
| WebGLId renderbuffer) {
|
| return false;
|
| }
|
|
|
| -WGC3Dboolean FakeWebGraphicsContext3D::isShader(
|
| +WGC3Dboolean TestWebGraphicsContext3D::isShader(
|
| WebGLId shader) {
|
| return false;
|
| }
|
|
|
| -WGC3Dboolean FakeWebGraphicsContext3D::isTexture(
|
| +WGC3Dboolean TestWebGraphicsContext3D::isTexture(
|
| WebGLId texture) {
|
| return false;
|
| }
|
|
|
| -WebGLId FakeWebGraphicsContext3D::createBuffer() {
|
| +WebGLId TestWebGraphicsContext3D::createBuffer() {
|
| return kBufferId | context_id_ << 16;
|
| }
|
|
|
| -void FakeWebGraphicsContext3D::deleteBuffer(WebKit::WebGLId id) {
|
| +void TestWebGraphicsContext3D::deleteBuffer(WebKit::WebGLId id) {
|
| EXPECT_EQ(kBufferId | context_id_ << 16, id);
|
| }
|
|
|
| -WebGLId FakeWebGraphicsContext3D::createFramebuffer() {
|
| +WebGLId TestWebGraphicsContext3D::createFramebuffer() {
|
| return kFramebufferId | context_id_ << 16;
|
| }
|
|
|
| -void FakeWebGraphicsContext3D::deleteFramebuffer(WebKit::WebGLId id) {
|
| +void TestWebGraphicsContext3D::deleteFramebuffer(WebKit::WebGLId id) {
|
| EXPECT_EQ(kFramebufferId | context_id_ << 16, id);
|
| }
|
|
|
| -WebGLId FakeWebGraphicsContext3D::createProgram() {
|
| +WebGLId TestWebGraphicsContext3D::createProgram() {
|
| return kProgramId | context_id_ << 16;
|
| }
|
|
|
| -void FakeWebGraphicsContext3D::deleteProgram(WebKit::WebGLId id) {
|
| +void TestWebGraphicsContext3D::deleteProgram(WebKit::WebGLId id) {
|
| EXPECT_EQ(kProgramId | context_id_ << 16, id);
|
| }
|
|
|
| -WebGLId FakeWebGraphicsContext3D::createRenderbuffer() {
|
| +WebGLId TestWebGraphicsContext3D::createRenderbuffer() {
|
| return kRenderbufferId | context_id_ << 16;
|
| }
|
|
|
| -void FakeWebGraphicsContext3D::deleteRenderbuffer(WebKit::WebGLId id) {
|
| +void TestWebGraphicsContext3D::deleteRenderbuffer(WebKit::WebGLId id) {
|
| EXPECT_EQ(kRenderbufferId | context_id_ << 16, id);
|
| }
|
|
|
| -WebGLId FakeWebGraphicsContext3D::createShader(WGC3Denum) {
|
| +WebGLId TestWebGraphicsContext3D::createShader(WGC3Denum) {
|
| return kShaderId | context_id_ << 16;
|
| }
|
|
|
| -void FakeWebGraphicsContext3D::deleteShader(WebKit::WebGLId id) {
|
| +void TestWebGraphicsContext3D::deleteShader(WebKit::WebGLId id) {
|
| EXPECT_EQ(kShaderId | context_id_ << 16, id);
|
| }
|
|
|
| -WebGLId FakeWebGraphicsContext3D::createTexture() {
|
| +WebGLId TestWebGraphicsContext3D::createTexture() {
|
| WebGLId texture_id = NextTextureId();
|
| DCHECK_NE(texture_id, kExternalTextureId);
|
| textures_.push_back(texture_id);
|
| return texture_id;
|
| }
|
|
|
| -void FakeWebGraphicsContext3D::deleteTexture(WebGLId texture_id) {
|
| +void TestWebGraphicsContext3D::deleteTexture(WebGLId texture_id) {
|
| DCHECK(std::find(textures_.begin(), textures_.end(), texture_id) !=
|
| textures_.end());
|
| textures_.erase(std::find(textures_.begin(), textures_.end(), texture_id));
|
| }
|
|
|
| -void FakeWebGraphicsContext3D::attachShader(WebGLId program, WebGLId shader) {
|
| +void TestWebGraphicsContext3D::attachShader(WebGLId program, WebGLId shader) {
|
| EXPECT_EQ(kProgramId | context_id_ << 16, program);
|
| EXPECT_EQ(kShaderId | context_id_ << 16, shader);
|
| }
|
|
|
| -void FakeWebGraphicsContext3D::useProgram(WebGLId program) {
|
| +void TestWebGraphicsContext3D::useProgram(WebGLId program) {
|
| if (!program)
|
| return;
|
| EXPECT_EQ(kProgramId | context_id_ << 16, program);
|
| }
|
|
|
| -void FakeWebGraphicsContext3D::bindBuffer(WGC3Denum target, WebGLId buffer) {
|
| +void TestWebGraphicsContext3D::bindBuffer(WGC3Denum target, WebGLId buffer) {
|
| if (!buffer)
|
| return;
|
| EXPECT_EQ(kBufferId | context_id_ << 16, buffer);
|
| }
|
|
|
| -void FakeWebGraphicsContext3D::bindFramebuffer(
|
| +void TestWebGraphicsContext3D::bindFramebuffer(
|
| WGC3Denum target, WebGLId framebuffer) {
|
| if (!framebuffer)
|
| return;
|
| EXPECT_EQ(kFramebufferId | context_id_ << 16, framebuffer);
|
| }
|
|
|
| -void FakeWebGraphicsContext3D::bindRenderbuffer(
|
| +void TestWebGraphicsContext3D::bindRenderbuffer(
|
| WGC3Denum target, WebGLId renderbuffer) {
|
| if (!renderbuffer)
|
| return;
|
| EXPECT_EQ(kRenderbufferId | context_id_ << 16, renderbuffer);
|
| }
|
|
|
| -void FakeWebGraphicsContext3D::bindTexture(
|
| +void TestWebGraphicsContext3D::bindTexture(
|
| WGC3Denum target, WebGLId texture_id) {
|
| if (times_bind_texture_succeeds_ >= 0) {
|
| if (!times_bind_texture_succeeds_) {
|
| @@ -373,15 +271,7 @@ void FakeWebGraphicsContext3D::bindTexture(
|
| used_textures_.insert(texture_id);
|
| }
|
|
|
| -WebGLId FakeWebGraphicsContext3D::createQueryEXT() {
|
| - return 1;
|
| -}
|
| -
|
| -WGC3Dboolean FakeWebGraphicsContext3D::isQueryEXT(WebGLId query) {
|
| - return true;
|
| -}
|
| -
|
| -void FakeWebGraphicsContext3D::endQueryEXT(WebKit::WGC3Denum target) {
|
| +void TestWebGraphicsContext3D::endQueryEXT(WebKit::WGC3Denum target) {
|
| if (times_end_query_succeeds_ >= 0) {
|
| if (!times_end_query_succeeds_) {
|
| loseContextCHROMIUM(GL_GUILTY_CONTEXT_RESET_ARB,
|
| @@ -391,7 +281,7 @@ void FakeWebGraphicsContext3D::endQueryEXT(WebKit::WGC3Denum target) {
|
| }
|
| }
|
|
|
| -void FakeWebGraphicsContext3D::getQueryObjectuivEXT(
|
| +void TestWebGraphicsContext3D::getQueryObjectuivEXT(
|
| WebKit::WebGLId query,
|
| WebKit::WGC3Denum pname,
|
| WebKit::WGC3Duint* params) {
|
| @@ -400,12 +290,12 @@ void FakeWebGraphicsContext3D::getQueryObjectuivEXT(
|
| *params = 1;
|
| }
|
|
|
| -void FakeWebGraphicsContext3D::setContextLostCallback(
|
| +void TestWebGraphicsContext3D::setContextLostCallback(
|
| WebGraphicsContextLostCallback* callback) {
|
| context_lost_callback_ = callback;
|
| }
|
|
|
| -void FakeWebGraphicsContext3D::loseContextCHROMIUM(WGC3Denum current,
|
| +void TestWebGraphicsContext3D::loseContextCHROMIUM(WGC3Denum current,
|
| WGC3Denum other) {
|
| if (context_lost_)
|
| return;
|
| @@ -414,7 +304,7 @@ void FakeWebGraphicsContext3D::loseContextCHROMIUM(WGC3Denum current,
|
| context_lost_callback_->onContextLost();
|
| }
|
|
|
| -WebKit::WebGLId FakeWebGraphicsContext3D::NextTextureId() {
|
| +WebKit::WebGLId TestWebGraphicsContext3D::NextTextureId() {
|
| WebGLId texture_id = next_texture_id_++;
|
| DCHECK(texture_id < (1 << 16));
|
| texture_id |= context_id_ << 16;
|
|
|