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

Side by Side Diff: webkit/common/gpu/webgraphicscontext3d_impl.cc

Issue 636443003: Replacing the OVERRIDE with override in /src/webkit (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 unified diff | Download patch
« no previous file with comments | « webkit/common/gpu/context_provider_in_process.h ('k') | no next file » | 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) 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 "webkit/common/gpu/webgraphicscontext3d_impl.h" 5 #include "webkit/common/gpu/webgraphicscontext3d_impl.h"
6 6
7 #include "base/atomicops.h" 7 #include "base/atomicops.h"
8 #include "base/lazy_instance.h" 8 #include "base/lazy_instance.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "gpu/GLES2/gl2extchromium.h" 10 #include "gpu/GLES2/gl2extchromium.h"
(...skipping 24 matching lines...) Expand all
35 } // namespace anonymous 35 } // namespace anonymous
36 36
37 class WebGraphicsContext3DErrorMessageCallback 37 class WebGraphicsContext3DErrorMessageCallback
38 : public ::gpu::gles2::GLES2ImplementationErrorMessageCallback { 38 : public ::gpu::gles2::GLES2ImplementationErrorMessageCallback {
39 public: 39 public:
40 WebGraphicsContext3DErrorMessageCallback( 40 WebGraphicsContext3DErrorMessageCallback(
41 WebGraphicsContext3DImpl* context) 41 WebGraphicsContext3DImpl* context)
42 : graphics_context_(context) { 42 : graphics_context_(context) {
43 } 43 }
44 44
45 virtual void OnErrorMessage(const char* msg, int id) OVERRIDE; 45 virtual void OnErrorMessage(const char* msg, int id) override;
46 46
47 private: 47 private:
48 WebGraphicsContext3DImpl* graphics_context_; 48 WebGraphicsContext3DImpl* graphics_context_;
49 49
50 DISALLOW_COPY_AND_ASSIGN(WebGraphicsContext3DErrorMessageCallback); 50 DISALLOW_COPY_AND_ASSIGN(WebGraphicsContext3DErrorMessageCallback);
51 }; 51 };
52 52
53 void WebGraphicsContext3DErrorMessageCallback::OnErrorMessage( 53 void WebGraphicsContext3DErrorMessageCallback::OnErrorMessage(
54 const char* msg, int id) { 54 const char* msg, int id) {
55 graphics_context_->OnErrorMessage(msg, id); 55 graphics_context_->OnErrorMessage(msg, id);
(...skipping 941 matching lines...) Expand 10 before | Expand all | Expand 10 after
997 output_attribs->stencil_size = attributes.stencil ? 8 : 0; 997 output_attribs->stencil_size = attributes.stencil ? 8 : 0;
998 output_attribs->samples = attributes.antialias ? 4 : 0; 998 output_attribs->samples = attributes.antialias ? 4 : 0;
999 output_attribs->sample_buffers = attributes.antialias ? 1 : 0; 999 output_attribs->sample_buffers = attributes.antialias ? 1 : 0;
1000 output_attribs->fail_if_major_perf_caveat = 1000 output_attribs->fail_if_major_perf_caveat =
1001 attributes.failIfMajorPerformanceCaveat; 1001 attributes.failIfMajorPerformanceCaveat;
1002 output_attribs->bind_generates_resource = false; 1002 output_attribs->bind_generates_resource = false;
1003 } 1003 }
1004 1004
1005 } // namespace gpu 1005 } // namespace gpu
1006 } // namespace webkit 1006 } // namespace webkit
OLDNEW
« no previous file with comments | « webkit/common/gpu/context_provider_in_process.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698