Changeset 37660 in webkit

Timestamp:

Oct 17, 2008 2:16:01 PM (16 years ago)

Author:

jmalonzo@webkit.org

Message:

2008-10-17 Marco Barisione <​marco.barisione@collabora.co.uk>

Reviewed by Sam Weinig. Landed by Jan Alonzo.

​https://bugs.webkit.org/show_bug.cgi?id=21603
[GTK] Minor fixes to GOwnPtr

• wtf/GOwnPtr.cpp: (WTF::GError): (WTF::GList): (WTF::GCond): (WTF::GMutex): (WTF::GPatternSpec): (WTF::GDir):
• wtf/GOwnPtr.h: (WTF::freeOwnedGPtr): (WTF::GOwnPtr::~GOwnPtr): (WTF::GOwnPtr::outPtr): (WTF::GOwnPtr::set): (WTF::GOwnPtr::clear):
• wtf/Threading.h:

2008-10-17 Marco Barisione <​marco.barisione@collabora.co.uk>

Reviewed by Sam Weinig. Landed by Jan Alonzo.

​https://bugs.webkit.org/show_bug.cgi?id=21603
[GTK] Minor fixes to GOwnPtr

• platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp: (WebCore::mediaPlayerPrivateErrorCallback):

Location:

trunk

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/wtf/GOwnPtr.cpp (modified) (5 diffs)
• JavaScriptCore/wtf/GOwnPtr.h (modified) (1 diff)
• JavaScriptCore/wtf/Threading.h (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-10-17  Marco Barisione  <marco.barisione@collabora.co.uk>
+
+        Reviewed by Sam Weinig. Landed by Jan Alonzo.
+
+        https://bugs.webkit.org/show_bug.cgi?id=21603
+        [GTK] Minor fixes to GOwnPtr
+
+        * wtf/GOwnPtr.cpp:
+        (WTF::GError):
+        (WTF::GList):
+        (WTF::GCond):
+        (WTF::GMutex):
+        (WTF::GPatternSpec):
+        (WTF::GDir):
+        * wtf/GOwnPtr.h:
+        (WTF::freeOwnedGPtr):
+        (WTF::GOwnPtr::~GOwnPtr):
+        (WTF::GOwnPtr::outPtr):
+        (WTF::GOwnPtr::set):
+        (WTF::GOwnPtr::clear):
+        * wtf/Threading.h:
+
 2008-10-17  Maciej Stachowiak  <mjs@apple.com>
 

trunk/JavaScriptCore/wtf/GOwnPtr.cpp

@@ -22 +22 @@
 namespace WTF {
 
-template <> void freeOwnedPtr<GError>(GError* ptr)
+template <> void freeOwnedGPtr<GError>(GError* ptr)
 {
     if (ptr)
@@ -28 +28 @@
 }
 
-template <> void freeOwnedPtr<GList>(GList* ptr)
+template <> void freeOwnedGPtr<GList>(GList* ptr)
 {
     g_list_free(ptr);
 }
 
-template <> void freeOwnedPtr<GCond>(GCond* ptr)
+template <> void freeOwnedGPtr<GCond>(GCond* ptr)
 {
     if (ptr)
@@ -39 +39 @@
 }
 
-template <> void freeOwnedPtr<GMutex>(GMutex* ptr)
+template <> void freeOwnedGPtr<GMutex>(GMutex* ptr)
 {
     if (ptr)
@@ -45 +45 @@
 }
 
-template <> void freeOwnedPtr<GPatternSpec>(GPatternSpec* ptr)
+template <> void freeOwnedGPtr<GPatternSpec>(GPatternSpec* ptr)
 {
     if (ptr)
@@ -51 +51 @@
 }
 
-template <> void freeOwnedPtr<GDir>(GDir* ptr)
+template <> void freeOwnedGPtr<GDir>(GDir* ptr)
 {
     if (ptr)

trunk/JavaScriptCore/wtf/GOwnPtr.h

@@ -29 +29 @@
 
 namespace WTF {
-    template <typename T> inline void freeOwnedPtr(T* ptr) { g_free(reinterpret_cast<void*>(ptr)); }
-    template<> void freeOwnedPtr<GError>(GError*);
-    template<> void freeOwnedPtr<GList>(GList*);
-    template<> void freeOwnedPtr<GCond>(GCond*);
-    template<> void freeOwnedPtr<GMutex>(GMutex*);
-    template<> void freeOwnedPtr<GPatternSpec>(GPatternSpec*);
-    template<> void freeOwnedPtr<GDir>(GDir*);
+    template <typename T> inline void freeOwnedGPtr(T* ptr) { g_free(reinterpret_cast<void*>(ptr)); }
+    template<> void freeOwnedGPtr<GError>(GError*);
+    template<> void freeOwnedGPtr<GList>(GList*);
+    template<> void freeOwnedGPtr<GCond>(GCond*);
+    template<> void freeOwnedGPtr<GMutex>(GMutex*);
+    template<> void freeOwnedGPtr<GPatternSpec>(GPatternSpec*);
+    template<> void freeOwnedGPtr<GDir>(GDir*);
 
     template <typename T> class GOwnPtr : Noncopyable {
     public:
         explicit GOwnPtr(T* ptr = 0) : m_ptr(ptr) { }
-        ~GOwnPtr() { freeOwnedPtr(m_ptr); }
+        ~GOwnPtr() { freeOwnedGPtr(m_ptr); }
 
         T* get() const { return m_ptr; }
         T* release() { T* ptr = m_ptr; m_ptr = 0; return ptr; }
-        T*& rawPtr() { return m_ptr; }
+        T*& outPtr() { ASSERT(!m_ptr); return m_ptr; }
 
-        void set(T* ptr) { ASSERT(!ptr || m_ptr != ptr); freeOwnedPtr(m_ptr); m_ptr = ptr; }
-        void clear() { freeOwnedPtr(m_ptr); m_ptr = 0; }
+        void set(T* ptr) { ASSERT(!ptr || m_ptr != ptr); freeOwnedGPtr(m_ptr); m_ptr = ptr; }
+        void clear() { freeOwnedGPtr(m_ptr); m_ptr = 0; }
 
         T& operator*() const { ASSERT(m_ptr); return *m_ptr; }

trunk/JavaScriptCore/wtf/Threading.h

@@ -63 +63 @@
 #include <wtf/Locker.h>
 #include <wtf/Noncopyable.h>
+
 #if PLATFORM(GTK)
 #include <wtf/GOwnPtr.h>

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-10-17  Marco Barisione  <marco.barisione@collabora.co.uk>
+
+        Reviewed by Sam Weinig. Landed by Jan Alonzo.
+
+        https://bugs.webkit.org/show_bug.cgi?id=21603
+        [GTK] Minor fixes to GOwnPtr
+
+        * platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp:
+        (WebCore::mediaPlayerPrivateErrorCallback):
+
 2008-10-17  Timothy Hatcher  <timothy@apple.com>
 

trunk/WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp

@@ -58 +58 @@
         GOwnPtr<gchar> debug;
 
-        gst_message_parse_error(message, &err.rawPtr(), &debug.rawPtr());
+        gst_message_parse_error(message, &err.outPtr(), &debug.outPtr());
         if (err->code == 3) {
             LOG_VERBOSE(Media, "File not found");