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

Side by Side Diff: gpu/command_buffer/tests/gl_unittests_android.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
« no previous file with comments | « gpu/command_buffer/tests/gl_manager.cc ('k') | gpu/config/gpu_control_list_entry_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 <GLES2/gl2.h> 5 #include <GLES2/gl2.h>
6 #include <GLES2/gl2ext.h> 6 #include <GLES2/gl2ext.h>
7 7
8 #include <android/native_window_jni.h> 8 #include <android/native_window_jni.h>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/synchronization/waitable_event.h" 12 #include "base/synchronization/waitable_event.h"
13 #include "gpu/command_buffer/tests/gl_manager.h" 13 #include "gpu/command_buffer/tests/gl_manager.h"
14 #include "gpu/command_buffer/tests/gl_test_utils.h" 14 #include "gpu/command_buffer/tests/gl_test_utils.h"
15 #include "testing/gmock/include/gmock/gmock.h" 15 #include "testing/gmock/include/gmock/gmock.h"
16 #include "testing/gtest/include/gtest/gtest.h" 16 #include "testing/gtest/include/gtest/gtest.h"
17 #include "ui/gfx/native_widget_types.h" 17 #include "ui/gfx/native_widget_types.h"
18 #include "ui/gl/android/surface_texture.h" 18 #include "ui/gl/android/surface_texture.h"
19 #include "ui/gl/gl_surface.h" 19 #include "ui/gl/gl_surface.h"
20 20
21 namespace gpu { 21 namespace gpu {
22 22
23 class GLSurfaceTextureTest : public testing::Test { 23 class GLSurfaceTextureTest : public testing::Test {
24 protected: 24 protected:
25 virtual void SetUp() OVERRIDE { 25 virtual void SetUp() override {
26 gl_.Initialize(GLManager::Options()); 26 gl_.Initialize(GLManager::Options());
27 } 27 }
28 28
29 virtual void TearDown() OVERRIDE { 29 virtual void TearDown() override {
30 gl_.Destroy(); 30 gl_.Destroy();
31 } 31 }
32 32
33 GLManager gl_; 33 GLManager gl_;
34 }; 34 };
35 35
36 TEST_F(GLSurfaceTextureTest, SimpleTest) { 36 TEST_F(GLSurfaceTextureTest, SimpleTest) {
37 // TODO(sievers): Eliminate the need for this by using a client-side 37 // TODO(sievers): Eliminate the need for this by using a client-side
38 // abstraction for the SurfaceTexture in this test. 38 // abstraction for the SurfaceTexture in this test.
39 GLuint texture = 0xFEEDBEEF; 39 GLuint texture = 0xFEEDBEEF;
(...skipping 15 matching lines...) Expand all
55 55
56 surface_texture->UpdateTexImage(); 56 surface_texture->UpdateTexImage();
57 57
58 GLTestHelper::CheckGLError("no errors", __LINE__); 58 GLTestHelper::CheckGLError("no errors", __LINE__);
59 59
60 ANativeWindow_release(window); 60 ANativeWindow_release(window);
61 } 61 }
62 62
63 } // namespace gpu 63 } // namespace gpu
64 64
OLDNEW
« no previous file with comments | « gpu/command_buffer/tests/gl_manager.cc ('k') | gpu/config/gpu_control_list_entry_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698