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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 9f4000027b73f43cfc604ec504ce52188994d35a
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jul 13 23:20:39 2010 +0000

    2010-07-13  Chris Guillory  <chris.guillory at google.com>
    
            Reviewed by David Levin.
    
            Fix adoptRef usage violation in WebAccessibilityCacheImpl.cpp.
            https://bugs.webkit.org/show_bug.cgi?id=42092
    
            * src/WebAccessibilityCacheImpl.cpp:
            (WebKit::WebAccessibilityCacheImpl::WeakHandle::create):
            (WebKit::WebAccessibilityCacheImpl::WeakHandle::WeakHandle):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63258 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 640a828..b16aeeb 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,14 @@
+2010-07-13  Chris Guillory  <chris.guillory at google.com>
+
+        Reviewed by David Levin.
+
+        Fix adoptRef usage violation in WebAccessibilityCacheImpl.cpp.
+        https://bugs.webkit.org/show_bug.cgi?id=42092
+
+        * src/WebAccessibilityCacheImpl.cpp:
+        (WebKit::WebAccessibilityCacheImpl::WeakHandle::create):
+        (WebKit::WebAccessibilityCacheImpl::WeakHandle::WeakHandle):
+
 2010-07-13  Albert J. Wong  <ajwong at chromium.org>
 
         Unreviewed, build fix.
diff --git a/WebKit/chromium/src/WebAccessibilityCacheImpl.cpp b/WebKit/chromium/src/WebAccessibilityCacheImpl.cpp
index 03e5f46..abb63cc 100644
--- a/WebKit/chromium/src/WebAccessibilityCacheImpl.cpp
+++ b/WebKit/chromium/src/WebAccessibilityCacheImpl.cpp
@@ -64,14 +64,15 @@ WebAccessibilityCache* WebAccessibilityCache::create()
 PassRefPtr<WebAccessibilityCacheImpl::WeakHandle> WebAccessibilityCacheImpl::WeakHandle::create(AccessibilityObject* object)
 {
     // FIXME: Remove resetting ref-count from AccessibilityObjectWrapper
-    // and convert to use adoptRef.
-    return new WebAccessibilityCacheImpl::WeakHandle(object);
+    RefPtr<WebAccessibilityCacheImpl::WeakHandle> weakHandle = adoptRef(new WebAccessibilityCacheImpl::WeakHandle(object));
+    weakHandle->m_object->setWrapper(weakHandle.get());
+    
+    return weakHandle.release();
 }
 
 WebAccessibilityCacheImpl::WeakHandle::WeakHandle(AccessibilityObject* object)
     : AccessibilityObjectWrapper(object)
 {
-    m_object->setWrapper(this);
 }
 
 // WebAccessibilityCacheImpl ----------------------------------------

-- 
WebKit Debian packaging