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

Side by Side Diff: Source/core/html/canvas/WebGLProgram.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
« no previous file with comments | « Source/core/html/canvas/WebGLLoseContext.h ('k') | Source/core/html/canvas/WebGLRenderbuffer.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 16 matching lines...) Expand all
27 #define WebGLProgram_h 27 #define WebGLProgram_h
28 28
29 #include "bindings/core/v8/ScriptWrappable.h" 29 #include "bindings/core/v8/ScriptWrappable.h"
30 #include "core/html/canvas/WebGLSharedObject.h" 30 #include "core/html/canvas/WebGLSharedObject.h"
31 #include "core/html/canvas/WebGLShader.h" 31 #include "core/html/canvas/WebGLShader.h"
32 #include "wtf/PassRefPtr.h" 32 #include "wtf/PassRefPtr.h"
33 #include "wtf/Vector.h" 33 #include "wtf/Vector.h"
34 34
35 namespace blink { 35 namespace blink {
36 36
37 class WebGLProgram FINAL : public WebGLSharedObject, public ScriptWrappable { 37 class WebGLProgram final : public WebGLSharedObject, public ScriptWrappable {
38 DEFINE_WRAPPERTYPEINFO(); 38 DEFINE_WRAPPERTYPEINFO();
39 public: 39 public:
40 virtual ~WebGLProgram(); 40 virtual ~WebGLProgram();
41 41
42 static PassRefPtrWillBeRawPtr<WebGLProgram> create(WebGLRenderingContextBase *); 42 static PassRefPtrWillBeRawPtr<WebGLProgram> create(WebGLRenderingContextBase *);
43 43
44 unsigned numActiveAttribLocations(); 44 unsigned numActiveAttribLocations();
45 GLint getActiveAttribLocation(GLuint index); 45 GLint getActiveAttribLocation(GLuint index);
46 46
47 bool isUsingVertexAttrib0(); 47 bool isUsingVertexAttrib0();
48 48
49 bool linkStatus(); 49 bool linkStatus();
50 50
51 unsigned linkCount() const { return m_linkCount; } 51 unsigned linkCount() const { return m_linkCount; }
52 52
53 // This is to be called everytime after the program is successfully linked. 53 // This is to be called everytime after the program is successfully linked.
54 // We don't deal with integer overflow here, assuming in reality a program 54 // We don't deal with integer overflow here, assuming in reality a program
55 // will never be linked so many times. 55 // will never be linked so many times.
56 // Also, we invalidate the cached program info. 56 // Also, we invalidate the cached program info.
57 void increaseLinkCount(); 57 void increaseLinkCount();
58 58
59 WebGLShader* getAttachedShader(GLenum); 59 WebGLShader* getAttachedShader(GLenum);
60 bool attachShader(WebGLShader*); 60 bool attachShader(WebGLShader*);
61 bool detachShader(WebGLShader*); 61 bool detachShader(WebGLShader*);
62 62
63 virtual void trace(Visitor*) OVERRIDE; 63 virtual void trace(Visitor*) override;
64 64
65 protected: 65 protected:
66 explicit WebGLProgram(WebGLRenderingContextBase*); 66 explicit WebGLProgram(WebGLRenderingContextBase*);
67 67
68 virtual void deleteObjectImpl(blink::WebGraphicsContext3D*, Platform3DObject ) OVERRIDE; 68 virtual void deleteObjectImpl(blink::WebGraphicsContext3D*, Platform3DObject ) override;
69 69
70 private: 70 private:
71 virtual bool isProgram() const OVERRIDE { return true; } 71 virtual bool isProgram() const override { return true; }
72 72
73 void cacheActiveAttribLocations(blink::WebGraphicsContext3D*); 73 void cacheActiveAttribLocations(blink::WebGraphicsContext3D*);
74 void cacheInfoIfNeeded(); 74 void cacheInfoIfNeeded();
75 75
76 Vector<GLint> m_activeAttribLocations; 76 Vector<GLint> m_activeAttribLocations;
77 77
78 GLint m_linkStatus; 78 GLint m_linkStatus;
79 79
80 // This is used to track whether a WebGLUniformLocation belongs to this 80 // This is used to track whether a WebGLUniformLocation belongs to this
81 // program or not. 81 // program or not.
82 unsigned m_linkCount; 82 unsigned m_linkCount;
83 83
84 RefPtrWillBeMember<WebGLShader> m_vertexShader; 84 RefPtrWillBeMember<WebGLShader> m_vertexShader;
85 RefPtrWillBeMember<WebGLShader> m_fragmentShader; 85 RefPtrWillBeMember<WebGLShader> m_fragmentShader;
86 86
87 bool m_infoValid; 87 bool m_infoValid;
88 }; 88 };
89 89
90 } // namespace blink 90 } // namespace blink
91 91
92 #endif // WebGLProgram_h 92 #endif // WebGLProgram_h
OLDNEW
« no previous file with comments | « Source/core/html/canvas/WebGLLoseContext.h ('k') | Source/core/html/canvas/WebGLRenderbuffer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698