[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 dfdd458a24b8391cb5eb39e8ad8b7ffa2e32784e
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 22 18:48:11 2002 +0000

            Changed to use simplified SPI.  Drawing and measuring using
            WebKit's text renderer are provided as category methods
            on NSString.
    
            * EtchedStringView.m:
            (-[EtchedStringView drawRect:]):
    
            Simplified drawing and measuring SPI for use by Alex.
    
            * Misc.subproj/WebKitNSStringExtras.h: Added.
            * Misc.subproj/WebKitNSStringExtras.m: Added.
            (-[NSString widthForString:font:]):
            * WebKit.pbproj/project.pbxproj:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2826 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 4f77161..34d1726 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2002-11-22  Richard Williamson   <rjw at apple.com>
+
+        Simplified drawing and measuring SPI for use by Alex.
+
+        * Misc.subproj/WebKitNSStringExtras.h: Added.
+        * Misc.subproj/WebKitNSStringExtras.m: Added.
+        (-[NSString widthForString:font:]):
+        * WebKit.pbproj/project.pbxproj:
+
 2002-11-21  Chris Blumenberg  <cblu at apple.com>
 
 	Removed workaround for: 3093170 - Handle clients receive data with length 0
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 4f77161..34d1726 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,12 @@
+2002-11-22  Richard Williamson   <rjw at apple.com>
+
+        Simplified drawing and measuring SPI for use by Alex.
+
+        * Misc.subproj/WebKitNSStringExtras.h: Added.
+        * Misc.subproj/WebKitNSStringExtras.m: Added.
+        (-[NSString widthForString:font:]):
+        * WebKit.pbproj/project.pbxproj:
+
 2002-11-21  Chris Blumenberg  <cblu at apple.com>
 
 	Removed workaround for: 3093170 - Handle clients receive data with length 0
diff --git a/WebKit/Misc.subproj/WebKitNSStringExtras.h b/WebKit/Misc.subproj/WebKitNSStringExtras.h
new file mode 100644
index 0000000..1588b4a
--- /dev/null
+++ b/WebKit/Misc.subproj/WebKitNSStringExtras.h
@@ -0,0 +1,16 @@
+/*
+    WebKitNSStringExtras.h
+    Private (SPI) header
+    Copyright 2002, Apple, Inc. All rights reserved.
+*/
+
+#import <Cocoa/Cocoa.h>
+
+
+ at interface NSString (WebKitExtras)
+
+- (void)drawString:(NSString *)string atPoint:(NSPoint)point font: (NSFont *)font textColor:(NSColor *)textColor;
+
+- (float)widthForString:(NSString *)string font: (NSFont *)font;
+
+ at end
diff --git a/WebKit/Misc.subproj/WebKitNSStringExtras.m b/WebKit/Misc.subproj/WebKitNSStringExtras.m
new file mode 100644
index 0000000..2526e79
--- /dev/null
+++ b/WebKit/Misc.subproj/WebKitNSStringExtras.m
@@ -0,0 +1,67 @@
+/*
+    WebKitNSStringExtras.m
+    Copyright 2002, Apple, Inc. All rights reserved.
+*/
+
+#import "WebKitNSStringExtras.h"
+
+#import <WebKit/WebTextRenderer.h>
+#import <WebKit/WebTextRendererFactory.h>
+
+ at implementation NSString (WebKitExtras)
+
+- (void)drawString:(NSString *)string atPoint:(NSPoint)point font: (NSFont *)font textColor:(NSColor *)textColor;
+{
+    if (string == nil) {
+        return;
+    }
+    
+    WebTextRenderer *renderer = [[WebTextRendererFactory sharedFactory] rendererWithFont:font];
+    unsigned length = [string length];
+    UniChar *buffer = (UniChar *)malloc(sizeof(UniChar) * length);
+
+    [string getCharacters:buffer];
+    [renderer drawCharacters:buffer
+                stringLength:length
+       fromCharacterPosition:0
+         toCharacterPosition:length
+                     atPoint:point
+                 withPadding:0
+               withTextColor:textColor
+             backgroundColor:nil
+                 rightToLeft:NO
+               letterSpacing:0
+                 wordSpacing:0];
+    free(buffer);
+}
+
+- (float)widthForString:(NSString *)string font: (NSFont *)font
+{
+    if (string == nil)
+        return 0;
+        
+    unsigned length = [string length];
+    float width;
+    UniChar *buffer = (UniChar *)malloc(sizeof(UniChar) * length);
+
+    [string getCharacters:buffer];
+    WebTextRenderer *renderer = [[WebTextRendererFactory sharedFactory] rendererWithFont:font];
+    width = [renderer _floatWidthForCharacters:buffer
+                stringLength:length
+                fromCharacterPosition: 0
+                numberOfCharacters: length
+                withPadding:0
+                applyRounding: NO
+                attemptFontSubstitution: YES
+                widths: 0
+                fonts: 0
+                glyphs: 0
+                numGlyphs: 0
+                letterSpacing: 0
+                wordSpacing: 0];
+    free(buffer);
+    
+    return width;
+}
+
+ at end
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 50ddb6a..0ee7bb7 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -302,6 +302,7 @@
 				83413E8F0375BCD3004719BE,
 				9316400E0379832D008635CE,
 				658CF8C103851FB5008C2A4B,
+				7082F571038EADAA00A80180,
 			);
 			isa = PBXHeadersBuildPhase;
 			runOnlyForDeploymentPostprocessing = 0;
@@ -413,6 +414,7 @@
 				83413E900375BCD3004719BE,
 				9316400F0379832D008635CE,
 				BED907790389380000CA289C,
+				7082F572038EADAA00A80180,
 			);
 			isa = PBXSourcesBuildPhase;
 			runOnlyForDeploymentPostprocessing = 0;
@@ -506,6 +508,8 @@
 				517FA6A903709FCE00CA2D3A,
 				517FA6AA03709FCE00CA2D3A,
 				517FA6AB03709FCE00CA2D3A,
+				7082F56F038EADAA00A80180,
+				7082F570038EADAA00A80180,
 			);
 			isa = PBXGroup;
 			name = Misc;
@@ -1494,6 +1498,43 @@
 //652
 //653
 //654
+//700
+//701
+//702
+//703
+//704
+		7082F56F038EADAA00A80180 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			path = WebKitNSStringExtras.h;
+			refType = 4;
+		};
+		7082F570038EADAA00A80180 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			path = WebKitNSStringExtras.m;
+			refType = 4;
+		};
+		7082F571038EADAA00A80180 = {
+			fileRef = 7082F56F038EADAA00A80180;
+			isa = PBXBuildFile;
+			settings = {
+				ATTRIBUTES = (
+					Private,
+				);
+			};
+		};
+		7082F572038EADAA00A80180 = {
+			fileRef = 7082F570038EADAA00A80180;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+//700
+//701
+//702
+//703
+//704
 //830
 //831
 //832

-- 
WebKit Debian packaging