Changeset 206377 in webkit

Timestamp:

Sep 26, 2016 9:40:38 AM (8 years ago)

Author:

Michael Catanzaro

Message:

std::unique_ptr deleter functions should not check if pointer is null
​https://bugs.webkit.org/show_bug.cgi?id=162558

Reviewed by Alex Christensen.

std::unique_ptr already does this before calling the deleter.

Source/WebCore:

• platform/graphics/x11/XUniquePtr.h:

(WebCore::XPtrDeleter::operator()):
(WebCore::XPtrDeleter<XImage>::operator()):
(WebCore::XPtrDeleter<_XGC>::operator()):
(WebCore::XPtrDeleter<GLXcontextRec>::operator()):

Source/WTF:

• wtf/efl/UniquePtrEfl.h:
• wtf/glib/GUniquePtr.h:

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/efl/UniquePtrEfl.h (modified) (1 diff)
• WTF/wtf/glib/GUniquePtr.h (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/x11/XUniquePtr.h (modified) (4 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2016-09-26  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        std::unique_ptr deleter functions should not check if pointer is null
+        https://bugs.webkit.org/show_bug.cgi?id=162558
+
+        Reviewed by Alex Christensen.
+
+        std::unique_ptr already does this before calling the deleter.
+
+        * wtf/efl/UniquePtrEfl.h:
+        * wtf/glib/GUniquePtr.h:
+
 == Rolled over to ChangeLog-2016-09-26 ==

trunk/Source/WTF/wtf/efl/UniquePtrEfl.h

@@ -55 +55 @@
         void operator() (typeName* ptr) const \
         { \
-            if (ptr) \
-                deleterFunc(ptr); \
+            deleterFunc(ptr); \
         } \
     };

trunk/Source/WTF/wtf/glib/GUniquePtr.h

@@ -53 +53 @@
         void operator() (typeName* ptr) const \
         { \
-            if (ptr) \
-                deleterFunc(ptr); \
+            deleterFunc(ptr); \
         } \
     };

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-09-26  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        std::unique_ptr deleter functions should not check if pointer is null
+        https://bugs.webkit.org/show_bug.cgi?id=162558
+
+        Reviewed by Alex Christensen.
+
+        std::unique_ptr already does this before calling the deleter.
+
+        * platform/graphics/x11/XUniquePtr.h:
+        (WebCore::XPtrDeleter::operator()):
+        (WebCore::XPtrDeleter<XImage>::operator()):
+        (WebCore::XPtrDeleter<_XGC>::operator()):
+        (WebCore::XPtrDeleter<__GLXcontextRec>::operator()):
+
 2016-09-26  Per Arne Vollan  <pvollan@apple.com>
 

trunk/Source/WebCore/platform/graphics/x11/XUniquePtr.h

@@ -42 +42 @@
     void operator()(T* ptr) const
     {
-        if (ptr)
-            XFree(ptr);
+        XFree(ptr);
     }
 };
@@ -53 +52 @@
     void operator() (XImage* ptr) const
     {
-        if (ptr)
-            XDestroyImage(ptr);
+        XDestroyImage(ptr);
     }
 };
@@ -61 +59 @@
     void operator() (_XGC* ptr) const
     {
-        if (ptr)
-            XFreeGC(downcast<PlatformDisplayX11>(PlatformDisplay::sharedDisplay()).native(), ptr);
+        XFreeGC(downcast<PlatformDisplayX11>(PlatformDisplay::sharedDisplay()).native(), ptr);
     }
 };
@@ -72 +69 @@
     void operator() (__GLXcontextRec* ptr)
     {
-        if (ptr)
-            glXDestroyContext(downcast<PlatformDisplayX11>(PlatformDisplay::sharedDisplay()).native(), ptr);
+        glXDestroyContext(downcast<PlatformDisplayX11>(PlatformDisplay::sharedDisplay()).native(), ptr);
     }
 };