[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 35304bb5b5631156fec02e711369bd2f5e0e535d
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Mar 22 22:05:40 2002 +0000

            * src/kdelibs/khtml/css/cssstyleselector.cpp: (khtml::applyRule):
            Fix boolean logic mistake from the original KDE sources.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@808 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 7af2bf9..d3b71c1 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,10 @@
 2002-03-22  Darin Adler  <darin at apple.com>
 
+	* src/kdelibs/khtml/css/cssstyleselector.cpp: (khtml::applyRule):
+	Fix boolean logic mistake from the original KDE sources.
+
+2002-03-22  Darin Adler  <darin at apple.com>
+
         Finally giving up on the complete QString rewrite after doing it 3 times,
         Darin checks in some improvements for the old QString. This makes a QString
         be 8 bytes instead of 12, and improves a few other details. No dramatic
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 7af2bf9..d3b71c1 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,10 @@
 2002-03-22  Darin Adler  <darin at apple.com>
 
+	* src/kdelibs/khtml/css/cssstyleselector.cpp: (khtml::applyRule):
+	Fix boolean logic mistake from the original KDE sources.
+
+2002-03-22  Darin Adler  <darin at apple.com>
+
         Finally giving up on the complete QString rewrite after doing it 3 times,
         Darin checks in some improvements for the old QString. This makes a QString
         be 8 bytes instead of 12, and improves a few other details. No dramatic
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 7af2bf9..d3b71c1 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,10 @@
 2002-03-22  Darin Adler  <darin at apple.com>
 
+	* src/kdelibs/khtml/css/cssstyleselector.cpp: (khtml::applyRule):
+	Fix boolean logic mistake from the original KDE sources.
+
+2002-03-22  Darin Adler  <darin at apple.com>
+
         Finally giving up on the complete QString rewrite after doing it 3 times,
         Darin checks in some improvements for the old QString. This makes a QString
         be 8 bytes instead of 12, and improves a few other details. No dramatic
diff --git a/WebCore/khtml/css/cssstyleselector.cpp b/WebCore/khtml/css/cssstyleselector.cpp
index f7c28fd..567300e 100644
--- a/WebCore/khtml/css/cssstyleselector.cpp
+++ b/WebCore/khtml/css/cssstyleselector.cpp
@@ -2346,9 +2346,8 @@ void khtml::applyRule(khtml::RenderStyle *style, DOM::CSSProperty *prop, DOM::El
             if(!item->isPrimitiveValue()) continue;
             CSSPrimitiveValueImpl *val = static_cast<CSSPrimitiveValueImpl *>(item);
             if(!val->primitiveType() == CSSPrimitiveValue::CSS_STRING) return;
-	    // FIXME:MERGE removed optimization to avoid allocating QString here
 	    QString face = static_cast<FontFamilyValueImpl *>(val)->fontName();
-	    if ( !face.isNull() || face.isEmpty() ) {
+	    if ( !face.isEmpty() ) {
 		const KHTMLSettings *s = e->getDocument()->view()->part()->settings();
 		if(face == "serif") {
 		    face = s->serifFontName();
diff --git a/WebCore/src/kdelibs/khtml/css/cssstyleselector.cpp b/WebCore/src/kdelibs/khtml/css/cssstyleselector.cpp
index f7c28fd..567300e 100644
--- a/WebCore/src/kdelibs/khtml/css/cssstyleselector.cpp
+++ b/WebCore/src/kdelibs/khtml/css/cssstyleselector.cpp
@@ -2346,9 +2346,8 @@ void khtml::applyRule(khtml::RenderStyle *style, DOM::CSSProperty *prop, DOM::El
             if(!item->isPrimitiveValue()) continue;
             CSSPrimitiveValueImpl *val = static_cast<CSSPrimitiveValueImpl *>(item);
             if(!val->primitiveType() == CSSPrimitiveValue::CSS_STRING) return;
-	    // FIXME:MERGE removed optimization to avoid allocating QString here
 	    QString face = static_cast<FontFamilyValueImpl *>(val)->fontName();
-	    if ( !face.isNull() || face.isEmpty() ) {
+	    if ( !face.isEmpty() ) {
 		const KHTMLSettings *s = e->getDocument()->view()->part()->settings();
 		if(face == "serif") {
 		    face = s->serifFontName();

-- 
WebKit Debian packaging