Changeset 158538 in webkit

Timestamp:

Nov 3, 2013 12:41:01 PM (10 years ago)

Author:

mitz@apple.com

Message:

[Cocoa] Wrappers' -copyWithZone: should copy if the collection is mutable
​https://bugs.webkit.org/show_bug.cgi?id=123707

Reviewed by Geoff Garen.

• Shared/Cocoa/WKNSArray.mm:

(-[WKNSArray copyWithZone:]): If the array is mutable, make a copy.

• Shared/Cocoa/WKNSDictionary.mm:

(-[WKNSDictionary copyWithZone:]): If the dictionary is mutable, make a copy.

• Shared/ImmutableArray.h:

(WebKit::ImmutableArray::entries): Added this accessor.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/Cocoa/WKNSArray.mm (modified) (1 diff)
• Shared/Cocoa/WKNSDictionary.mm (modified) (1 diff)
• Shared/ImmutableArray.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-11-03  Dan Bernstein  <mitz@apple.com>
+
+        [Cocoa] Wrappers' -copyWithZone: should copy if the collection is mutable
+        https://bugs.webkit.org/show_bug.cgi?id=123707
+
+        Reviewed by Geoff Garen.
+
+        * Shared/Cocoa/WKNSArray.mm:
+        (-[WKNSArray copyWithZone:]): If the array is mutable, make a copy.
+        * Shared/Cocoa/WKNSDictionary.mm:
+        (-[WKNSDictionary copyWithZone:]): If the dictionary is mutable, make a copy.
+        * Shared/ImmutableArray.h:
+        (WebKit::ImmutableArray::entries): Added this accessor.
+
 2013-11-02  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebKit2/Shared/Cocoa/WKNSArray.mm

@@ -59 +59 @@
 - (id)copyWithZone:(NSZone *)zone
 {
-    return [self retain];
+    if (!reinterpret_cast<ImmutableArray*>(&_array)->isMutable())
+        return [self retain];
+
+    auto entries = reinterpret_cast<ImmutableArray*>(&_array)->entries();
+    return ImmutableArray::adopt(entries).leakRef()->wrapper();
 }
 

trunk/Source/WebKit2/Shared/Cocoa/WKNSDictionary.mm

@@ -79 +79 @@
 - (id)copyWithZone:(NSZone *)zone
 {
-    return [self retain];
+    if (!reinterpret_cast<ImmutableDictionary*>(&_dictionary)->isMutable())
+        return [self retain];
+
+    auto map = reinterpret_cast<ImmutableDictionary*>(&_dictionary)->map();
+    return ImmutableDictionary::adopt(map).leakRef()->wrapper();
 }
 

trunk/Source/WebKit2/Shared/ImmutableArray.h

@@ -66 +66 @@
     virtual bool isMutable() { return false; }
 
+    const Vector<RefPtr<APIObject>>& entries() { return m_entries; }
+
 protected:
     ImmutableArray();