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

[rjw]

The following commit has been merged in the debian/unstable branch:
commit 42d9d25eca6c5832a05ff89671d66194790405c4
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri May 10 03:18:48 2002 +0000

    i    Added new method to avoid creation of NSString.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1125 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 592c4a3..730a6a8 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,13 @@
+2002-05-09  Richard J. Williamson  <rjw at apple.com>
+
+    Added new method to avoid creation of NSString.
+    
+        - (void)drawCharacters:(const UniChar *)characters length: (unsigned)length atPoint:(NSPoint)point withColor:(NSColor *)color;
+
+	* kwq/KWQPainter.mm:
+	(QPainter::drawText):
+	* kwq/WebCoreTextRenderer.h:
+
 2002-05-09  Kenneth Kocienda  <kocienda at apple.com>
 
         Fix for this bug:
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 592c4a3..730a6a8 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,13 @@
+2002-05-09  Richard J. Williamson  <rjw at apple.com>
+
+    Added new method to avoid creation of NSString.
+    
+        - (void)drawCharacters:(const UniChar *)characters length: (unsigned)length atPoint:(NSPoint)point withColor:(NSColor *)color;
+
+	* kwq/KWQPainter.mm:
+	(QPainter::drawText):
+	* kwq/WebCoreTextRenderer.h:
+
 2002-05-09  Kenneth Kocienda  <kocienda at apple.com>
 
         Fix for this bug:
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 592c4a3..730a6a8 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2002-05-09  Richard J. Williamson  <rjw at apple.com>
+
+    Added new method to avoid creation of NSString.
+    
+        - (void)drawCharacters:(const UniChar *)characters length: (unsigned)length atPoint:(NSPoint)point withColor:(NSColor *)color;
+
+	* kwq/KWQPainter.mm:
+	(QPainter::drawText):
+	* kwq/WebCoreTextRenderer.h:
+
 2002-05-09  Kenneth Kocienda  <kocienda at apple.com>
 
         Fix for this bug:
diff --git a/WebCore/kwq/KWQPainter.mm b/WebCore/kwq/KWQPainter.mm
index 39f8b14..5c371d1 100644
--- a/WebCore/kwq/KWQPainter.mm
+++ b/WebCore/kwq/KWQPainter.mm
@@ -477,18 +477,14 @@ void QPainter::drawTiledPixmap( int x, int y, int w, int h,
 // y is the baseline
 void QPainter::drawText(int x, int y, const QString &qstring, int len)
 {
-    NSString *string;
-    
     _lockFocus();
     
     if (len == -1)
-        string = QSTRING_TO_NSSTRING(qstring);
-    else
-        string = QSTRING_TO_NSSTRING_LENGTH(qstring,len);
+        len = qstring.length();
 
     [[[WebCoreTextRendererFactory sharedFactory]
         rendererWithFamily:data->qfont.getNSFamily() traits:data->qfont.getNSTraits() size:data->qfont.getNSSize()]
-        drawString:string atPoint:NSMakePoint(x,y) withColor:data->qpen.color().color];
+        drawCharacters:(const UniChar *)qstring.unicode() length: len atPoint:NSMakePoint(x,y) withColor:data->qpen.color().color];
 
     _unlockFocus();
 }
diff --git a/WebCore/kwq/WebCoreTextRenderer.h b/WebCore/kwq/WebCoreTextRenderer.h
index 1b45c57..64e27ec 100644
--- a/WebCore/kwq/WebCoreTextRenderer.h
+++ b/WebCore/kwq/WebCoreTextRenderer.h
@@ -33,6 +33,7 @@
 - (int)lineSpacing;
 
 - (void)drawString:(NSString *)string atPoint:(NSPoint)point withColor:(NSColor *)color;
+- (void)drawCharacters:(const UniChar *)characters length: (unsigned)length atPoint:(NSPoint)point withColor:(NSColor *)color;
 - (void)drawUnderlineForString:(NSString *)string atPoint:(NSPoint)point withColor:(NSColor *)color;
 
 - (void)drawString:(NSString *)string inRect:(NSRect)rect withColor:(NSColor *)color paragraphStyle:(NSParagraphStyle *)style;

-- 
WebKit Debian packaging