Changeset 70390 in webkit

Timestamp:

Oct 23, 2010 8:08:49 AM (14 years ago)

Author:

Martin Robinson

Message:

2010-10-23 Martin Robinson <​mrobinson@igalia.com>

Reviewed by Xan Lopez.

Crashes randomly in cairo_scaled_font_destroy
​https://bugs.webkit.org/show_bug.cgi?id=46794

Make PlatformRefPtr aware of hashTableDeletedValue. When PlatformRefPtr
goes away this should probably be handled in the future via some special
hooks in RefCounted (or its contained type).

• wtf/PlatformRefPtr.h: (WTF::PlatformRefPtr::~PlatformRefPtr): (WTF::PlatformRefPtr::clear): (WTF::::operator):

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• wtf/PlatformRefPtr.h (modified) (4 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2010-10-23  Martin Robinson  <mrobinson@igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        Crashes randomly in cairo_scaled_font_destroy
+        https://bugs.webkit.org/show_bug.cgi?id=46794
+
+        Make PlatformRefPtr aware of hashTableDeletedValue. When PlatformRefPtr
+        goes away this should probably be handled in the future via some special
+        hooks in RefCounted (or its contained type).
+
+        * wtf/PlatformRefPtr.h:
+        (WTF::PlatformRefPtr::~PlatformRefPtr):
+        (WTF::PlatformRefPtr::clear):
+        (WTF::::operator):
+
 2010-10-22  Adam Roben  <aroben@apple.com>
 

trunk/JavaScriptCore/wtf/PlatformRefPtr.h

@@ -63 +63 @@
     ~PlatformRefPtr()
     {
-        if (T* ptr = m_ptr)
+        T* ptr = m_ptr;
+        if (ptr && ptr != hashTableDeletedValue())
             derefPlatformPtr(ptr);
     }
@@ -71 +72 @@
         T* ptr = m_ptr;
         m_ptr = 0;
-        if (ptr)
+        if (ptr && ptr != hashTableDeletedValue())
             derefPlatformPtr(ptr);
     }
@@ -111 +112 @@
     T* ptr = m_ptr;
     m_ptr = optr;
-    if (ptr)
+    if (ptr && ptr != hashTableDeletedValue())
         derefPlatformPtr(ptr);
     return *this;
@@ -122 +123 @@
         refPlatformPtr(optr);
     m_ptr = optr;
-    if (ptr)
+    if (ptr && ptr != hashTableDeletedValue())
         derefPlatformPtr(ptr);
     return *this;