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

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

Issue 671663002: Standardize usage of virtual/override/final in content/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
« no previous file with comments | « content/common/gpu/gpu_memory_buffer_factory_mac.cc ('k') | content/common/gpu/image_transport_surface.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/gpu/gpu_memory_manager_unittest.cc
diff --git a/content/common/gpu/gpu_memory_manager_unittest.cc b/content/common/gpu/gpu_memory_manager_unittest.cc
index 6ea1b266ce7777842263d0ccb5c8a3f27f44bd9b..9d301690db53aab6d1685f4c9dc27004a8e81334 100644
--- a/content/common/gpu/gpu_memory_manager_unittest.cc
+++ b/content/common/gpu/gpu_memory_manager_unittest.cc
@@ -14,17 +14,15 @@ using gpu::MemoryAllocation;
class FakeMemoryTracker : public gpu::gles2::MemoryTracker {
public:
- virtual void TrackMemoryAllocatedChange(
+ void TrackMemoryAllocatedChange(
size_t /* old_size */,
size_t /* new_size */,
- gpu::gles2::MemoryTracker::Pool /* pool */) override {
- }
- virtual bool EnsureGPUMemoryAvailable(size_t /* size_needed */) override {
+ gpu::gles2::MemoryTracker::Pool /* pool */) override {}
+ bool EnsureGPUMemoryAvailable(size_t /* size_needed */) override {
return true;
}
private:
- virtual ~FakeMemoryTracker() {
- }
+ ~FakeMemoryTracker() override {}
};
namespace content {
@@ -99,22 +97,22 @@ class FakeClient : public GpuMemoryManagerClient {
memmgr_->CreateClientState(this, surface_id != 0, visible));
}
- virtual ~FakeClient() {
+ ~FakeClient() override {
client_state_.reset();
tracking_group_.reset();
memory_tracker_ = NULL;
}
- virtual void SetMemoryAllocation(const MemoryAllocation& alloc) override {
+ void SetMemoryAllocation(const MemoryAllocation& alloc) override {
allocation_ = alloc;
ClientAssignmentCollector::AddClientStat(this, alloc);
}
- virtual void SuggestHaveFrontBuffer(bool suggest_have_frontbuffer) override {
+ void SuggestHaveFrontBuffer(bool suggest_have_frontbuffer) override {
suggest_have_frontbuffer_ = suggest_have_frontbuffer;
}
- virtual bool GetTotalGpuMemory(uint64* bytes) override {
+ bool GetTotalGpuMemory(uint64* bytes) override {
if (total_gpu_memory_) {
*bytes = total_gpu_memory_;
return true;
@@ -123,15 +121,13 @@ class FakeClient : public GpuMemoryManagerClient {
}
void SetTotalGpuMemory(uint64 bytes) { total_gpu_memory_ = bytes; }
- virtual gpu::gles2::MemoryTracker* GetMemoryTracker() const override {
+ gpu::gles2::MemoryTracker* GetMemoryTracker() const override {
if (share_group_)
return share_group_->GetMemoryTracker();
return memory_tracker_.get();
}
- virtual gfx::Size GetSurfaceSize() const override {
- return surface_size_;
- }
+ gfx::Size GetSurfaceSize() const override { return surface_size_; }
void SetSurfaceSize(gfx::Size size) { surface_size_ = size; }
void SetVisible(bool visible) {
« no previous file with comments | « content/common/gpu/gpu_memory_buffer_factory_mac.cc ('k') | content/common/gpu/image_transport_surface.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698