diff options
Diffstat (limited to 'cc/test')
-rw-r--r-- | cc/test/fake_tile_manager.cc | 15 | ||||
-rw-r--r-- | cc/test/fake_tile_manager.h | 3 | ||||
-rw-r--r-- | cc/test/test_web_graphics_context_3d.cc | 9 | ||||
-rw-r--r-- | cc/test/test_web_graphics_context_3d.h | 5 |
4 files changed, 0 insertions, 32 deletions
diff --git a/cc/test/fake_tile_manager.cc b/cc/test/fake_tile_manager.cc index 3b86035..d197c3f 100644 --- a/cc/test/fake_tile_manager.cc +++ b/cc/test/fake_tile_manager.cc @@ -5,7 +5,6 @@ #include "cc/test/fake_tile_manager.h" #include <deque> -#include <limits> #include "base/lazy_instance.h" #include "cc/resources/rasterizer.h" @@ -67,7 +66,6 @@ FakeTileManager::FakeTileManager(TileManagerClient* client) NULL, g_fake_rasterizer.Pointer(), g_fake_rasterizer.Pointer(), - std::numeric_limits<unsigned>::max(), true, NULL) {} @@ -77,7 +75,6 @@ FakeTileManager::FakeTileManager(TileManagerClient* client, resource_pool, g_fake_rasterizer.Pointer(), g_fake_rasterizer.Pointer(), - std::numeric_limits<unsigned>::max(), true, NULL) {} @@ -88,21 +85,9 @@ FakeTileManager::FakeTileManager(TileManagerClient* client, resource_pool, g_fake_rasterizer.Pointer(), g_fake_rasterizer.Pointer(), - std::numeric_limits<unsigned>::max(), allow_on_demand_raster, NULL) {} -FakeTileManager::FakeTileManager(TileManagerClient* client, - ResourcePool* resource_pool, - size_t raster_task_limit_bytes) - : TileManager(client, - resource_pool, - g_fake_rasterizer.Pointer(), - g_fake_rasterizer.Pointer(), - raster_task_limit_bytes, - true, - NULL) {} - FakeTileManager::~FakeTileManager() {} void FakeTileManager::AssignMemoryToTiles( diff --git a/cc/test/fake_tile_manager.h b/cc/test/fake_tile_manager.h index 162aebe..c5c7a25 100644 --- a/cc/test/fake_tile_manager.h +++ b/cc/test/fake_tile_manager.h @@ -19,9 +19,6 @@ class FakeTileManager : public TileManager { FakeTileManager(TileManagerClient* client, ResourcePool* resource_pool, bool allow_on_demand_raster); - FakeTileManager(TileManagerClient* client, - ResourcePool* resource_pool, - size_t raster_task_limit_bytes); virtual ~FakeTileManager(); bool HasBeenAssignedMemory(Tile* tile); diff --git a/cc/test/test_web_graphics_context_3d.cc b/cc/test/test_web_graphics_context_3d.cc index 7d03c38..613c5d0 100644 --- a/cc/test/test_web_graphics_context_3d.cc +++ b/cc/test/test_web_graphics_context_3d.cc @@ -67,7 +67,6 @@ TestWebGraphicsContext3D::TestWebGraphicsContext3D() next_insert_sync_point_(1), last_waited_sync_point_(0), bound_buffer_(0), - peak_transfer_buffer_memory_used_bytes_(0), weak_ptr_factory_(this) { CreateNamespace(); } @@ -503,10 +502,6 @@ void TestWebGraphicsContext3D::bufferData(GLenum target, buffer->size = size; if (data != NULL) memcpy(buffer->pixels.get(), data, size); - - peak_transfer_buffer_memory_used_bytes_ = - std::max(peak_transfer_buffer_memory_used_bytes_, - GetTransferBufferMemoryUsedBytes()); } void* TestWebGraphicsContext3D::mapBufferCHROMIUM(GLenum target, @@ -522,10 +517,6 @@ void* TestWebGraphicsContext3D::mapBufferCHROMIUM(GLenum target, --times_map_buffer_chromium_succeeds_; } - peak_transfer_buffer_memory_used_bytes_ = - std::max(peak_transfer_buffer_memory_used_bytes_, - GetTransferBufferMemoryUsedBytes()); - return buffers.get(bound_buffer_)->pixels.get(); } diff --git a/cc/test/test_web_graphics_context_3d.h b/cc/test/test_web_graphics_context_3d.h index ae32a27..3ce3ddd 100644 --- a/cc/test/test_web_graphics_context_3d.h +++ b/cc/test/test_web_graphics_context_3d.h @@ -325,9 +325,6 @@ class TestWebGraphicsContext3D { size_t GetTransferBufferMemoryUsedBytes() const; void SetMaxTransferBufferUsageBytes(size_t max_transfer_buffer_usage_bytes); - size_t GetPeakTransferBufferMemoryUsedBytes() const { - return peak_transfer_buffer_memory_used_bytes_; - } void set_test_support(TestContextSupport* test_support) { test_support_ = test_support; @@ -439,8 +436,6 @@ class TestWebGraphicsContext3D { unsigned bound_buffer_; TextureTargets texture_targets_; - size_t peak_transfer_buffer_memory_used_bytes_; - scoped_refptr<Namespace> namespace_; static Namespace* shared_namespace_; |