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

Side by Side Diff: Source/core/html/canvas/WebGLFramebuffer.cpp

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
« no previous file with comments | « Source/core/html/canvas/WebGLFramebuffer.h ('k') | Source/core/html/canvas/WebGLGetInfo.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 21 matching lines...) Expand all
32 32
33 namespace blink { 33 namespace blink {
34 34
35 namespace { 35 namespace {
36 36
37 Platform3DObject objectOrZero(WebGLObject* object) 37 Platform3DObject objectOrZero(WebGLObject* object)
38 { 38 {
39 return object ? object->object() : 0; 39 return object ? object->object() : 0;
40 } 40 }
41 41
42 class WebGLRenderbufferAttachment FINAL : public WebGLFramebuffer::WebGLAtta chment { 42 class WebGLRenderbufferAttachment final : public WebGLFramebuffer::WebGLAtta chment {
43 public: 43 public:
44 static PassRefPtrWillBeRawPtr<WebGLFramebuffer::WebGLAttachment> create( WebGLRenderbuffer*); 44 static PassRefPtrWillBeRawPtr<WebGLFramebuffer::WebGLAttachment> create( WebGLRenderbuffer*);
45 45
46 virtual void trace(Visitor*) OVERRIDE; 46 virtual void trace(Visitor*) override;
47 47
48 private: 48 private:
49 explicit WebGLRenderbufferAttachment(WebGLRenderbuffer*); 49 explicit WebGLRenderbufferAttachment(WebGLRenderbuffer*);
50 WebGLRenderbufferAttachment() { } 50 WebGLRenderbufferAttachment() { }
51 51
52 virtual GLsizei width() const OVERRIDE; 52 virtual GLsizei width() const override;
53 virtual GLsizei height() const OVERRIDE; 53 virtual GLsizei height() const override;
54 virtual GLenum format() const OVERRIDE; 54 virtual GLenum format() const override;
55 virtual GLenum type() const OVERRIDE; 55 virtual GLenum type() const override;
56 virtual WebGLSharedObject* object() const OVERRIDE; 56 virtual WebGLSharedObject* object() const override;
57 virtual bool isSharedObject(WebGLSharedObject*) const OVERRIDE; 57 virtual bool isSharedObject(WebGLSharedObject*) const override;
58 virtual bool valid() const OVERRIDE; 58 virtual bool valid() const override;
59 virtual void onDetached(blink::WebGraphicsContext3D*) OVERRIDE; 59 virtual void onDetached(blink::WebGraphicsContext3D*) override;
60 virtual void attach(blink::WebGraphicsContext3D*, GLenum attachment) OVE RRIDE; 60 virtual void attach(blink::WebGraphicsContext3D*, GLenum attachment) ove rride;
61 virtual void unattach(blink::WebGraphicsContext3D*, GLenum attachment) O VERRIDE; 61 virtual void unattach(blink::WebGraphicsContext3D*, GLenum attachment) o verride;
62 62
63 RefPtrWillBeMember<WebGLRenderbuffer> m_renderbuffer; 63 RefPtrWillBeMember<WebGLRenderbuffer> m_renderbuffer;
64 }; 64 };
65 65
66 PassRefPtrWillBeRawPtr<WebGLFramebuffer::WebGLAttachment> WebGLRenderbufferA ttachment::create(WebGLRenderbuffer* renderbuffer) 66 PassRefPtrWillBeRawPtr<WebGLFramebuffer::WebGLAttachment> WebGLRenderbufferA ttachment::create(WebGLRenderbuffer* renderbuffer)
67 { 67 {
68 return adoptRefWillBeNoop(new WebGLRenderbufferAttachment(renderbuffer)) ; 68 return adoptRefWillBeNoop(new WebGLRenderbufferAttachment(renderbuffer)) ;
69 } 69 }
70 70
71 void WebGLRenderbufferAttachment::trace(Visitor* visitor) 71 void WebGLRenderbufferAttachment::trace(Visitor* visitor)
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 context->framebufferRenderbuffer(GL_FRAMEBUFFER, attachment, GL_REND ERBUFFER, 0); 140 context->framebufferRenderbuffer(GL_FRAMEBUFFER, attachment, GL_REND ERBUFFER, 0);
141 } 141 }
142 } 142 }
143 143
144 GLenum WebGLRenderbufferAttachment::type() const 144 GLenum WebGLRenderbufferAttachment::type() const
145 { 145 {
146 notImplemented(); 146 notImplemented();
147 return 0; 147 return 0;
148 } 148 }
149 149
150 class WebGLTextureAttachment FINAL : public WebGLFramebuffer::WebGLAttachmen t { 150 class WebGLTextureAttachment final : public WebGLFramebuffer::WebGLAttachmen t {
151 public: 151 public:
152 static PassRefPtrWillBeRawPtr<WebGLFramebuffer::WebGLAttachment> create( WebGLTexture*, GLenum target, GLint level); 152 static PassRefPtrWillBeRawPtr<WebGLFramebuffer::WebGLAttachment> create( WebGLTexture*, GLenum target, GLint level);
153 153
154 virtual void trace(Visitor*) OVERRIDE; 154 virtual void trace(Visitor*) override;
155 155
156 private: 156 private:
157 WebGLTextureAttachment(WebGLTexture*, GLenum target, GLint level); 157 WebGLTextureAttachment(WebGLTexture*, GLenum target, GLint level);
158 WebGLTextureAttachment() { } 158 WebGLTextureAttachment() { }
159 159
160 virtual GLsizei width() const OVERRIDE; 160 virtual GLsizei width() const override;
161 virtual GLsizei height() const OVERRIDE; 161 virtual GLsizei height() const override;
162 virtual GLenum format() const OVERRIDE; 162 virtual GLenum format() const override;
163 virtual GLenum type() const OVERRIDE; 163 virtual GLenum type() const override;
164 virtual WebGLSharedObject* object() const OVERRIDE; 164 virtual WebGLSharedObject* object() const override;
165 virtual bool isSharedObject(WebGLSharedObject*) const OVERRIDE; 165 virtual bool isSharedObject(WebGLSharedObject*) const override;
166 virtual bool valid() const OVERRIDE; 166 virtual bool valid() const override;
167 virtual void onDetached(blink::WebGraphicsContext3D*) OVERRIDE; 167 virtual void onDetached(blink::WebGraphicsContext3D*) override;
168 virtual void attach(blink::WebGraphicsContext3D*, GLenum attachment) OVE RRIDE; 168 virtual void attach(blink::WebGraphicsContext3D*, GLenum attachment) ove rride;
169 virtual void unattach(blink::WebGraphicsContext3D*, GLenum attachment) O VERRIDE; 169 virtual void unattach(blink::WebGraphicsContext3D*, GLenum attachment) o verride;
170 170
171 RefPtrWillBeMember<WebGLTexture> m_texture; 171 RefPtrWillBeMember<WebGLTexture> m_texture;
172 GLenum m_target; 172 GLenum m_target;
173 GLint m_level; 173 GLint m_level;
174 }; 174 };
175 175
176 PassRefPtrWillBeRawPtr<WebGLFramebuffer::WebGLAttachment> WebGLTextureAttach ment::create(WebGLTexture* texture, GLenum target, GLint level) 176 PassRefPtrWillBeRawPtr<WebGLFramebuffer::WebGLAttachment> WebGLTextureAttach ment::create(WebGLTexture* texture, GLenum target, GLint level)
177 { 177 {
178 return adoptRefWillBeNoop(new WebGLTextureAttachment(texture, target, le vel)); 178 return adoptRefWillBeNoop(new WebGLTextureAttachment(texture, target, le vel));
179 } 179 }
(...skipping 449 matching lines...) Expand 10 before | Expand all | Expand 10 after
629 629
630 void WebGLFramebuffer::trace(Visitor* visitor) 630 void WebGLFramebuffer::trace(Visitor* visitor)
631 { 631 {
632 #if ENABLE(OILPAN) 632 #if ENABLE(OILPAN)
633 visitor->trace(m_attachments); 633 visitor->trace(m_attachments);
634 #endif 634 #endif
635 WebGLContextObject::trace(visitor); 635 WebGLContextObject::trace(visitor);
636 } 636 }
637 637
638 } 638 }
OLDNEW
« no previous file with comments | « Source/core/html/canvas/WebGLFramebuffer.h ('k') | Source/core/html/canvas/WebGLGetInfo.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698