diff options
Diffstat (limited to 'Source/WebCore/html/canvas/WebGLProgram.h')
| -rw-r--r-- | Source/WebCore/html/canvas/WebGLProgram.h | 38 |
1 files changed, 14 insertions, 24 deletions
diff --git a/Source/WebCore/html/canvas/WebGLProgram.h b/Source/WebCore/html/canvas/WebGLProgram.h index 718f18498..eab76c897 100644 --- a/Source/WebCore/html/canvas/WebGLProgram.h +++ b/Source/WebCore/html/canvas/WebGLProgram.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009 Apple Inc. All rights reserved. + * Copyright (C) 2009-2017 Apple Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -10,10 +10,10 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY + * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR @@ -23,24 +23,19 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef WebGLProgram_h -#define WebGLProgram_h +#pragma once #include "WebGLSharedObject.h" -#include "WebGLShader.h" - -#include <wtf/PassRefPtr.h> -#include <wtf/Vector.h> - namespace WebCore { -class WebGLProgram : public WebGLSharedObject { +class WebGLShader; + +class WebGLProgram final : public WebGLSharedObject { public: + static Ref<WebGLProgram> create(WebGLRenderingContextBase&); virtual ~WebGLProgram(); - static PassRefPtr<WebGLProgram> create(WebGLRenderingContext*); - unsigned numActiveAttribLocations(); GC3Dint getActiveAttribLocation(GC3Duint index); @@ -62,30 +57,25 @@ public: bool detachShader(WebGLShader*); protected: - WebGLProgram(WebGLRenderingContext*); + WebGLProgram(WebGLRenderingContextBase&); - virtual void deleteObjectImpl(GraphicsContext3D*, Platform3DObject) override; + void deleteObjectImpl(GraphicsContext3D*, Platform3DObject) override; private: - virtual bool isProgram() const override { return true; } - void cacheActiveAttribLocations(GraphicsContext3D*); void cacheInfoIfNeeded(); Vector<GC3Dint> m_activeAttribLocations; - GC3Dint m_linkStatus; + GC3Dint m_linkStatus { 0 }; - // This is used to track whether a WebGLUniformLocation belongs to this - // program or not. - unsigned m_linkCount; + // This is used to track whether a WebGLUniformLocation belongs to this program or not. + unsigned m_linkCount { 0 }; RefPtr<WebGLShader> m_vertexShader; RefPtr<WebGLShader> m_fragmentShader; - bool m_infoValid; + bool m_infoValid { true }; }; } // namespace WebCore - -#endif // WebGLProgram_h |