Inline commonly used Error methods and add move operators.

src/libANGLE/Error.cpp

@@ -16,15 +16,9 @@
 namespace gl
 {
 
-Error::Error(GLenum errorCode)
-    : mCode(errorCode),
-      mMessage(NULL)
-{
-}
-
 Error::Error(GLenum errorCode, const char *msg, ...)
     : mCode(errorCode),
-      mMessage(NULL)
+      mMessage(nullptr)
 {
     va_list vararg;
     va_start(vararg, msg);
@@ -33,39 +27,6 @@ Error::Error(GLenum errorCode, const char *msg, ...)
     va_end(vararg);
 }
 
-Error::Error(const Error &other)
-    : mCode(other.mCode),
-      mMessage(NULL)
-{
-    if (other.mMessage != NULL)
-    {
-        createMessageString();
-        *mMessage = *(other.mMessage);
-    }
-}
-
-Error::~Error()
-{
-    SafeDelete(mMessage);
-}
-
-Error &Error::operator=(const Error &other)
-{
-    mCode = other.mCode;
-
-    if (other.mMessage != NULL)
-    {
-        createMessageString();
-        *mMessage = *(other.mMessage);
-    }
-    else
-    {
-        SafeDelete(mMessage);
-    }
-
-    return *this;
-}
-
 void Error::createMessageString() const
 {
     if (mMessage == nullptr)
@@ -85,13 +46,6 @@ const std::string &Error::getMessage() const
 namespace egl
 {
 
-Error::Error(EGLint errorCode)
-    : mCode(errorCode),
-      mID(0),
-      mMessage(nullptr)
-{
-}
-
 Error::Error(EGLint errorCode, const char *msg, ...)
     : mCode(errorCode),
       mID(0),
@@ -115,42 +69,6 @@ Error::Error(EGLint errorCode, EGLint id, const char *msg, ...)
     *mMessage = FormatString(msg, vararg);
     va_end(vararg);
 }
-
-Error::Error(const Error &other)
-    : mCode(other.mCode),
-      mID(other.mID),
-      mMessage(nullptr)
-{
-    if (other.mMessage != nullptr)
-    {
-        createMessageString();
-        *mMessage = *(other.mMessage);
-    }
-}
-
-Error::~Error()
-{
-    SafeDelete(mMessage);
-}
-
-Error &Error::operator=(const Error &other)
-{
-    mCode = other.mCode;
-    mID = other.mID;
-
-    if (other.mMessage != nullptr)
-    {
-        createMessageString();
-        *mMessage = *(other.mMessage);
-    }
-    else
-    {
-        SafeDelete(mMessage);
-    }
-
-    return *this;
-}
-
 void Error::createMessageString() const
 {
     if (mMessage == nullptr)

src/libANGLE/Error.h

@@ -17,17 +17,21 @@
 namespace gl
 {
 
-class Error
+class Error final
 {
   public:
-    explicit Error(GLenum errorCode);
+    explicit inline Error(GLenum errorCode);
     Error(GLenum errorCode, const char *msg, ...);
-    Error(const Error &other);
-    ~Error();
-    Error &operator=(const Error &other);
+    inline Error(const Error &other);
+    inline Error(Error &&other);
 
-    GLenum getCode() const { return mCode; }
-    bool isError() const { return (mCode != GL_NO_ERROR); }
+    inline ~Error();
+
+    inline Error &operator=(const Error &other);
+    inline Error &operator=(Error &&other);
+
+    inline GLenum getCode() const;
+    inline bool isError() const;
 
     const std::string &getMessage() const;
 
@@ -43,19 +47,23 @@ class Error
 namespace egl
 {
 
-class Error
+class Error final
 {
   public:
-    explicit Error(EGLint errorCode);
+    explicit inline Error(EGLint errorCode);
     Error(EGLint errorCode, const char *msg, ...);
     Error(EGLint errorCode, EGLint id, const char *msg, ...);
-    Error(const Error &other);
-    ~Error();
-    Error &operator=(const Error &other);
+    inline Error(const Error &other);
+    inline Error(Error &&other);
+
+    inline ~Error();
 
-    EGLint getCode() const { return mCode; }
-    EGLint getID() const { return mID; }
-    bool isError() const { return (mCode != EGL_SUCCESS); }
+    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;
 
@@ -69,4 +77,6 @@ class Error
 
 }
 
+#include "Error.inl"
+
 #endif // LIBANGLE_ERROR_H_

src/libANGLE/Error.inl

+//
+// 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.inl: Inline definitions of egl::Error and gl::Error classes which encapsulate API errors
+// and optional error messages.
+
+#include "common/angleutils.h"
+
+#include <cstdarg>
+
+namespace gl
+{
+
+Error::Error(GLenum errorCode)
+    : mCode(errorCode),
+      mMessage(nullptr)
+{
+}
+
+Error::Error(const Error &other)
+    : mCode(other.mCode),
+      mMessage(nullptr)
+{
+    if (other.mMessage != nullptr)
+    {
+        createMessageString();
+        *mMessage = *(other.mMessage);
+    }
+}
+
+Error::Error(Error &&other)
+    : mCode(other.mCode),
+      mMessage(other.mMessage)
+{
+    other.mMessage = nullptr;
+}
+
+Error::~Error()
+{
+    SafeDelete(mMessage);
+}
+
+Error &Error::operator=(const Error &other)
+{
+    mCode = other.mCode;
+
+    if (other.mMessage != nullptr)
+    {
+        createMessageString();
+        *mMessage = *(other.mMessage);
+    }
+    else
+    {
+        SafeDelete(mMessage);
+    }
+
+    return *this;
+}
+
+Error &Error::operator=(Error &&other)
+{
+    mCode = other.mCode;
+    mMessage = other.mMessage;
+
+    other.mMessage = nullptr;
+
+    return *this;
+}
+
+GLenum Error::getCode() const
+{
+    return mCode;
+}
+
+bool Error::isError() const
+{
+    return (mCode != GL_NO_ERROR);
+}
+
+}
+
+namespace egl
+{
+
+Error::Error(EGLint errorCode)
+    : mCode(errorCode),
+      mID(0),
+      mMessage(nullptr)
+{
+}
+
+Error::Error(const Error &other)
+    : mCode(other.mCode),
+      mID(other.mID),
+      mMessage(nullptr)
+{
+    if (other.mMessage != nullptr)
+    {
+        createMessageString();
+        *mMessage = *(other.mMessage);
+    }
+}
+
+Error::Error(Error &&other)
+    : mCode(other.mCode),
+      mID(other.mID),
+      mMessage(other.mMessage)
+{
+    other.mMessage = nullptr;
+}
+
+Error::~Error()
+{
+    SafeDelete(mMessage);
+}
+
+Error &Error::operator=(const Error &other)
+{
+    mCode = other.mCode;
+    mID = other.mID;
+
+    if (other.mMessage != nullptr)
+    {
+        createMessageString();
+        *mMessage = *(other.mMessage);
+    }
+    else
+    {
+        SafeDelete(mMessage);
+    }
+
+    return *this;
+}
+
+Error &Error::operator=(Error &&other)
+{
+    mCode = other.mCode;
+    mID = other.mID;
+    mMessage = other.mMessage;
+
+    other.mMessage = nullptr;
+
+    return *this;
+}
+
+EGLint Error::getCode() const
+{
+    return mCode;
+}
+
+EGLint Error::getID() const
+{
+    return mID;
+}
+
+bool Error::isError() const
+{
+    return (mCode != EGL_SUCCESS);
+}
+
+}

src/libGLESv2.gypi

@@ -66,6 +66,7 @@
             'libANGLE/Display.h',
             'libANGLE/Error.cpp',
             'libANGLE/Error.h',
+            'libANGLE/Error.inl',
             'libANGLE/Fence.cpp',
             'libANGLE/Fence.h',
             'libANGLE/Float16ToFloat32.cpp',