A couple of tweaks to the previous patch, from Darin's review.

        * Misc.subproj/WebNSPasteboardExtras.m:
        (_writableTypesForImageWithoutArchive):
        remove unnecessary _web prefix
        (_writableTypesForImageWithArchive):
        ditto
        (+[NSPasteboard _web_writableTypesForImageIncludingArchive:]):
        use mutableCopy rather than initWithArray:, and adjust for name changes

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@8826 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index e8c4eb9eac3c1f9c1f219314c166c795c40a3aa2..365f20a393b46c168b533543f6573aad4ceb0c42 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,15 @@
+2005-03-08  John Sullivan  <sullivan@apple.com>
+
+        A couple of tweaks to the previous patch, from Darin's review.
+
+        * Misc.subproj/WebNSPasteboardExtras.m:
+        (_writableTypesForImageWithoutArchive):
+        remove unnecessary _web prefix
+        (_writableTypesForImageWithArchive):
+        ditto
+        (+[NSPasteboard _web_writableTypesForImageIncludingArchive:]):
+        use mutableCopy rather than initWithArray:, and adjust for name changes
+

 2005-03-08  John Sullivan  <sullivan@apple.com>
 
         Reviewed by Ken.
 2005-03-08  John Sullivan  <sullivan@apple.com>
 
         Reviewed by Ken.

diff --git a/WebKit/Misc.subproj/WebNSPasteboardExtras.m b/WebKit/Misc.subproj/WebNSPasteboardExtras.m
index 49da56edef0ee2be4f8c738d59578ebb20959202..7f6f7e80c6de11a84ba2eb9e4780b494f97740a4 100644 (file)
--- a/WebKit/Misc.subproj/WebNSPasteboardExtras.m
+++ b/WebKit/Misc.subproj/WebNSPasteboardExtras.m
@@ -65,7 +65,7 @@ NSString *WebURLNamePboardType = nil;
     return types;
 }
 
     return types;
 }
 

-static NSArray *_web_writableTypesForImageWithoutArchive ()
+static NSArray *_writableTypesForImageWithoutArchive (void)

 {
     static NSMutableArray *types = nil;
     if (types == nil) {
 {
     static NSMutableArray *types = nil;
     if (types == nil) {


@@ -75,11 +75,11 @@ static NSArray *_web_writableTypesForImageWithoutArchive ()
     return types;
 }
 
     return types;
 }
 

-static NSArray *_web_writableTypesForImageWithArchive ()
+static NSArray *_writableTypesForImageWithArchive (void)

 {
     static NSMutableArray *types = nil;
     if (types == nil) {
 {
     static NSMutableArray *types = nil;
     if (types == nil) {

-        types = [[NSMutableArray alloc] initWithArray:_web_writableTypesForImageWithoutArchive()];
+        types = [_writableTypesForImageWithoutArchive() mutableCopy];

         [types addObject:NSRTFDPboardType];
         [types addObject:WebArchivePboardType];
     }
         [types addObject:NSRTFDPboardType];
         [types addObject:WebArchivePboardType];
     }


@@ -89,8 +89,8 @@ static NSArray *_web_writableTypesForImageWithArchive ()
 + (NSArray *)_web_writableTypesForImageIncludingArchive:(BOOL)hasArchive
 {
     return hasArchive 
 + (NSArray *)_web_writableTypesForImageIncludingArchive:(BOOL)hasArchive
 {
     return hasArchive 

-        ? _web_writableTypesForImageWithArchive()
-        : _web_writableTypesForImageWithoutArchive();
+        ? _writableTypesForImageWithArchive()
+        : _writableTypesForImageWithoutArchive();

 }
 
 + (NSArray *)_web_dragTypesForURL
 }
 
 + (NSArray *)_web_dragTypesForURL