[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[sullivan]

The following commit has been merged in the debian/unstable branch:
commit dd243992bab86692e9bcdb31d519bd7b575fd3ce
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Mar 5 01:11:05 2003 +0000

    WebKit:
    
            Reviewed by Darin
    
            * Misc.subproj/WebKitNSStringExtras.h:
            * Misc.subproj/WebKitNSStringExtras.m:
            (-[NSString _web_widthWithFont:]):
    	(-[NSString _web_drawAtPoint:font:textColor:):
    	removed the unnecessary string parameter from these two
    	NSString methods.
    
    WebBrowser:
    
    	- updated all callers to WebKitNSStringExtras methods that I renamed.
    
    	Reviewed by Darin
    
            * BrowserNSStringExtras.m:
            (-[NSString drawDoubledInRect:withTopColor:bottomColor:font:centered:flipped:]):
    	replace _web_drawString:atPoint:... with _web_drawAtPoint:...
            * DownloadRow.m:
            (-[DownloadRow bestWidth]):
    	replace _web_widthOfString:font:... with _web_widthWithFont:...
            * TabBarView.m:
            (-[TabBarView _leftTruncateWordsFrom:withFont:width:maxWordsToRemove:]):
    	ditto
            * TabButton.m:
            (-[TabButton _updateCellAttributes]):
    	ditto
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3748 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index a0d6024..627c9ae 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2003-03-04  John Sullivan  <sullivan at apple.com>
+
+        Reviewed by Darin
+
+        * Misc.subproj/WebKitNSStringExtras.h:
+        * Misc.subproj/WebKitNSStringExtras.m:
+        (-[NSString _web_widthWithFont:]):
+	(-[NSString _web_drawAtPoint:font:textColor:):
+	removed the unnecessary string parameter from these two
+	NSString methods.
+
 2003-03-04  Darin Adler  <darin at apple.com>
 
         Reviewed by Maciej.
diff --git a/WebKit/Misc.subproj/WebKitNSStringExtras.h b/WebKit/Misc.subproj/WebKitNSStringExtras.h
index 9172d0b..4e19359 100644
--- a/WebKit/Misc.subproj/WebKitNSStringExtras.h
+++ b/WebKit/Misc.subproj/WebKitNSStringExtras.h
@@ -9,8 +9,8 @@
 
 @interface NSString (WebKitExtras)
 
-- (void)_web_drawString:(NSString *)string atPoint:(NSPoint)point font: (NSFont *)font textColor:(NSColor *)textColor;
+- (void)_web_drawAtPoint:(NSPoint)point font: (NSFont *)font textColor:(NSColor *)textColor;
 
-- (float)_web_widthForString:(NSString *)string font: (NSFont *)font;
+- (float)_web_widthWithFont:(NSFont *)font;
 
 @end
diff --git a/WebKit/Misc.subproj/WebKitNSStringExtras.m b/WebKit/Misc.subproj/WebKitNSStringExtras.m
index b00f91d..fd9f36f 100644
--- a/WebKit/Misc.subproj/WebKitNSStringExtras.m
+++ b/WebKit/Misc.subproj/WebKitNSStringExtras.m
@@ -10,17 +10,13 @@
 
 @implementation NSString (WebKitExtras)
 
-- (void)_web_drawString:(NSString *)string atPoint:(NSPoint)point font: (NSFont *)font textColor:(NSColor *)textColor;
+- (void)_web_drawAtPoint:(NSPoint)point font: (NSFont *)font textColor:(NSColor *)textColor;
 {
-    if (string == nil) {
-        return;
-    }
-    
     WebTextRenderer *renderer = [[WebTextRendererFactory sharedFactory] rendererWithFont:font];
-    unsigned length = [string length];
+    unsigned length = [self length];
     UniChar *buffer = (UniChar *)malloc(sizeof(UniChar) * length);
 
-    [string getCharacters:buffer];
+    [self getCharacters:buffer];
     [renderer drawCharacters:buffer
                 stringLength:length
        fromCharacterPosition:0
@@ -36,16 +32,13 @@
     free(buffer);
 }
 
-- (float)_web_widthForString:(NSString *)string font: (NSFont *)font
+- (float)_web_widthWithFont:(NSFont *)font
 {
-    if (string == nil)
-        return 0;
-        
-    unsigned length = [string length];
+    unsigned length = [self length];
     float width;
     UniChar *buffer = (UniChar *)malloc(sizeof(UniChar) * length);
 
-    [string getCharacters:buffer];
+    [self getCharacters:buffer];
     WebTextRenderer *renderer = [[WebTextRendererFactory sharedFactory] rendererWithFont:font];
     width = [renderer _floatWidthForCharacters:buffer
                 stringLength:length

-- 
WebKit Debian packaging