Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8)

Unified Diff: content/common/gpu/gpu_memory_manager_unittest.cc

Issue 12210030: Linux/ChromeOS Chromium style checker cleanup, content/ edition. (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/common/gpu/gpu_memory_manager_unittest.cc
===================================================================
--- content/common/gpu/gpu_memory_manager_unittest.cc (revision 181789)
+++ content/common/gpu/gpu_memory_manager_unittest.cc (working copy)
@@ -26,13 +26,13 @@
virtual void TrackMemoryAllocatedChange(
size_t /* old_size */,
size_t /* new_size */,
- gpu::gles2::MemoryTracker::Pool /* pool */) {
+ gpu::gles2::MemoryTracker::Pool /* pool */) OVERRIDE {
}
- virtual bool EnsureGPUMemoryAvailable(size_t /* size_needed */) {
+ virtual bool EnsureGPUMemoryAvailable(size_t /* size_needed */) OVERRIDE {
return true;
}
private:
- ~FakeMemoryTracker() {
+ virtual ~FakeMemoryTracker() {
}
};
@@ -109,18 +109,18 @@
this, surface_id != 0, visible));
}
- ~FakeClient() {
+ virtual ~FakeClient() {
client_state_.reset();
tracking_group_.reset();
memory_tracker_ = NULL;
}
- void SetMemoryAllocation(const GpuMemoryAllocation& alloc) {
+ virtual void SetMemoryAllocation(const GpuMemoryAllocation& alloc) OVERRIDE {
allocation_ = alloc;
ClientAssignmentCollector::AddClientStat(this, alloc);
}
- bool GetTotalGpuMemory(uint64* bytes) {
+ virtual bool GetTotalGpuMemory(uint64* bytes) OVERRIDE {
if (total_gpu_memory_) {
*bytes = total_gpu_memory_;
return true;
@@ -129,13 +129,13 @@
}
void SetTotalGpuMemory(uint64 bytes) { total_gpu_memory_ = bytes; }
- gpu::gles2::MemoryTracker* GetMemoryTracker() const OVERRIDE {
+ virtual gpu::gles2::MemoryTracker* GetMemoryTracker() const OVERRIDE {
if (share_group_)
return share_group_->GetMemoryTracker();
return memory_tracker_.get();
}
- gfx::Size GetSurfaceSize() const {
+ virtual gfx::Size GetSurfaceSize() const OVERRIDE {
return surface_size_;
}
void SetSurfaceSize(gfx::Size size) { surface_size_ = size; }
« no previous file with comments | « content/common/gpu/gpu_command_buffer_stub.cc ('k') | content/common/gpu/media/video_decode_accelerator_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698