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

[hyatt]

The following commit has been merged in the debian/unstable branch:
commit 5b777a5c6c266cb67d2ef424a765df593a2c46a2
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jul 19 00:06:15 2002 +0000

            * khtml/css/css_valueimpl.cpp:
            Changed the QRegExps used for font family matching to statics.  Helped out
            one page on the base tests a fair bit.  Overall (spread over all 40 pages)
            it's not that big though.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1591 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 2d845ae..5edaf39 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,12 @@
 2002-07-18  David Hyatt  <hyatt at apple.com>
 
+        * khtml/css/css_valueimpl.cpp:
+        Changed the QRegExps used for font family matching to statics.  Helped out
+        one page on the base tests a fair bit.  Overall (spread over all 40 pages)
+        it's not that big though.
+        
+2002-07-18  David Hyatt  <hyatt at apple.com>
+
         Small change that gives us 25% speedup (uncached) on the cvs-base suite.
 
         * khtml/css/cssstyleselector.cpp:
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 2d845ae..5edaf39 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,12 @@
 2002-07-18  David Hyatt  <hyatt at apple.com>
 
+        * khtml/css/css_valueimpl.cpp:
+        Changed the QRegExps used for font family matching to statics.  Helped out
+        one page on the base tests a fair bit.  Overall (spread over all 40 pages)
+        it's not that big though.
+        
+2002-07-18  David Hyatt  <hyatt at apple.com>
+
         Small change that gives us 25% speedup (uncached) on the cvs-base suite.
 
         * khtml/css/cssstyleselector.cpp:
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 2d845ae..5edaf39 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,12 @@
 2002-07-18  David Hyatt  <hyatt at apple.com>
 
+        * khtml/css/css_valueimpl.cpp:
+        Changed the QRegExps used for font family matching to statics.  Helped out
+        one page on the base tests a fair bit.  Overall (spread over all 40 pages)
+        it's not that big though.
+        
+2002-07-18  David Hyatt  <hyatt at apple.com>
+
         Small change that gives us 25% speedup (uncached) on the cvs-base suite.
 
         * khtml/css/cssstyleselector.cpp:
diff --git a/WebCore/khtml/css/css_valueimpl.cpp b/WebCore/khtml/css/css_valueimpl.cpp
index 08c2998..4bec9e1 100644
--- a/WebCore/khtml/css/css_valueimpl.cpp
+++ b/WebCore/khtml/css/css_valueimpl.cpp
@@ -653,20 +653,23 @@ CSSImageValueImpl::~CSSImageValueImpl()
 FontFamilyValueImpl::FontFamilyValueImpl( const QString &string)
     : CSSPrimitiveValueImpl( DOMString(string), CSSPrimitiveValue::CSS_STRING)
 {
+    static QRegExp parenReg = QRegExp(" \\(.*\\)$");
+    static QRegExp braceReg = QRegExp(" \\[.*\\]$");
+
 #ifdef APPLE_CHANGES
     parsedFontName = string;
     // a language tag is often added in braces at the end. Remove it.
-    parsedFontName.replace(QRegExp(" \\(.*\\)$"), "");
+    parsedFontName.replace(parenReg, "");
     // remove [Xft] qualifiers
-    parsedFontName.replace(QRegExp(" \\[.*\\]$"), "");
+    parsedFontName.replace(braceReg, "");
 #else
     const QString &available = KHTMLSettings::availableFamilies();
 
     QString face = string.lower();
     // a languge tag is often added in braces at the end. Remove it.
-    face = face.replace(QRegExp(" \\(.*\\)$"), "");
+    face = face.replace(parenReg, "");
     // remove [Xft] qualifiers
-    face = face.replace(QRegExp(" \\[.*\\]$"), "");
+    face = face.replace(braceReg, "");
     //kdDebug(0) << "searching for face '" << face << "'" << endl;
     if(face == "serif" ||
        face == "sans-serif" ||

-- 
WebKit Debian packaging