[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

tony at chromium.org tony at chromium.org
Wed Dec 22 18:04:11 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit a6eb270eb090231326a24e585b1f20fe7ea914ba
Author: tony at chromium.org <tony at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 6 20:39:50 2010 +0000

    2010-12-06  Tony Chang  <tony at chromium.org>
    
            Reviewed by Ojan Vafai.
    
            [chromium] fix an assert hit in DRT
            https://bugs.webkit.org/show_bug.cgi?id=50575
    
            This class uses WTF's RefPtr, but expects chrome's base::RefPtr
            semantics.
    
            Otherwise, we hit ASSERTION FAILED: !m_adoptionIsRequired
            (third_party/WebKit/JavaScriptCore/wtf/RefCounted.h:37 void
            WTF::RefCountedBase::ref()).
    
            * DumpRenderTree/chromium/TestWebWorker.h:
            (TestWebWorker::TestWebWorker):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73389 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index f9778e5..f4939f9 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,20 @@
+2010-12-06  Tony Chang  <tony at chromium.org>
+
+        Reviewed by Ojan Vafai.
+
+        [chromium] fix an assert hit in DRT
+        https://bugs.webkit.org/show_bug.cgi?id=50575
+
+        This class uses WTF's RefPtr, but expects chrome's base::RefPtr
+        semantics.
+
+        Otherwise, we hit ASSERTION FAILED: !m_adoptionIsRequired
+        (third_party/WebKit/JavaScriptCore/wtf/RefCounted.h:37 void
+        WTF::RefCountedBase::ref()).
+
+        * DumpRenderTree/chromium/TestWebWorker.h:
+        (TestWebWorker::TestWebWorker):
+
 2010-12-02  Ojan Vafai  <ojan at chromium.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebKitTools/DumpRenderTree/chromium/TestWebWorker.h b/WebKitTools/DumpRenderTree/chromium/TestWebWorker.h
index a29e45f..89e19af 100644
--- a/WebKitTools/DumpRenderTree/chromium/TestWebWorker.h
+++ b/WebKitTools/DumpRenderTree/chromium/TestWebWorker.h
@@ -48,6 +48,9 @@ class TestWebWorker : public WebKit::WebWorker,
 public:
     TestWebWorker()
     {
+        // This class expects refcounting semantics like those found in
+        // Chromium's base::RefCounted, so it's OK to call ref() directly.
+        relaxAdoptionRequirement();
         ref();
         // The initial counter value should be 2. One for a worker object,
         // another for a worker context object. We need to call ref() just once

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list