Changeset 149453 in webkit

Timestamp:

May 1, 2013 2:02:13 PM (11 years ago)

Author:

benjamin@webkit.org

Message:

Simplify WebHTMLRepresentation supportedMIMETypes methods
​https://bugs.webkit.org/show_bug.cgi?id=115314

Reviewed by Darin Adler.

The initialization was surprisingly complex because of DEFINE_STATIC_LOCAL.
First, a new pointer was allocated on the heap with fast malloc (for RetainPtr<NSArray>).
Then a new NSMutableArray was allocated but immediately put on the autorelease pool.
Finally, that array was retained by the RetainPtr.

This patch changes the code to only leak the NSMutableArray memory. There
is no fastMalloc, nor any use of the autorelease pool.

• WebView/WebHTMLRepresentation.mm:

(createArrayWithStrings):
(createArrayByConcatenatingArrays):
(+[WebHTMLRepresentation supportedMIMETypes]):
(+[WebHTMLRepresentation supportedNonImageMIMETypes]):
(+[WebHTMLRepresentation supportedImageMIMETypes]):
(+[WebHTMLRepresentation unsupportedTextMIMETypes]):

Location:

trunk/Source/WebKit/mac

Files:

• ChangeLog (modified) (1 diff)
• WebView/WebHTMLRepresentation.mm (modified) (3 diffs)

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2013-05-01  Benjamin Poulain  <benjamin@webkit.org>
+
+        Simplify WebHTMLRepresentation supportedMIMETypes methods
+        https://bugs.webkit.org/show_bug.cgi?id=115314
+
+        Reviewed by Darin Adler.
+
+        The initialization was surprisingly complex because of DEFINE_STATIC_LOCAL.
+        First, a new pointer was allocated on the heap with fast malloc (for RetainPtr<NSArray>).
+        Then a new NSMutableArray was allocated but immediately put on the autorelease pool.
+        Finally, that array was retained by the RetainPtr.
+
+        This patch changes the code to only leak the NSMutableArray memory. There
+        is no fastMalloc, nor any use of the autorelease pool.
+
+        * WebView/WebHTMLRepresentation.mm:
+        (createArrayWithStrings):
+        (createArrayByConcatenatingArrays):
+        (+[WebHTMLRepresentation supportedMIMETypes]):
+        (+[WebHTMLRepresentation supportedNonImageMIMETypes]):
+        (+[WebHTMLRepresentation supportedImageMIMETypes]):
+        (+[WebHTMLRepresentation unsupportedTextMIMETypes]):
+
 2013-04-30  Darin Adler  <darin@apple.com>
 

trunk/Source/WebKit/mac/WebView/WebHTMLRepresentation.mm

@@ -85 +85 @@
 @implementation WebHTMLRepresentation
 
-static NSArray *stringArray(const HashSet<String>& set)
-{
-    NSMutableArray *array = [NSMutableArray arrayWithCapacity:set.size()];
+static NSMutableArray *createArrayWithStrings(const HashSet<String>& set) NS_RETURNS_RETAINED;
+static NSMutableArray *createArrayWithStrings(const HashSet<String>& set)
+{
+    NSMutableArray *array = [[NSMutableArray alloc] initWithCapacity:set.size()];
     HashSet<String>::const_iterator end = set.end();
     for (HashSet<String>::const_iterator it = set.begin(); it != end; ++it)
@@ -94 +95 @@
 }
 
-static NSArray *concatenateArrays(NSArray *first, NSArray *second)
-{
-    NSMutableArray *result = [[first mutableCopy] autorelease];
+static NSMutableArray *createArrayByConcatenatingArrays(NSArray *first, NSArray *second) NS_RETURNS_RETAINED;
+static NSMutableArray *createArrayByConcatenatingArrays(NSArray *first, NSArray *second)
+{
+    NSMutableArray *result = [first mutableCopy];
     [result addObjectsFromArray:second];
     return result;
@@ -103 +105 @@
 + (NSArray *)supportedMIMETypes
 {
-    DEFINE_STATIC_LOCAL(RetainPtr<NSArray>, staticSupportedMIMETypes, (concatenateArrays([self supportedNonImageMIMETypes], [self supportedImageMIMETypes])));
-    return staticSupportedMIMETypes.get();
+    static __unsafe_unretained NSArray *staticSupportedMIMETypes = createArrayByConcatenatingArrays([self supportedNonImageMIMETypes], [self supportedImageMIMETypes]);
+    return staticSupportedMIMETypes;
 }
 
 + (NSArray *)supportedNonImageMIMETypes
 {
-    DEFINE_STATIC_LOCAL(RetainPtr<NSArray>, staticSupportedNonImageMIMETypes, (stringArray(MIMETypeRegistry::getSupportedNonImageMIMETypes())));
-    return staticSupportedNonImageMIMETypes.get();
+    static __unsafe_unretained NSArray *staticSupportedNonImageMIMETypes = createArrayWithStrings(MIMETypeRegistry::getSupportedNonImageMIMETypes());
+    return staticSupportedNonImageMIMETypes;
 }
 
 + (NSArray *)supportedImageMIMETypes
 {
-    DEFINE_STATIC_LOCAL(RetainPtr<NSArray>, staticSupportedImageMIMETypes, (stringArray(MIMETypeRegistry::getSupportedImageMIMETypes())));
-    return staticSupportedImageMIMETypes.get();
+    static __unsafe_unretained NSArray *staticSupportedImageMIMETypes = createArrayWithStrings(MIMETypeRegistry::getSupportedImageMIMETypes());
+    return staticSupportedImageMIMETypes;
 }
 
 + (NSArray *)unsupportedTextMIMETypes
 {
-    DEFINE_STATIC_LOCAL(RetainPtr<NSArray>, staticUnsupportedTextMIMETypes, (stringArray(MIMETypeRegistry::getUnsupportedTextMIMETypes())));
-    return staticUnsupportedTextMIMETypes.get();
+    static __unsafe_unretained NSArray *staticUnsupportedTextMIMETypes = createArrayWithStrings(MIMETypeRegistry::getUnsupportedTextMIMETypes());
+    return staticUnsupportedTextMIMETypes;
 }