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

[darin]

The following commit has been merged in the debian/unstable branch:
commit bec5d7fb83ec0a813a5ffd0a34a3718dd3bf254d
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Apr 26 01:54:19 2002 +0000

    	* kwq/KWQMetrics.h: Add NSObject to required protocols for
    	the KWQLayoutFragment protocol so we can retain and release.
    
    	* kwq/KWQTextStorage.mm: (-[KWQTextStorage _buildFragmentForString:]):
    	Removed a cast to NSObject * that worked around the lack of the above.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1079 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 105650d..3f75dc3 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,11 @@
+2002-04-25  Darin Adler  <darin at apple.com>
+
+	* kwq/KWQMetrics.h: Add NSObject to required protocols for
+	the KWQLayoutFragment protocol so we can retain and release.
+
+	* kwq/KWQTextStorage.mm: (-[KWQTextStorage _buildFragmentForString:]):
+	Removed a cast to NSObject * that worked around the lack of the above.
+
 2002-04-25  Richard Williamson  <rjw at apple.com>
 
         Little changes in preparation for events.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 105650d..3f75dc3 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,11 @@
+2002-04-25  Darin Adler  <darin at apple.com>
+
+	* kwq/KWQMetrics.h: Add NSObject to required protocols for
+	the KWQLayoutFragment protocol so we can retain and release.
+
+	* kwq/KWQTextStorage.mm: (-[KWQTextStorage _buildFragmentForString:]):
+	Removed a cast to NSObject * that worked around the lack of the above.
+
 2002-04-25  Richard Williamson  <rjw at apple.com>
 
         Little changes in preparation for events.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 105650d..3f75dc3 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,11 @@
+2002-04-25  Darin Adler  <darin at apple.com>
+
+	* kwq/KWQMetrics.h: Add NSObject to required protocols for
+	the KWQLayoutFragment protocol so we can retain and release.
+
+	* kwq/KWQTextStorage.mm: (-[KWQTextStorage _buildFragmentForString:]):
+	Removed a cast to NSObject * that worked around the lack of the above.
+
 2002-04-25  Richard Williamson  <rjw at apple.com>
 
         Little changes in preparation for events.
diff --git a/WebCore/kwq/KWQMetrics.h b/WebCore/kwq/KWQMetrics.h
index 5584e1c..a1605bb 100644
--- a/WebCore/kwq/KWQMetrics.h
+++ b/WebCore/kwq/KWQMetrics.h
@@ -102,7 +102,7 @@ typedef float _IFGlyphWidth;
 - (NSFont *)font;
 @end
 
- at protocol KWQLayoutFragment
+ at protocol KWQLayoutFragment <NSObject>
 - (void)setGlyphRange: (NSRange)r;
 - (NSRange)glyphRange;
 - (void)setBoundingRect: (NSRect)r;
diff --git a/WebCore/kwq/KWQTextStorage.mm b/WebCore/kwq/KWQTextStorage.mm
index 04be555..7ec7bab 100644
--- a/WebCore/kwq/KWQTextStorage.mm
+++ b/WebCore/kwq/KWQTextStorage.mm
@@ -79,7 +79,7 @@
     [fragment setBoundingRect: boundingRect];
 
     [fragmentCache setObject: fragment forKey: [self string]];
-    [(NSObject *)fragment release];
+    [fragment release];
 
     return fragment;
 }

-- 
WebKit Debian packaging