[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 eec1aeb4314f88f39696997cf47b72eb0668aab1
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed May 15 02:32:54 2002 +0000

        Fixed exception in log code.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1151 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index afdef62..f8d71a4 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,12 @@
 2002-05-14  Richard J. Williamson  <rjw at apple.com>
 
+    Fixed exception in log code.
+    
+	* WebCoreSupport.subproj/IFTextRenderer.m:
+	(-[IFTextRenderer floatWidthForCharacters:length:]):
+
+2002-05-14  Richard J. Williamson  <rjw at apple.com>
+
     Fixed 2926153, not getting correct messages after cancel.
     Fixed leak of mouse events (Darin wanted this ASAP).
     
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index afdef62..f8d71a4 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,12 @@
 2002-05-14  Richard J. Williamson  <rjw at apple.com>
 
+    Fixed exception in log code.
+    
+	* WebCoreSupport.subproj/IFTextRenderer.m:
+	(-[IFTextRenderer floatWidthForCharacters:length:]):
+
+2002-05-14  Richard J. Williamson  <rjw at apple.com>
+
     Fixed 2926153, not getting correct messages after cancel.
     Fixed leak of mouse events (Darin wanted this ASAP).
     
diff --git a/WebKit/WebCoreSupport.subproj/IFTextRenderer.m b/WebKit/WebCoreSupport.subproj/IFTextRenderer.m
index 294f8b6..16d4101 100644
--- a/WebKit/WebCoreSupport.subproj/IFTextRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/IFTextRenderer.m
@@ -610,7 +610,7 @@ cleanup:
         if (glyphID == 0){
             substituteFont = [self substituteFontForCharacters: characters length: length];
             if (substituteFont){
-                WEBKITDEBUGLEVEL (WEBKIT_LOG_FONTCACHE, "substituting %s for %s, missing 0x%04x\n", DEBUG_OBJECT([substituteFont displayName]), DEBUG_OBJECT([font displayName]), c);
+                WEBKITDEBUGLEVEL (WEBKIT_LOG_FONTCACHE, "substituting %s for %s, missing 0x%04x\n", DEBUG_OBJECT(substituteFont), DEBUG_OBJECT([font displayName]), c);
                 return [[[IFTextRendererFactory sharedFactory] rendererWithFont: substituteFont] widthForCharacters: characters length: length];
             }
         }
diff --git a/WebKit/WebCoreSupport.subproj/WebTextRenderer.m b/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
index 294f8b6..16d4101 100644
--- a/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
@@ -610,7 +610,7 @@ cleanup:
         if (glyphID == 0){
             substituteFont = [self substituteFontForCharacters: characters length: length];
             if (substituteFont){
-                WEBKITDEBUGLEVEL (WEBKIT_LOG_FONTCACHE, "substituting %s for %s, missing 0x%04x\n", DEBUG_OBJECT([substituteFont displayName]), DEBUG_OBJECT([font displayName]), c);
+                WEBKITDEBUGLEVEL (WEBKIT_LOG_FONTCACHE, "substituting %s for %s, missing 0x%04x\n", DEBUG_OBJECT(substituteFont), DEBUG_OBJECT([font displayName]), c);
                 return [[[IFTextRendererFactory sharedFactory] rendererWithFont: substituteFont] widthForCharacters: characters length: length];
             }
         }

-- 
WebKit Debian packaging