[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 a9a8eadd602fad88193bcf1ccb01a2f9440946a2
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Mar 24 19:49:08 2002 +0000

            Cached available families from NSFontManager.
            http://www.gamespy.com/gdc2002/okamoto went from 4.8 seconds
            to 0.7 seconds. [Do we need to worry about updating the cache if
            the available fonts change?]
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@824 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index dd5187c..71406f7 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,14 @@
 2002-03-24  Richard Williamson  <rjw at apple.com>
 
+        Cached available families from NSFontManager.  
+        http://www.gamespy.com/gdc2002/okamoto went from 4.8 seconds
+        to 0.7 seconds. [Do we need to worry about updating the cache if
+        the available fonts change?]
+        
+	* src/kwq/KWQKHTMLSettings.mm: (KHTMLSettings::availableFamilies):
+
+2002-03-24  Richard Williamson  <rjw at apple.com>
+
         Fixed big leak in QString assignment operator.
         Updated comments.  Removed old fprintfs.
         Added some frame debugging logs.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index dd5187c..71406f7 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,14 @@
 2002-03-24  Richard Williamson  <rjw at apple.com>
 
+        Cached available families from NSFontManager.  
+        http://www.gamespy.com/gdc2002/okamoto went from 4.8 seconds
+        to 0.7 seconds. [Do we need to worry about updating the cache if
+        the available fonts change?]
+        
+	* src/kwq/KWQKHTMLSettings.mm: (KHTMLSettings::availableFamilies):
+
+2002-03-24  Richard Williamson  <rjw at apple.com>
+
         Fixed big leak in QString assignment operator.
         Updated comments.  Removed old fprintfs.
         Added some frame debugging logs.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index dd5187c..71406f7 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,14 @@
 2002-03-24  Richard Williamson  <rjw at apple.com>
 
+        Cached available families from NSFontManager.  
+        http://www.gamespy.com/gdc2002/okamoto went from 4.8 seconds
+        to 0.7 seconds. [Do we need to worry about updating the cache if
+        the available fonts change?]
+        
+	* src/kwq/KWQKHTMLSettings.mm: (KHTMLSettings::availableFamilies):
+
+2002-03-24  Richard Williamson  <rjw at apple.com>
+
         Fixed big leak in QString assignment operator.
         Updated comments.  Removed old fprintfs.
         Added some frame debugging logs.
diff --git a/WebCore/kwq/KWQKHTMLSettings.mm b/WebCore/kwq/KWQKHTMLSettings.mm
index 29f8b71..e508580 100644
--- a/WebCore/kwq/KWQKHTMLSettings.mm
+++ b/WebCore/kwq/KWQKHTMLSettings.mm
@@ -104,10 +104,13 @@ int KHTMLSettings::minFontSize() const
 }
 
 
+static QString *_availableFamiles = 0;
 QString KHTMLSettings::availableFamilies()
 {
-    return NSSTRING_TO_QSTRING([[[NSFontManager sharedFontManager]
-				availableFontFamilies] componentsJoinedByString:@","]);
+    if (_availableFamiles == 0)
+        _availableFamiles = new QString(NSSTRING_TO_QSTRING([[[NSFontManager sharedFontManager]
+				availableFontFamilies] componentsJoinedByString:@","]));
+    return *_availableFamiles;
 }
 
 
diff --git a/WebCore/src/kwq/KWQKHTMLSettings.mm b/WebCore/src/kwq/KWQKHTMLSettings.mm
index 29f8b71..e508580 100644
--- a/WebCore/src/kwq/KWQKHTMLSettings.mm
+++ b/WebCore/src/kwq/KWQKHTMLSettings.mm
@@ -104,10 +104,13 @@ int KHTMLSettings::minFontSize() const
 }
 
 
+static QString *_availableFamiles = 0;
 QString KHTMLSettings::availableFamilies()
 {
-    return NSSTRING_TO_QSTRING([[[NSFontManager sharedFontManager]
-				availableFontFamilies] componentsJoinedByString:@","]);
+    if (_availableFamiles == 0)
+        _availableFamiles = new QString(NSSTRING_TO_QSTRING([[[NSFontManager sharedFontManager]
+				availableFontFamilies] componentsJoinedByString:@","]));
+    return *_availableFamiles;
 }
 
 

-- 
WebKit Debian packaging