| Index: cc/debug/test_web_graphics_context_3d.cc
|
| diff --git a/cc/debug/test_web_graphics_context_3d.cc b/cc/debug/test_web_graphics_context_3d.cc
|
| index 229ef636de31d424db3c2130564b60c5cca4402e..831bb126e72ce66e1b1983082663df10a714a4ce 100644
|
| --- a/cc/debug/test_web_graphics_context_3d.cc
|
| +++ b/cc/debug/test_web_graphics_context_3d.cc
|
| @@ -58,12 +58,6 @@ scoped_ptr<TestWebGraphicsContext3D> TestWebGraphicsContext3D::Create() {
|
| return make_scoped_ptr(new TestWebGraphicsContext3D());
|
| }
|
|
|
| -// static
|
| -base::Callback<scoped_ptr<TestWebGraphicsContext3D>()>
|
| -TestWebGraphicsContext3D::CreateFactory() {
|
| - return base::Bind(&TestWebGraphicsContext3D::Create);
|
| -}
|
| -
|
| TestWebGraphicsContext3D::TestWebGraphicsContext3D()
|
| : FakeWebGraphicsContext3D(),
|
| context_id_(s_context_id++),
|
| @@ -79,7 +73,6 @@ TestWebGraphicsContext3D::TestWebGraphicsContext3D()
|
| times_map_buffer_chromium_succeeds_(-1),
|
| context_lost_callback_(NULL),
|
| swap_buffers_callback_(NULL),
|
| - memory_allocation_changed_callback_(NULL),
|
| max_texture_size_(1024),
|
| width_(0),
|
| height_(0),
|
| @@ -105,7 +98,6 @@ TestWebGraphicsContext3D::TestWebGraphicsContext3D(
|
| times_map_buffer_chromium_succeeds_(-1),
|
| context_lost_callback_(NULL),
|
| swap_buffers_callback_(NULL),
|
| - memory_allocation_changed_callback_(NULL),
|
| max_texture_size_(1024),
|
| width_(0),
|
| height_(0),
|
| @@ -439,11 +431,6 @@ void TestWebGraphicsContext3D::setSwapBuffersCompleteCallbackCHROMIUM(
|
| swap_buffers_callback_ = callback;
|
| }
|
|
|
| -void TestWebGraphicsContext3D::setMemoryAllocationChangedCallbackCHROMIUM(
|
| - WebGraphicsMemoryAllocationChangedCallbackCHROMIUM* callback) {
|
| - memory_allocation_changed_callback_ = callback;
|
| -}
|
| -
|
| void TestWebGraphicsContext3D::prepareTexture() {
|
| if (swap_buffers_callback_) {
|
| base::MessageLoop::current()->PostTask(
|
| @@ -636,13 +623,6 @@ WebKit::WGC3Duint TestWebGraphicsContext3D::NextImageId() {
|
| return image_id;
|
| }
|
|
|
| -void TestWebGraphicsContext3D::SetMemoryAllocation(
|
| - WebKit::WebGraphicsMemoryAllocation allocation) {
|
| - if (!memory_allocation_changed_callback_)
|
| - return;
|
| - memory_allocation_changed_callback_->onMemoryAllocationChanged(allocation);
|
| -}
|
| -
|
| TestWebGraphicsContext3D::Buffer::Buffer() : target(0) {}
|
|
|
| TestWebGraphicsContext3D::Buffer::~Buffer() {}
|
|
|