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

Side by Side Diff: gpu/command_buffer/service/query_manager_unittest.cc

Issue 629913002: Replacing the OVERRIDE with override and FINAL with final in gpu (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Included autogen python file for OVERRIDE 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "gpu/command_buffer/service/query_manager.h" 5 #include "gpu/command_buffer/service/query_manager.h"
6 #include "gpu/command_buffer/common/gles2_cmd_format.h" 6 #include "gpu/command_buffer/common/gles2_cmd_format.h"
7 #include "gpu/command_buffer/service/cmd_buffer_engine.h" 7 #include "gpu/command_buffer/service/cmd_buffer_engine.h"
8 #include "gpu/command_buffer/service/error_state_mock.h" 8 #include "gpu/command_buffer/service/error_state_mock.h"
9 #include "gpu/command_buffer/service/feature_info.h" 9 #include "gpu/command_buffer/service/feature_info.h"
10 #include "gpu/command_buffer/service/gles2_cmd_decoder.h" 10 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 valid_buffer_ = 93 valid_buffer_ =
94 MakeBufferFromSharedMemory(shared_memory.Pass(), kSharedBufferSize); 94 MakeBufferFromSharedMemory(shared_memory.Pass(), kSharedBufferSize);
95 data_ = static_cast<uint8*>(valid_buffer_->memory()); 95 data_ = static_cast<uint8*>(valid_buffer_->memory());
96 ClearSharedMemory(); 96 ClearSharedMemory();
97 } 97 }
98 98
99 virtual ~MockCommandBufferEngine() { 99 virtual ~MockCommandBufferEngine() {
100 } 100 }
101 101
102 virtual scoped_refptr<gpu::Buffer> GetSharedMemoryBuffer(int32 shm_id) 102 virtual scoped_refptr<gpu::Buffer> GetSharedMemoryBuffer(int32 shm_id)
103 OVERRIDE { 103 override {
104 return shm_id == kSharedMemoryId ? valid_buffer_ : invalid_buffer_; 104 return shm_id == kSharedMemoryId ? valid_buffer_ : invalid_buffer_;
105 } 105 }
106 106
107 void ClearSharedMemory() { 107 void ClearSharedMemory() {
108 memset(data_, kInitialMemoryValue, kSharedBufferSize); 108 memset(data_, kInitialMemoryValue, kSharedBufferSize);
109 } 109 }
110 110
111 virtual void set_token(int32 token) OVERRIDE { 111 virtual void set_token(int32 token) override {
112 DCHECK(false); 112 DCHECK(false);
113 } 113 }
114 114
115 virtual bool SetGetBuffer(int32 /* transfer_buffer_id */) OVERRIDE { 115 virtual bool SetGetBuffer(int32 /* transfer_buffer_id */) override {
116 DCHECK(false); 116 DCHECK(false);
117 return false; 117 return false;
118 } 118 }
119 119
120 // Overridden from CommandBufferEngine. 120 // Overridden from CommandBufferEngine.
121 virtual bool SetGetOffset(int32 offset) OVERRIDE { 121 virtual bool SetGetOffset(int32 offset) override {
122 DCHECK(false); 122 DCHECK(false);
123 return false; 123 return false;
124 } 124 }
125 125
126 // Overridden from CommandBufferEngine. 126 // Overridden from CommandBufferEngine.
127 virtual int32 GetGetOffset() OVERRIDE { 127 virtual int32 GetGetOffset() override {
128 DCHECK(false); 128 DCHECK(false);
129 return 0; 129 return 0;
130 } 130 }
131 131
132 private: 132 private:
133 uint8* data_; 133 uint8* data_;
134 scoped_refptr<gpu::Buffer> valid_buffer_; 134 scoped_refptr<gpu::Buffer> valid_buffer_;
135 scoped_refptr<gpu::Buffer> invalid_buffer_; 135 scoped_refptr<gpu::Buffer> invalid_buffer_;
136 }; 136 };
137 137
(...skipping 428 matching lines...) Expand 10 before | Expand all | Expand 10 after
566 566
567 EXPECT_EQ(static_cast<GLuint>(GL_INVALID_ENUM), sync->result); 567 EXPECT_EQ(static_cast<GLuint>(GL_INVALID_ENUM), sync->result);
568 568
569 manager->Destroy(false); 569 manager->Destroy(false);
570 } 570 }
571 571
572 } // namespace gles2 572 } // namespace gles2
573 } // namespace gpu 573 } // namespace gpu
574 574
575 575
OLDNEW
« no previous file with comments | « gpu/command_buffer/service/query_manager.cc ('k') | gpu/command_buffer/service/shader_translator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698