[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[aestes at apple.com]

The following commit has been merged in the debian/experimental branch:
commit c3c1cafa0870ab48640ebebe916e90f1b6f6462c
Author: aestes at apple.com <aestes at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 13 00:51:06 2010 +0000

    Check in some cleanup from the previous commit.
    
    Rubber-stamped by Darin Adler.
    
    * WebView/WebView.mm:
    (leakMailQuirksUserScriptPath): Renamed to indicate that this function
    leaks an NSString.
    (-[WebView _injectMailQuirksScript]): Moved a static initialization from
    a separate class method into the only method that used it and removed
    the now-unnecessary class method.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69623 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 24e1fea..50d6ac1 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,16 @@
+2010-10-12  Andy Estes  <aestes at apple.com>
+
+        Rubber-stamped by Darin Adler.
+
+        Check in some cleanup from the previous commit.
+
+        * WebView/WebView.mm:
+        (leakMailQuirksUserScriptPath): Renamed to indicate that this function
+        leaks an NSString.
+        (-[WebView _injectMailQuirksScript]): Moved a static initialization from
+        a separate class method into the only method that used it and removed
+        the now-unnecessary class method.
+
 2010-10-12  Eric Seidel  <eric at webkit.org>
 
         Reviewed by Darin Adler.
diff --git a/WebKit/mac/WebView/WebView.mm b/WebKit/mac/WebView/WebView.mm
index 432d712..9b267ef 100644
--- a/WebKit/mac/WebView/WebView.mm
+++ b/WebKit/mac/WebView/WebView.mm
@@ -637,23 +637,17 @@ static bool shouldEnableLoadDeferring()
     return _private->usesDocumentViews;
 }
 
-static NSString *mailQuirksUserScriptPath()
+static NSString *leakMailQuirksUserScriptPath()
 {
     NSString *scriptPath = [[NSBundle bundleForClass:[WebView class]] pathForResource:@"MailQuirksUserScript" ofType:@"js"];
     return [[NSString alloc] initWithContentsOfFile:scriptPath];
 }
 
-+ (NSString *)_mailQuirksUserScript
-{
-    static NSString* mailQuirksScript = mailQuirksUserScriptPath();
-    return mailQuirksScript;
-}
-
 - (void)_injectMailQuirksScript
 {
+    static NSString *mailQuirksScriptPath = leakMailQuirksUserScriptPath();
     core(self)->group().addUserScriptToWorld(core([WebScriptWorld world]),
-        [WebView _mailQuirksUserScript], KURL(), 0, 0, InjectAtDocumentEnd,
-        InjectInAllFrames);
+        mailQuirksScriptPath, KURL(), 0, 0, InjectAtDocumentEnd, InjectInAllFrames);
 }
 
 - (void)_commonInitializationWithFrameName:(NSString *)frameName groupName:(NSString *)groupName usesDocumentViews:(BOOL)usesDocumentViews

-- 
WebKit Debian packaging