[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 6d8e1e57a4be60303a89d73c5426cc6a7711120b
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 26 20:30:28 2002 +0000

    	Backing out support for multiple font families for now.
    	The support is still there in QFont.  I've just stopped
    	the style selector from walking the entire value list (it
    	will only put the first family into the font).
    
    	The original change  caused a 5% perf regression.
    	I'm going to see what kinds of tricks I can pull to get
    	some of this back before re-enabling the feature.
    
            * khtml/css/cssstyleselector.cpp:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2880 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 9933885..a1d265a 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,18 @@
 2002-11-26  David Hyatt  <hyatt at apple.com>
 
+	Backing out support for multiple font families for now.
+	The support is still there in QFont.  I've just stopped
+	the style selector from walking the entire value list (it
+	will only put the first family into the font).
+
+	The original change  caused a 5% perf regression.  
+	I'm going to see what kinds of tricks I can pull to get 
+	some of this back before re-enabling the feature.
+	
+        * khtml/css/cssstyleselector.cpp:
+
+2002-11-26  David Hyatt  <hyatt at apple.com>
+
 	Fix render object removal to remerge adjacent anonymous inline boxes
 	when an intervening block box gets removed.
 	
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 9933885..a1d265a 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,18 @@
 2002-11-26  David Hyatt  <hyatt at apple.com>
 
+	Backing out support for multiple font families for now.
+	The support is still there in QFont.  I've just stopped
+	the style selector from walking the entire value list (it
+	will only put the first family into the font).
+
+	The original change  caused a 5% perf regression.  
+	I'm going to see what kinds of tricks I can pull to get 
+	some of this back before re-enabling the feature.
+	
+        * khtml/css/cssstyleselector.cpp:
+
+2002-11-26  David Hyatt  <hyatt at apple.com>
+
 	Fix render object removal to remerge adjacent anonymous inline boxes
 	when an intervening block box gets removed.
 	
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 9933885..a1d265a 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,18 @@
 2002-11-26  David Hyatt  <hyatt at apple.com>
 
+	Backing out support for multiple font families for now.
+	The support is still there in QFont.  I've just stopped
+	the style selector from walking the entire value list (it
+	will only put the first family into the font).
+
+	The original change  caused a 5% perf regression.  
+	I'm going to see what kinds of tricks I can pull to get 
+	some of this back before re-enabling the feature.
+	
+        * khtml/css/cssstyleselector.cpp:
+
+2002-11-26  David Hyatt  <hyatt at apple.com>
+
 	Fix render object removal to remerge adjacent anonymous inline boxes
 	when an intervening block box gets removed.
 	
diff --git a/WebCore/khtml/css/cssstyleselector.cpp b/WebCore/khtml/css/cssstyleselector.cpp
index 1f5fb0f..c86225d 100644
--- a/WebCore/khtml/css/cssstyleselector.cpp
+++ b/WebCore/khtml/css/cssstyleselector.cpp
@@ -2575,6 +2575,10 @@ void CSSStyleSelector::applyRule( DOM::CSSProperty *prop )
                     if (style->setFontDef( fontDef )) {
                         fontDirty = true;
                     }
+                    
+                    // Turn multiple fonts off for now until I can
+                    // figure out how to make it fast.
+                    return;
                 }
             }
         }

-- 
WebKit Debian packaging