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

Side by Side Diff: Source/core/html/canvas/WebGLRenderingContext.h

Issue 635793002: Replace FINAL and OVERRIDE with their C++11 counterparts in Source/core/html (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2009 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 13 matching lines...) Expand all
24 */ 24 */
25 25
26 #ifndef WebGLRenderingContext_h 26 #ifndef WebGLRenderingContext_h
27 #define WebGLRenderingContext_h 27 #define WebGLRenderingContext_h
28 28
29 #include "bindings/core/v8/ScriptWrappable.h" 29 #include "bindings/core/v8/ScriptWrappable.h"
30 #include "core/html/canvas/WebGLRenderingContextBase.h" 30 #include "core/html/canvas/WebGLRenderingContextBase.h"
31 31
32 namespace blink { 32 namespace blink {
33 33
34 class WebGLRenderingContext FINAL : public WebGLRenderingContextBase, public Scr iptWrappable { 34 class WebGLRenderingContext final : public WebGLRenderingContextBase, public Scr iptWrappable {
35 DEFINE_WRAPPERTYPEINFO(); 35 DEFINE_WRAPPERTYPEINFO();
36 public: 36 public:
37 static PassOwnPtrWillBeRawPtr<WebGLRenderingContext> create(HTMLCanvasElemen t*, WebGLContextAttributes*); 37 static PassOwnPtrWillBeRawPtr<WebGLRenderingContext> create(HTMLCanvasElemen t*, WebGLContextAttributes*);
38 virtual ~WebGLRenderingContext(); 38 virtual ~WebGLRenderingContext();
39 39
40 virtual unsigned version() const OVERRIDE { return 1; } 40 virtual unsigned version() const override { return 1; }
41 virtual String contextName() const OVERRIDE { return "WebGLRenderingContext" ; } 41 virtual String contextName() const override { return "WebGLRenderingContext" ; }
42 virtual void registerContextExtensions() OVERRIDE; 42 virtual void registerContextExtensions() override;
43 43
44 virtual void trace(Visitor*) OVERRIDE; 44 virtual void trace(Visitor*) override;
45 45
46 private: 46 private:
47 WebGLRenderingContext(HTMLCanvasElement*, PassOwnPtr<blink::WebGraphicsConte xt3D>, WebGLContextAttributes*); 47 WebGLRenderingContext(HTMLCanvasElement*, PassOwnPtr<blink::WebGraphicsConte xt3D>, WebGLContextAttributes*);
48 48
49 // Enabled extension objects. 49 // Enabled extension objects.
50 RefPtrWillBeMember<ANGLEInstancedArrays> m_angleInstancedArrays; 50 RefPtrWillBeMember<ANGLEInstancedArrays> m_angleInstancedArrays;
51 RefPtrWillBeMember<EXTBlendMinMax> m_extBlendMinMax; 51 RefPtrWillBeMember<EXTBlendMinMax> m_extBlendMinMax;
52 RefPtrWillBeMember<EXTFragDepth> m_extFragDepth; 52 RefPtrWillBeMember<EXTFragDepth> m_extFragDepth;
53 RefPtrWillBeMember<EXTShaderTextureLOD> m_extShaderTextureLOD; 53 RefPtrWillBeMember<EXTShaderTextureLOD> m_extShaderTextureLOD;
54 RefPtrWillBeMember<EXTTextureFilterAnisotropic> m_extTextureFilterAnisotropi c; 54 RefPtrWillBeMember<EXTTextureFilterAnisotropic> m_extTextureFilterAnisotropi c;
(...skipping 15 matching lines...) Expand all
70 RefPtrWillBeMember<WebGLDepthTexture> m_webglDepthTexture; 70 RefPtrWillBeMember<WebGLDepthTexture> m_webglDepthTexture;
71 }; 71 };
72 72
73 DEFINE_TYPE_CASTS(WebGLRenderingContext, CanvasRenderingContext, context, 73 DEFINE_TYPE_CASTS(WebGLRenderingContext, CanvasRenderingContext, context,
74 context->is3d() && WebGLRenderingContextBase::getWebGLVersion(context) == 1, 74 context->is3d() && WebGLRenderingContextBase::getWebGLVersion(context) == 1,
75 context.is3d() && WebGLRenderingContextBase::getWebGLVersion(&context) == 1) ; 75 context.is3d() && WebGLRenderingContextBase::getWebGLVersion(&context) == 1) ;
76 76
77 } // namespace blink 77 } // namespace blink
78 78
79 #endif // WebGLRenderingContext_h 79 #endif // WebGLRenderingContext_h
OLDNEW
« no previous file with comments | « Source/core/html/canvas/WebGLRenderbuffer.h ('k') | Source/core/html/canvas/WebGLRenderingContextBase.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698