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

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 272ad4b112e76b2f8883ca4252926f6a3d8c2daf
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 27 09:07:43 2009 +0000

    2009-10-27  Eric Seidel  <eric at webkit.org>
    
            No review, rolling out r50131.
            http://trac.webkit.org/changeset/50131
    
            * bridge/objc/objc_instance.h:
            * bridge/objc/objc_instance.mm:
            (ObjcInstance::ObjcInstance):
            (ObjcInstance::virtualEnd):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50133 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 65df547..70473e4 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2009-10-27  Eric Seidel  <eric at webkit.org>
+
+        No review, rolling out r50131.
+        http://trac.webkit.org/changeset/50131
+
+        * bridge/objc/objc_instance.h:
+        * bridge/objc/objc_instance.mm:
+        (ObjcInstance::ObjcInstance):
+        (ObjcInstance::virtualEnd):
+
 2009-10-26  Daniel Bates  <dbates at webkit.org>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/bridge/objc/objc_instance.h b/WebCore/bridge/objc/objc_instance.h
index 1d287c6..64cd491 100644
--- a/WebCore/bridge/objc/objc_instance.h
+++ b/WebCore/bridge/objc/objc_instance.h
@@ -71,7 +71,7 @@ private:
     
     RetainPtr<ObjectStructPtr> _instance;
     mutable ObjcClass *_class;
-    RetainPtr<ObjectStructPtr> _pool;
+    ObjectStructPtr _pool;
     int _beginCount;
 };
 
diff --git a/WebCore/bridge/objc/objc_instance.mm b/WebCore/bridge/objc/objc_instance.mm
index 19b5a41..f7550e4 100644
--- a/WebCore/bridge/objc/objc_instance.mm
+++ b/WebCore/bridge/objc/objc_instance.mm
@@ -91,6 +91,7 @@ ObjcInstance::ObjcInstance(id instance, PassRefPtr<RootObject> rootObject)
     : Instance(rootObject)
     , _instance(instance)
     , _class(0)
+    , _pool(0)
     , _beginCount(0)
 {
 }
@@ -134,7 +135,7 @@ void ObjcInstance::virtualEnd()
     _beginCount--;
     ASSERT(_beginCount >= 0);
     if (!_beginCount) {
-        [_pool.get() drain];
+        [_pool drain];
         _pool = 0;
     }
 }

-- 
WebKit Debian packaging