[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

[ap at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit f6c6347ddb3677da0bf4e348aef37fca3eb827bf
Author: ap at apple.com <ap at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Mar 10 04:05:31 2010 +0000

            Reviewed by Mark Rowe.
    
            https://bugs.webkit.org/show_bug.cgi?id=35951
            <rdar://problem/7327060> Frequent crashes in Dashcode at JSC::Bindings::ObjcInstance::~ObjcInstance + 80
    
            * bridge/objc/objc_instance.mm: (createInstanceWrapperCache): Fix Tiger code path, too.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55760 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index de0048c..59f5b15 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,14 @@
 2010-03-09  Alexey Proskuryakov  <ap at apple.com>
 
+        Reviewed by Mark Rowe.
+
+        https://bugs.webkit.org/show_bug.cgi?id=35951
+        <rdar://problem/7327060> Frequent crashes in Dashcode at JSC::Bindings::ObjcInstance::~ObjcInstance + 80
+
+        * bridge/objc/objc_instance.mm: (createInstanceWrapperCache): Fix Tiger code path, too.
+
+2010-03-09  Alexey Proskuryakov  <ap at apple.com>
+
         Reviewed by Oliver Hunt.
 
         https://bugs.webkit.org/show_bug.cgi?id=35951
diff --git a/WebCore/bridge/objc/objc_instance.mm b/WebCore/bridge/objc/objc_instance.mm
index edfd66a..de330ae 100644
--- a/WebCore/bridge/objc/objc_instance.mm
+++ b/WebCore/bridge/objc/objc_instance.mm
@@ -54,7 +54,7 @@ static NSMapTable *s_instanceWrapperCache;
 static NSMapTable *createInstanceWrapperCache()
 {
 #ifdef BUILDING_ON_TIGER
-    return NSCreateMapTable(NSNonRetainedObjectMapKeyCallBacks, NSNonOwnedPointerMapValueCallBacks, 0);
+    return NSCreateMapTable(NSNonOwnedPointerMapKeyCallBacks, NSNonOwnedPointerMapValueCallBacks, 0);
 #else
     // NSMapTable with zeroing weak pointers is the recommended way to build caches like this under garbage collection.
     NSPointerFunctionsOptions keyOptions = NSPointerFunctionsZeroingWeakMemory | NSPointerFunctionsOpaquePersonality;

-- 
WebKit Debian packaging