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

Side by Side Diff: Source/modules/webgl/WebGLFramebuffer.cpp

Issue 1227783004: Fix virtual/override/final usage in Source/modules/. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebase Created 5 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « Source/modules/webgl/WebGLDrawBuffers.h ('k') | Source/modules/webgl/WebGLLoseContext.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 28 matching lines...) Expand all
39 class WebGLRenderbufferAttachment final : public WebGLFramebuffer::WebGLAtta chment { 39 class WebGLRenderbufferAttachment final : public WebGLFramebuffer::WebGLAtta chment {
40 public: 40 public:
41 static PassRefPtrWillBeRawPtr<WebGLFramebuffer::WebGLAttachment> create( WebGLRenderbuffer*); 41 static PassRefPtrWillBeRawPtr<WebGLFramebuffer::WebGLAttachment> create( WebGLRenderbuffer*);
42 42
43 DECLARE_VIRTUAL_TRACE(); 43 DECLARE_VIRTUAL_TRACE();
44 44
45 private: 45 private:
46 explicit WebGLRenderbufferAttachment(WebGLRenderbuffer*); 46 explicit WebGLRenderbufferAttachment(WebGLRenderbuffer*);
47 WebGLRenderbufferAttachment() { } 47 WebGLRenderbufferAttachment() { }
48 48
49 virtual GLsizei width() const override; 49 GLsizei width() const override;
50 virtual GLsizei height() const override; 50 GLsizei height() const override;
51 virtual GLenum format() const override; 51 GLenum format() const override;
52 virtual GLenum type() const override; 52 GLenum type() const override;
53 virtual WebGLSharedObject* object() const override; 53 WebGLSharedObject* object() const override;
54 virtual bool isSharedObject(WebGLSharedObject*) const override; 54 bool isSharedObject(WebGLSharedObject*) const override;
55 virtual bool valid() const override; 55 bool valid() const override;
56 virtual void onDetached(WebGraphicsContext3D*) override; 56 void onDetached(WebGraphicsContext3D*) override;
57 virtual void attach(WebGraphicsContext3D*, GLenum target, GLenum attachm ent) override; 57 void attach(WebGraphicsContext3D*, GLenum target, GLenum attachment) ove rride;
58 virtual void unattach(WebGraphicsContext3D*, GLenum target, GLenum attac hment) override; 58 void unattach(WebGraphicsContext3D*, GLenum target, GLenum attachment) o verride;
59 59
60 RefPtrWillBeMember<WebGLRenderbuffer> m_renderbuffer; 60 RefPtrWillBeMember<WebGLRenderbuffer> m_renderbuffer;
61 }; 61 };
62 62
63 PassRefPtrWillBeRawPtr<WebGLFramebuffer::WebGLAttachment> WebGLRenderbufferA ttachment::create(WebGLRenderbuffer* renderbuffer) 63 PassRefPtrWillBeRawPtr<WebGLFramebuffer::WebGLAttachment> WebGLRenderbufferA ttachment::create(WebGLRenderbuffer* renderbuffer)
64 { 64 {
65 return adoptRefWillBeNoop(new WebGLRenderbufferAttachment(renderbuffer)) ; 65 return adoptRefWillBeNoop(new WebGLRenderbufferAttachment(renderbuffer)) ;
66 } 66 }
67 67
68 DEFINE_TRACE(WebGLRenderbufferAttachment) 68 DEFINE_TRACE(WebGLRenderbufferAttachment)
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 class WebGLTextureAttachment final : public WebGLFramebuffer::WebGLAttachmen t { 147 class WebGLTextureAttachment final : public WebGLFramebuffer::WebGLAttachmen t {
148 public: 148 public:
149 static PassRefPtrWillBeRawPtr<WebGLFramebuffer::WebGLAttachment> create( WebGLTexture*, GLenum target, GLint level); 149 static PassRefPtrWillBeRawPtr<WebGLFramebuffer::WebGLAttachment> create( WebGLTexture*, GLenum target, GLint level);
150 150
151 DECLARE_VIRTUAL_TRACE(); 151 DECLARE_VIRTUAL_TRACE();
152 152
153 private: 153 private:
154 WebGLTextureAttachment(WebGLTexture*, GLenum target, GLint level); 154 WebGLTextureAttachment(WebGLTexture*, GLenum target, GLint level);
155 WebGLTextureAttachment() { } 155 WebGLTextureAttachment() { }
156 156
157 virtual GLsizei width() const override; 157 GLsizei width() const override;
158 virtual GLsizei height() const override; 158 GLsizei height() const override;
159 virtual GLenum format() const override; 159 GLenum format() const override;
160 virtual GLenum type() const override; 160 GLenum type() const override;
161 virtual WebGLSharedObject* object() const override; 161 WebGLSharedObject* object() const override;
162 virtual bool isSharedObject(WebGLSharedObject*) const override; 162 bool isSharedObject(WebGLSharedObject*) const override;
163 virtual bool valid() const override; 163 bool valid() const override;
164 virtual void onDetached(WebGraphicsContext3D*) override; 164 void onDetached(WebGraphicsContext3D*) override;
165 virtual void attach(WebGraphicsContext3D*, GLenum target, GLenum attachm ent) override; 165 void attach(WebGraphicsContext3D*, GLenum target, GLenum attachment) ove rride;
166 virtual void unattach(WebGraphicsContext3D*, GLenum target, GLenum attac hment) override; 166 void unattach(WebGraphicsContext3D*, GLenum target, GLenum attachment) o verride;
167 167
168 RefPtrWillBeMember<WebGLTexture> m_texture; 168 RefPtrWillBeMember<WebGLTexture> m_texture;
169 GLenum m_target; 169 GLenum m_target;
170 GLint m_level; 170 GLint m_level;
171 }; 171 };
172 172
173 PassRefPtrWillBeRawPtr<WebGLFramebuffer::WebGLAttachment> WebGLTextureAttach ment::create(WebGLTexture* texture, GLenum target, GLint level) 173 PassRefPtrWillBeRawPtr<WebGLFramebuffer::WebGLAttachment> WebGLTextureAttach ment::create(WebGLTexture* texture, GLenum target, GLint level)
174 { 174 {
175 return adoptRefWillBeNoop(new WebGLTextureAttachment(texture, target, le vel)); 175 return adoptRefWillBeNoop(new WebGLTextureAttachment(texture, target, le vel));
176 } 176 }
(...skipping 456 matching lines...) Expand 10 before | Expand all | Expand 10 after
633 633
634 DEFINE_TRACE(WebGLFramebuffer) 634 DEFINE_TRACE(WebGLFramebuffer)
635 { 635 {
636 #if ENABLE(OILPAN) 636 #if ENABLE(OILPAN)
637 visitor->trace(m_attachments); 637 visitor->trace(m_attachments);
638 #endif 638 #endif
639 WebGLContextObject::trace(visitor); 639 WebGLContextObject::trace(visitor);
640 } 640 }
641 641
642 } 642 }
OLDNEW
« no previous file with comments | « Source/modules/webgl/WebGLDrawBuffers.h ('k') | Source/modules/webgl/WebGLLoseContext.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698