[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[dimich at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit 1886d09e3489d994e3f8b262cc935d0f140d9b69
Author: dimich at chromium.org <dimich at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 19 01:27:44 2009 +0000

    Need to ASSERT(isMainThread()) in ThreadShared methods.
    https://bugs.webkit.org/show_bug.cgi?id=31637
    
    Reviewed by Darin Adler.
    
    Added ASSERT(IsMainThread()) to all following methods:
    * platform/TreeShared.h:
    (WebCore::TreeShared::TreeShared):
    (WebCore::TreeShared::~TreeShared):
    (WebCore::TreeShared::ref):
    (WebCore::TreeShared::deref):
    (WebCore::TreeShared::setParent):
    (WebCore::TreeShared::parent):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51158 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9031b7c..992ad35 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2009-11-18  Dmitry Titov  <dimich at chromium.org>
+
+        Reviewed by Darin Adler.
+
+        Need to ASSERT(isMainThread()) in ThreadShared methods.
+        https://bugs.webkit.org/show_bug.cgi?id=31637
+
+        Added ASSERT(IsMainThread()) to all following methods:
+        * platform/TreeShared.h:
+        (WebCore::TreeShared::TreeShared):
+        (WebCore::TreeShared::~TreeShared):
+        (WebCore::TreeShared::ref):
+        (WebCore::TreeShared::deref):
+        (WebCore::TreeShared::setParent):
+        (WebCore::TreeShared::parent):
+
 2009-11-18  Girish Ramakrishnan  <girish at forwardbias.in>
 
         Reviewed by Eric Seidel.
diff --git a/WebCore/platform/TreeShared.h b/WebCore/platform/TreeShared.h
index 02728ff..a60ad0d 100644
--- a/WebCore/platform/TreeShared.h
+++ b/WebCore/platform/TreeShared.h
@@ -23,6 +23,9 @@
 
 #include <wtf/Assertions.h>
 #include <wtf/Noncopyable.h>
+#ifndef NDEBUG
+#include <wtf/Threading.h>
+#endif
 
 namespace WebCore {
 
@@ -32,6 +35,7 @@ public:
         : m_refCount(initialRefCount)
         , m_parent(0)
     {
+        ASSERT(isMainThread());
 #ifndef NDEBUG
         m_deletionHasBegun = false;
         m_inRemovedLastRefFunction = false;
@@ -39,11 +43,13 @@ public:
     }
     virtual ~TreeShared()
     {
+        ASSERT(isMainThread());
         ASSERT(m_deletionHasBegun);
     }
 
     void ref()
     {
+        ASSERT(isMainThread());
         ASSERT(!m_deletionHasBegun);
         ASSERT(!m_inRemovedLastRefFunction);
         ++m_refCount;
@@ -51,6 +57,7 @@ public:
 
     void deref()
     {
+        ASSERT(isMainThread());
         ASSERT(!m_deletionHasBegun);
         ASSERT(!m_inRemovedLastRefFunction);
         if (--m_refCount <= 0 && !m_parent) {
@@ -73,8 +80,17 @@ public:
         return m_refCount;
     }
 
-    void setParent(T* parent) { m_parent = parent; }
-    T* parent() const { return m_parent; }
+    void setParent(T* parent)
+    { 
+        ASSERT(isMainThread());
+        m_parent = parent; 
+    }
+
+    T* parent() const
+    {
+        ASSERT(isMainThread());
+        return m_parent;
+    }
 
 #ifndef NDEBUG
     bool m_deletionHasBegun;

-- 
WebKit Debian packaging