Edit

kc3-lang/angle/src/libANGLE/Error.h

Branch :

  • Show log

    Commit

  • Author : Tibor den Ouden
    Date : 2015-12-20 22:20:14
    Hash : ce95d05b
    Message : Fixed memory leak in egl::Error and gl::Error Move assignment operator of both classes contained a memory leak. Changed type of mMessage from mutable std::string *to mutable std::unique_ptr<std::string> BUG=angleproject:1264 Change-Id: I7d1419b2e9f385b36afebfd6371983be33ee9e61 Reviewed-on: https://chromium-review.googlesource.com/319520 Reviewed-by: Geoff Lang <geofflang@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org> Tryjob-Request: Tibor Ouden, den <tibordenouden@gmail.com> Tested-by: Jamie Madill <jmadill@chromium.org>

  • src/libANGLE/Error.h
  • //
    // Copyright (c) 2014 The ANGLE Project Authors. All rights reserved.
    // Use of this source code is governed by a BSD-style license that can be
    // found in the LICENSE file.
    
    // Error.h: Defines the egl::Error and gl::Error classes which encapsulate API errors
    // and optional error messages.
    
    #ifndef LIBANGLE_ERROR_H_
    #define LIBANGLE_ERROR_H_
    
    #include "angle_gl.h"
    #include <EGL/egl.h>
    
    #include <string>
    #include <memory>
    
    namespace gl
    {
    
    class Error final
    {
      public:
        explicit inline Error(GLenum errorCode);
        Error(GLenum errorCode, const char *msg, ...);
        Error(GLenum errorCode, GLuint id, const char *msg, ...);
        inline Error(const Error &other);
        inline Error(Error &&other);
    
        inline Error &operator=(const Error &other);
        inline Error &operator=(Error &&other);
    
        inline GLenum getCode() const;
        inline GLuint getID() const;
        inline bool isError() const;
    
        const std::string &getMessage() const;
    
        // Useful for mocking and testing
        bool operator==(const Error &other) const;
        bool operator!=(const Error &other) const;
    
      private:
        void createMessageString() const;
    
        GLenum mCode;
        GLuint mID;
        mutable std::unique_ptr<std::string> mMessage;
    };
    
    }
    
    namespace egl
    {
    
    class Error final
    {
      public:
        explicit inline Error(EGLint errorCode);
        Error(EGLint errorCode, const char *msg, ...);
        Error(EGLint errorCode, EGLint id, const char *msg, ...);
        inline Error(const Error &other);
        inline Error(Error &&other);
    
        inline Error &operator=(const Error &other);
        inline Error &operator=(Error &&other);
    
        inline EGLint getCode() const;
        inline EGLint getID() const;
        inline bool isError() const;
    
        const std::string &getMessage() const;
    
      private:
        void createMessageString() const;
    
        EGLint mCode;
        EGLint mID;
        mutable std::unique_ptr<std::string> mMessage;
    };
    
    }
    
    #include "Error.inl"
    
    #endif // LIBANGLE_ERROR_H_