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

Unified Diff: content/common/gpu/client/gl_helper_scaling.cc

Issue 630853003: Replace OVERRIDE and FINAL with override and final in content/common/[a-s]* (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/client/gl_helper.cc ('k') | content/common/gpu/client/gpu_channel_host.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/gpu/client/gl_helper_scaling.cc
diff --git a/content/common/gpu/client/gl_helper_scaling.cc b/content/common/gpu/client/gl_helper_scaling.cc
index 219f46b6a4c7a70f3680ef61e4e7be61e2e9fcbf..dea58e751becfaa66462633b820b04fc02cb9891 100644
--- a/content/common/gpu/client/gl_helper_scaling.cc
+++ b/content/common/gpu/client/gl_helper_scaling.cc
@@ -163,7 +163,7 @@ class ScalerImpl : public GLHelper::ScalerInterface,
// GLHelperShader::ShaderInterface implementation.
virtual void Execute(GLuint source_texture,
- const std::vector<GLuint>& dest_textures) OVERRIDE {
+ const std::vector<GLuint>& dest_textures) override {
if (subscaler_) {
subscaler_->Scale(source_texture, intermediate_texture_);
source_texture = intermediate_texture_;
@@ -214,25 +214,25 @@ class ScalerImpl : public GLHelper::ScalerInterface,
}
// GLHelper::ScalerInterface implementation.
- virtual void Scale(GLuint source_texture, GLuint dest_texture) OVERRIDE {
+ virtual void Scale(GLuint source_texture, GLuint dest_texture) override {
std::vector<GLuint> tmp(1);
tmp[0] = dest_texture;
Execute(source_texture, tmp);
}
- virtual const gfx::Size& SrcSize() OVERRIDE {
+ virtual const gfx::Size& SrcSize() override {
if (subscaler_) {
return subscaler_->SrcSize();
}
return spec_.src_size;
}
- virtual const gfx::Rect& SrcSubrect() OVERRIDE {
+ virtual const gfx::Rect& SrcSubrect() override {
if (subscaler_) {
return subscaler_->SrcSubrect();
}
return spec_.src_subrect;
}
- virtual const gfx::Size& DstSize() OVERRIDE { return spec_.dst_size; }
+ virtual const gfx::Size& DstSize() override { return spec_.dst_size; }
private:
GLES2Interface* gl_;
« no previous file with comments | « content/common/gpu/client/gl_helper.cc ('k') | content/common/gpu/client/gpu_channel_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698