[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 585402b552a76728db3b4a5762e2636e4fb87234
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 21 18:23:17 2002 +0000

    	- fixed 3075041 -- text larger/smaller increment too large when font-size specified as %
    
            * khtml/css/cssstyleselector.cpp: Don't apply the zoom factor to a font size that
    	already has the zoom factor applied.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2397 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 9eb572c..6615709 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,12 @@
 2002-10-21  Darin Adler  <darin at apple.com>
 
+	- fixed 3075041 -- text larger/smaller increment too large when font-size specified as %
+
+        * khtml/css/cssstyleselector.cpp: Don't apply the zoom factor to a font size that
+	already has the zoom factor applied.
+
+2002-10-21  Darin Adler  <darin at apple.com>
+
         * khtml/khtmlview.cpp: (KHTMLView::clear): Default to fast scrolling.
 	I'm pretty sure this was just backwards here.
 
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 9eb572c..6615709 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,12 @@
 2002-10-21  Darin Adler  <darin at apple.com>
 
+	- fixed 3075041 -- text larger/smaller increment too large when font-size specified as %
+
+        * khtml/css/cssstyleselector.cpp: Don't apply the zoom factor to a font size that
+	already has the zoom factor applied.
+
+2002-10-21  Darin Adler  <darin at apple.com>
+
         * khtml/khtmlview.cpp: (KHTMLView::clear): Default to fast scrolling.
 	I'm pretty sure this was just backwards here.
 
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 9eb572c..6615709 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,12 @@
 2002-10-21  Darin Adler  <darin at apple.com>
 
+	- fixed 3075041 -- text larger/smaller increment too large when font-size specified as %
+
+        * khtml/css/cssstyleselector.cpp: Don't apply the zoom factor to a font size that
+	already has the zoom factor applied.
+
+2002-10-21  Darin Adler  <darin at apple.com>
+
         * khtml/khtmlview.cpp: (KHTMLView::clear): Default to fast scrolling.
 	I'm pretty sure this was just backwards here.
 
diff --git a/WebCore/khtml/css/cssstyleselector.cpp b/WebCore/khtml/css/cssstyleselector.cpp
index 9917337..d8e805a 100644
--- a/WebCore/khtml/css/cssstyleselector.cpp
+++ b/WebCore/khtml/css/cssstyleselector.cpp
@@ -2285,16 +2285,15 @@ void CSSStyleSelector::applyRule( DOM::CSSProperty *prop )
 
         } else {
             int type = primitiveValue->primitiveType();
-            if(type > CSSPrimitiveValue::CSS_PERCENTAGE && type < CSSPrimitiveValue::CSS_DEG)
+            if(type > CSSPrimitiveValue::CSS_PERCENTAGE && type < CSSPrimitiveValue::CSS_DEG) {
                 size = primitiveValue->computeLengthFloat(parentStyle, paintDeviceMetrics);
-            else if(type == CSSPrimitiveValue::CSS_PERCENTAGE)
+                if (!khtml::printpainter && element && element->getDocument()->view())
+                    size *= element->getDocument()->view()->part()->zoomFactor() / 100.0;
+            } else if(type == CSSPrimitiveValue::CSS_PERCENTAGE)
                 size = (primitiveValue->getFloatValue(CSSPrimitiveValue::CSS_PERCENTAGE)
                         * parentStyle->font().pixelSize()) / 100;
             else
                 return;
-
-            if (!khtml::printpainter && element && element->getDocument()->view())
-                size *= element->getDocument()->view()->part()->zoomFactor() / 100.0;
         }
 
         if(size <= 0) return;

-- 
WebKit Debian packaging