Title: [149454] trunk/Source/WebKit/mac
- Revision
- 149454
- Author
- [email protected]
- Date
- 2013-05-01 14:22:24 -0700 (Wed, 01 May 2013)
Log Message
Fix the function names of r149453
Unreviewed.
I forgot to follow one of Darin's review comment. This patch
fixes the function names to follow CF naming conventions.
Patch by Benjamin Poulain <[email protected]> on 2013-05-01
* WebView/WebHTMLRepresentation.mm:
(newArrayWithStrings):
(newArrayByConcatenatingArrays):
(+[WebHTMLRepresentation supportedMIMETypes]):
(+[WebHTMLRepresentation supportedNonImageMIMETypes]):
(+[WebHTMLRepresentation supportedImageMIMETypes]):
(+[WebHTMLRepresentation unsupportedTextMIMETypes]):
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (149453 => 149454)
--- trunk/Source/WebKit/mac/ChangeLog 2013-05-01 21:02:13 UTC (rev 149453)
+++ trunk/Source/WebKit/mac/ChangeLog 2013-05-01 21:22:24 UTC (rev 149454)
@@ -1,3 +1,20 @@
+2013-05-01 Benjamin Poulain <[email protected]>
+
+ Fix the function names of r149453
+
+ Unreviewed.
+
+ I forgot to follow one of Darin's review comment. This patch
+ fixes the function names to follow CF naming conventions.
+
+ * WebView/WebHTMLRepresentation.mm:
+ (newArrayWithStrings):
+ (newArrayByConcatenatingArrays):
+ (+[WebHTMLRepresentation supportedMIMETypes]):
+ (+[WebHTMLRepresentation supportedNonImageMIMETypes]):
+ (+[WebHTMLRepresentation supportedImageMIMETypes]):
+ (+[WebHTMLRepresentation unsupportedTextMIMETypes]):
+
2013-05-01 Benjamin Poulain <[email protected]>
Simplify WebHTMLRepresentation supportedMIMETypes methods
Modified: trunk/Source/WebKit/mac/WebView/WebHTMLRepresentation.mm (149453 => 149454)
--- trunk/Source/WebKit/mac/WebView/WebHTMLRepresentation.mm 2013-05-01 21:02:13 UTC (rev 149453)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLRepresentation.mm 2013-05-01 21:22:24 UTC (rev 149454)
@@ -84,8 +84,8 @@
@implementation WebHTMLRepresentation
-static NSMutableArray *createArrayWithStrings(const HashSet<String>& set) NS_RETURNS_RETAINED;
-static NSMutableArray *createArrayWithStrings(const HashSet<String>& set)
+static NSMutableArray *newArrayWithStrings(const HashSet<String>& set) NS_RETURNS_RETAINED;
+static NSMutableArray *newArrayWithStrings(const HashSet<String>& set)
{
NSMutableArray *array = [[NSMutableArray alloc] initWithCapacity:set.size()];
HashSet<String>::const_iterator end = set.end();
@@ -94,8 +94,8 @@
return array;
}
-static NSMutableArray *createArrayByConcatenatingArrays(NSArray *first, NSArray *second) NS_RETURNS_RETAINED;
-static NSMutableArray *createArrayByConcatenatingArrays(NSArray *first, NSArray *second)
+static NSMutableArray *newArrayByConcatenatingArrays(NSArray *first, NSArray *second) NS_RETURNS_RETAINED;
+static NSMutableArray *newArrayByConcatenatingArrays(NSArray *first, NSArray *second)
{
NSMutableArray *result = [first mutableCopy];
[result addObjectsFromArray:second];
@@ -104,25 +104,25 @@
+ (NSArray *)supportedMIMETypes
{
- static __unsafe_unretained NSArray *staticSupportedMIMETypes = createArrayByConcatenatingArrays([self supportedNonImageMIMETypes], [self supportedImageMIMETypes]);
+ static __unsafe_unretained NSArray *staticSupportedMIMETypes = newArrayByConcatenatingArrays([self supportedNonImageMIMETypes], [self supportedImageMIMETypes]);
return staticSupportedMIMETypes;
}
+ (NSArray *)supportedNonImageMIMETypes
{
- static __unsafe_unretained NSArray *staticSupportedNonImageMIMETypes = createArrayWithStrings(MIMETypeRegistry::getSupportedNonImageMIMETypes());
+ static __unsafe_unretained NSArray *staticSupportedNonImageMIMETypes = newArrayWithStrings(MIMETypeRegistry::getSupportedNonImageMIMETypes());
return staticSupportedNonImageMIMETypes;
}
+ (NSArray *)supportedImageMIMETypes
{
- static __unsafe_unretained NSArray *staticSupportedImageMIMETypes = createArrayWithStrings(MIMETypeRegistry::getSupportedImageMIMETypes());
+ static __unsafe_unretained NSArray *staticSupportedImageMIMETypes = newArrayWithStrings(MIMETypeRegistry::getSupportedImageMIMETypes());
return staticSupportedImageMIMETypes;
}
+ (NSArray *)unsupportedTextMIMETypes
{
- static __unsafe_unretained NSArray *staticUnsupportedTextMIMETypes = createArrayWithStrings(MIMETypeRegistry::getUnsupportedTextMIMETypes());
+ static __unsafe_unretained NSArray *staticUnsupportedTextMIMETypes = newArrayWithStrings(MIMETypeRegistry::getUnsupportedTextMIMETypes());
return staticUnsupportedTextMIMETypes;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
