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

Side by Side Diff: Source/core/html/canvas/WebGLContextObject.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) 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2011 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 27 matching lines...) Expand all
38 class WebGLSharedWebGraphicsContext3D; 38 class WebGLSharedWebGraphicsContext3D;
39 39
40 // WebGLContextObject the base class for objects that are owned by a specific 40 // WebGLContextObject the base class for objects that are owned by a specific
41 // WebGLRenderingContextBase. 41 // WebGLRenderingContextBase.
42 class WebGLContextObject : public WebGLObject { 42 class WebGLContextObject : public WebGLObject {
43 public: 43 public:
44 virtual ~WebGLContextObject(); 44 virtual ~WebGLContextObject();
45 45
46 WebGLRenderingContextBase* context() const { return m_context; } 46 WebGLRenderingContextBase* context() const { return m_context; }
47 47
48 virtual bool validate(const WebGLContextGroup*, const WebGLRenderingContextB ase* context) const OVERRIDE FINAL 48 virtual bool validate(const WebGLContextGroup*, const WebGLRenderingContextB ase* context) const override final
49 { 49 {
50 return context == m_context; 50 return context == m_context;
51 } 51 }
52 52
53 void detachContext(); 53 void detachContext();
54 54
55 virtual void trace(Visitor*) OVERRIDE; 55 virtual void trace(Visitor*) override;
56 56
57 protected: 57 protected:
58 explicit WebGLContextObject(WebGLRenderingContextBase*); 58 explicit WebGLContextObject(WebGLRenderingContextBase*);
59 59
60 virtual bool hasGroupOrContext() const OVERRIDE FINAL 60 virtual bool hasGroupOrContext() const override final
61 { 61 {
62 return m_context; 62 return m_context;
63 } 63 }
64 64
65 virtual blink::WebGraphicsContext3D* getAWebGraphicsContext3D() const OVERRI DE FINAL; 65 virtual blink::WebGraphicsContext3D* getAWebGraphicsContext3D() const overri de final;
66 66
67 private: 67 private:
68 RawPtrWillBeMember<WebGLRenderingContextBase> m_context; 68 RawPtrWillBeMember<WebGLRenderingContextBase> m_context;
69 #if ENABLE(OILPAN) 69 #if ENABLE(OILPAN)
70 RefPtr<WebGLSharedWebGraphicsContext3D> m_sharedWebGraphicsContext3D; 70 RefPtr<WebGLSharedWebGraphicsContext3D> m_sharedWebGraphicsContext3D;
71 #endif 71 #endif
72 }; 72 };
73 73
74 } // namespace blink 74 } // namespace blink
75 75
76 #endif // WebGLContextObject_h 76 #endif // WebGLContextObject_h
OLDNEW
« no previous file with comments | « Source/core/html/canvas/WebGLContextGroup.h ('k') | Source/core/html/canvas/WebGLDebugRendererInfo.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698