[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 04a8246319192746ab7fffd5e01acd07bff68868
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Mar 28 00:55:36 2002 +0000

    	* src/kdelibs/khtml/css/css_valueimpl.cpp:
    	(FontFamilyValueImpl::FontFamilyValueImpl): Disable misguided font matching
            code in khtml.
    
    	* src/kwq/KWQFont.mm: (QFont::getFont): Change the fallback so that it uses
            the default font family, but the other settings as requested, rather than
            using the default font.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@872 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 44beb19..04ef3e1 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,13 @@
+2002-03-27  Darin Adler  <darin at apple.com>
+
+	* src/kdelibs/khtml/css/css_valueimpl.cpp:
+	(FontFamilyValueImpl::FontFamilyValueImpl): Disable misguided font matching
+        code in khtml.
+        
+	* src/kwq/KWQFont.mm: (QFont::getFont): Change the fallback so that it uses
+        the default font family, but the other settings as requested, rather than
+        using the default font.
+
 2002-03-27  Kenneth Kocienda  <kocienda at apple.com>
 
         Changed loadProgress->bytesSoFar to use [sender contentLengthReceived]
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 44beb19..04ef3e1 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,13 @@
+2002-03-27  Darin Adler  <darin at apple.com>
+
+	* src/kdelibs/khtml/css/css_valueimpl.cpp:
+	(FontFamilyValueImpl::FontFamilyValueImpl): Disable misguided font matching
+        code in khtml.
+        
+	* src/kwq/KWQFont.mm: (QFont::getFont): Change the fallback so that it uses
+        the default font family, but the other settings as requested, rather than
+        using the default font.
+
 2002-03-27  Kenneth Kocienda  <kocienda at apple.com>
 
         Changed loadProgress->bytesSoFar to use [sender contentLengthReceived]
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 44beb19..04ef3e1 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2002-03-27  Darin Adler  <darin at apple.com>
+
+	* src/kdelibs/khtml/css/css_valueimpl.cpp:
+	(FontFamilyValueImpl::FontFamilyValueImpl): Disable misguided font matching
+        code in khtml.
+        
+	* src/kwq/KWQFont.mm: (QFont::getFont): Change the fallback so that it uses
+        the default font family, but the other settings as requested, rather than
+        using the default font.
+
 2002-03-27  Kenneth Kocienda  <kocienda at apple.com>
 
         Changed loadProgress->bytesSoFar to use [sender contentLengthReceived]
diff --git a/WebCore/khtml/css/css_valueimpl.cpp b/WebCore/khtml/css/css_valueimpl.cpp
index 621c37e..94800e0 100644
--- a/WebCore/khtml/css/css_valueimpl.cpp
+++ b/WebCore/khtml/css/css_valueimpl.cpp
@@ -572,11 +572,16 @@ CSSImageValueImpl::~CSSImageValueImpl()
 FontFamilyValueImpl::FontFamilyValueImpl( const QString &string)
     : CSSPrimitiveValueImpl( DOMString(string), CSSPrimitiveValue::CSS_STRING)
 {
+#ifdef APPLE_CHANGES
+    parsedFontName = string;
+    parsedFontName.replace(QRegExp(" \\(.*\\)$"), "");
+#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(" \\(.*\\)$"), "");
+    parsedFontName = face;
     //kdDebug(0) << "searching for face '" << face << "'" << endl;
     if(face == "serif" ||
        face == "sans-serif" ||
@@ -609,4 +614,5 @@ FontFamilyValueImpl::FontFamilyValueImpl( const QString &string)
 	    parsedFontName = available.mid( pos1, pos - pos1 );
 	}
     }
+#endif // APPLE_CHANGES not defined
 }
diff --git a/WebCore/kwq/KWQFont.mm b/WebCore/kwq/KWQFont.mm
index b82739d..d9430e9 100644
--- a/WebCore/kwq/KWQFont.mm
+++ b/WebCore/kwq/KWQFont.mm
@@ -165,11 +165,11 @@ NSFont *QFont::getFont()
         }
         fontKey = [[IFFontCacheKey alloc] initWithString: _family trait: _trait size: _size];
         font = [fontCache objectForKey:fontKey];
-        if (font == nil) { 
+        if (font == nil) {
             font = [[NSFontManager sharedFontManager] fontWithFamily:_family traits:_trait weight:5 size:_size];
             if (font == nil) {
                 loadDefaultFont();
-                font = defaultFont;
+                font = [[NSFontManager sharedFontManager] fontWithFamily:defaultFontFamilyName traits:_trait weight:5 size:_size];
             }
             [fontCache setObject: font forKey: fontKey];
         }
diff --git a/WebCore/src/kdelibs/khtml/css/css_valueimpl.cpp b/WebCore/src/kdelibs/khtml/css/css_valueimpl.cpp
index 621c37e..94800e0 100644
--- a/WebCore/src/kdelibs/khtml/css/css_valueimpl.cpp
+++ b/WebCore/src/kdelibs/khtml/css/css_valueimpl.cpp
@@ -572,11 +572,16 @@ CSSImageValueImpl::~CSSImageValueImpl()
 FontFamilyValueImpl::FontFamilyValueImpl( const QString &string)
     : CSSPrimitiveValueImpl( DOMString(string), CSSPrimitiveValue::CSS_STRING)
 {
+#ifdef APPLE_CHANGES
+    parsedFontName = string;
+    parsedFontName.replace(QRegExp(" \\(.*\\)$"), "");
+#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(" \\(.*\\)$"), "");
+    parsedFontName = face;
     //kdDebug(0) << "searching for face '" << face << "'" << endl;
     if(face == "serif" ||
        face == "sans-serif" ||
@@ -609,4 +614,5 @@ FontFamilyValueImpl::FontFamilyValueImpl( const QString &string)
 	    parsedFontName = available.mid( pos1, pos - pos1 );
 	}
     }
+#endif // APPLE_CHANGES not defined
 }
diff --git a/WebCore/src/kwq/KWQFont.mm b/WebCore/src/kwq/KWQFont.mm
index b82739d..d9430e9 100644
--- a/WebCore/src/kwq/KWQFont.mm
+++ b/WebCore/src/kwq/KWQFont.mm
@@ -165,11 +165,11 @@ NSFont *QFont::getFont()
         }
         fontKey = [[IFFontCacheKey alloc] initWithString: _family trait: _trait size: _size];
         font = [fontCache objectForKey:fontKey];
-        if (font == nil) { 
+        if (font == nil) {
             font = [[NSFontManager sharedFontManager] fontWithFamily:_family traits:_trait weight:5 size:_size];
             if (font == nil) {
                 loadDefaultFont();
-                font = defaultFont;
+                font = [[NSFontManager sharedFontManager] fontWithFamily:defaultFontFamilyName traits:_trait weight:5 size:_size];
             }
             [fontCache setObject: font forKey: fontKey];
         }

-- 
WebKit Debian packaging