[webkit-changes] [93925] trunk/Source/WebKit2

[weinig]

Title: [93925] trunk/Source/WebKit2

Revision

93925

Author

wei...@apple.com

Date

2011-08-26 16:44:02 -0700 (Fri, 26 Aug 2011)

Log Message

Fold _webkit_initWithDomain into _webkit_errorWithDomain in WebKit2
https://bugs.webkit.org/show_bug.cgi?id=67063

Reviewed by Anders Carlsson.

* WebProcess/WebCoreSupport/mac/WebErrorsMac.mm:
(+[NSError _webkit_errorWithDomain:code:URL:]):

Modified Paths

• trunk/Source/WebKit2/ChangeLog
• trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebErrorsMac.mm

Diff

Modified: trunk/Source/WebKit2/ChangeLog (93924 => 93925)

--- trunk/Source/WebKit2/ChangeLog	2011-08-26 23:42:56 UTC (rev 93924)
+++ trunk/Source/WebKit2/ChangeLog	2011-08-26 23:44:02 UTC (rev 93925)
@@ -1,3 +1,13 @@
+2011-08-26  Sam Weinig  <s...@webkit.org>
+
+        Fold _webkit_initWithDomain into _webkit_errorWithDomain in WebKit2
+        https://bugs.webkit.org/show_bug.cgi?id=67063
+
+        Reviewed by Anders Carlsson.
+
+        * WebProcess/WebCoreSupport/mac/WebErrorsMac.mm:
+        (+[NSError _webkit_errorWithDomain:code:URL:]):
+
 2011-08-26  Anders Carlsson  <ander...@apple.com>
 
         Implement NPN_ScheduleTimer/NPN_UnscheduleTimer

Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebErrorsMac.mm (93924 => 93925)

--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebErrorsMac.mm	2011-08-26 23:42:56 UTC (rev 93924)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebErrorsMac.mm	2011-08-26 23:44:02 UTC (rev 93925)
@@ -71,7 +71,7 @@
     pthread_once(&registerErrorsControl, registerErrors);
 }
 
--(id)_webkit_initWithDomain:(NSString *)domain code:(int)code URL:(NSURL *)URL
++(id)_webkit_errorWithDomain:(NSString *)domain code:(int)code URL:(NSURL *)URL
 {
     NSDictionary *descriptionsDict;
     NSString *localizedDesc;
@@ -84,12 +84,8 @@
         [URL absoluteString], @"NSErrorFailingURLStringKey",
         localizedDesc, NSLocalizedDescriptionKey,
         nil];
-    return [self initWithDomain:domain code:code userInfo:dict];
-}
 
-+(id)_webkit_errorWithDomain:(NSString *)domain code:(int)code URL:(NSURL *)URL
-{
-    return [[[self alloc] _webkit_initWithDomain:domain code:code URL:URL] autorelease];
+    return [[[self alloc] initWithDomain:domain code:code userInfo:dict] autorelease];
 }
 
 + (NSError *)_webKitErrorWithDomain:(NSString *)domain code:(int)code URL:(NSURL *)URL

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes