Changeset 84191 in webkit

Timestamp:

Apr 18, 2011 3:20:03 PM (13 years ago)

Author:

cwzwarich@webkit.org

Message:

Reviewed by Timothy Hatcher.

Stop using -[NSString initWithContentsOfFile:]
​https://bugs.webkit.org/show_bug.cgi?id=58763

-[NSString initWithContentsOfFile:] was deprecated in 10.4, so we should stop using it.

• WebView/WebView.mm:

(leakMailQuirksUserScriptContents):
(leakOutlookQuirksUserScriptContents):

Location:

trunk/Source/WebKit/mac

Files:

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

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2011-04-17  Cameron Zwarich  <zwarich@apple.com>
+
+        Reviewed by Timothy Hatcher.
+
+        Stop using -[NSString initWithContentsOfFile:]
+        https://bugs.webkit.org/show_bug.cgi?id=58763
+
+        -[NSString initWithContentsOfFile:] was deprecated in 10.4, so we should stop using it.
+
+        * WebView/WebView.mm:
+        (leakMailQuirksUserScriptContents):
+        (leakOutlookQuirksUserScriptContents):
+
 2011-04-17  David Kilzer  <ddkilzer@apple.com>
 

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

@@ -644 +644 @@
 {
     NSString *scriptPath = [[NSBundle bundleForClass:[WebView class]] pathForResource:@"MailQuirksUserScript" ofType:@"js"];
-    return [[NSString alloc] initWithContentsOfFile:scriptPath];
+    NSStringEncoding encoding;
+    return [[NSString alloc] initWithContentsOfFile:scriptPath usedEncoding:&encoding error:0];
 }
 
@@ -664 +665 @@
 {
     NSString *scriptPath = [[NSBundle bundleForClass:[WebView class]] pathForResource:@"OutlookQuirksUserScript" ofType:@"js"];
-    return [[NSString alloc] initWithContentsOfFile:scriptPath];
+    NSStringEncoding encoding;
+    return [[NSString alloc] initWithContentsOfFile:scriptPath usedEncoding:&encoding error:0];
 }