[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 34238d9e7f32ad6445eff210fa415dfc1f404573
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Apr 3 16:29:57 2003 +0000

            Reviewed by Ken.
    
            - fixed bug 3216832 -- REGRESSION: scroll bar doesn't appear soon enough when shrinking excite.com horizontally
    
            * khtml/rendering/table_layout.cpp: (AutoTableLayout::calcEffectiveWidth):
            Fixed mistake where using the wrong variable led to the colspan distribution
            loop terminating early, and not giving any additional width to the second column.
    
            - fixed some navigator properties as discussed in the meeting yesterday (with Don, Dave, Mike Malone)
    
            * khtml/ecma/kjs_navigator.cpp: (Navigator::getValueProperty):
            Use the date 20030107 instead of 20021225 because people think it's less arbitrary.
            Use "Apple Computer, Inc." as the vendor string.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4012 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index ea5e2dd..2a0e2de 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,19 @@
+2003-04-03  Darin Adler  <darin at apple.com>
+
+        Reviewed by Ken.
+
+        - fixed bug 3216832 -- REGRESSION: scroll bar doesn't appear soon enough when shrinking excite.com horizontally
+
+        * khtml/rendering/table_layout.cpp: (AutoTableLayout::calcEffectiveWidth):
+        Fixed mistake where using the wrong variable led to the colspan distribution
+        loop terminating early, and not giving any additional width to the second column.
+
+        - fixed some navigator properties as discussed in the meeting yesterday (with Don, Dave, Mike Malone)
+
+        * khtml/ecma/kjs_navigator.cpp: (Navigator::getValueProperty):
+        Use the date 20030107 instead of 20021225 because people think it's less arbitrary.
+        Use "Apple Computer, Inc." as the vendor string.
+
 2003-04-02  David Hyatt  <hyatt at apple.com>
 
 	Fix for 3216650.  Needed an additional check when the disabled
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index ea5e2dd..2a0e2de 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,19 @@
+2003-04-03  Darin Adler  <darin at apple.com>
+
+        Reviewed by Ken.
+
+        - fixed bug 3216832 -- REGRESSION: scroll bar doesn't appear soon enough when shrinking excite.com horizontally
+
+        * khtml/rendering/table_layout.cpp: (AutoTableLayout::calcEffectiveWidth):
+        Fixed mistake where using the wrong variable led to the colspan distribution
+        loop terminating early, and not giving any additional width to the second column.
+
+        - fixed some navigator properties as discussed in the meeting yesterday (with Don, Dave, Mike Malone)
+
+        * khtml/ecma/kjs_navigator.cpp: (Navigator::getValueProperty):
+        Use the date 20030107 instead of 20021225 because people think it's less arbitrary.
+        Use "Apple Computer, Inc." as the vendor string.
+
 2003-04-02  David Hyatt  <hyatt at apple.com>
 
 	Fix for 3216650.  Needed an additional check when the disabled
diff --git a/WebCore/khtml/ecma/kjs_navigator.cpp b/WebCore/khtml/ecma/kjs_navigator.cpp
index ffe0c58..d43f760 100644
--- a/WebCore/khtml/ecma/kjs_navigator.cpp
+++ b/WebCore/khtml/ecma/kjs_navigator.cpp
@@ -192,21 +192,20 @@ Value Navigator::getValueProperty(ExecState *exec, int token) const
     return String(userAgent.mid(userAgent.find('/') + 1));
   case Product:
 #if APPLE_CHANGES
-    // If we find "Mozilla/5.0" but not "(compatible, ...)" we are a modern Netscape
+    // When acting normal, we pretend to be "Gecko".
     if (userAgent.find("Mozilla/5.0") >= 0 && userAgent.find("compatible") == -1) {
         return String("Gecko");
     }
-    // FIXME: Should we define a fallback result here besides "Konqueror/khtml"?
+    // When spoofing as IE, we use Undefined().
     return Undefined();
 #else
     return String("Konqueror/khtml");
 #endif
   case ProductSub:
-    return String("20021225");
+    return String("20030107");
   case Vendor:
 #if APPLE_CHANGES
-    // FIXME: Should we define a fallback result here besides "KDE"?  Perhaps "Apple"?
-    return Undefined();
+    return String("Apple Computer, Inc.");
 #else
     return String("KDE");
 #endif
diff --git a/WebCore/khtml/rendering/table_layout.cpp b/WebCore/khtml/rendering/table_layout.cpp
index 2861817..47d22a1 100644
--- a/WebCore/khtml/rendering/table_layout.cpp
+++ b/WebCore/khtml/rendering/table_layout.cpp
@@ -770,7 +770,7 @@ int AutoTableLayout::calcEffectiveWidth()
                     }
 		}
 
-                for ( unsigned int pos = col; maxw > 0 && pos < lastCol && minWidth < cMinWidth; pos++ ) {
+                for ( unsigned int pos = col; maxw > 0 && pos < lastCol && minw < cMinWidth; pos++ ) {
 		    if ( !(layoutStruct[pos].width.type == Fixed && haveVariable && fixedWidth <= cMinWidth) ) {
                         int w = QMAX( layoutStruct[pos].effMinWidth, cMinWidth * layoutStruct[pos].effMaxWidth / maxw );
                         w = QMIN(layoutStruct[pos].effMinWidth+(cMinWidth-minw), w);

-- 
WebKit Debian packaging