[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[mjs]

The following commit has been merged in the debian/unstable branch:
commit 67807376434fbf8e378e1760b1d619447ab8be0a
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Nov 16 21:25:23 2003 +0000

    WebCore:
    
            Reviewed by John.
    
    	- fixed 3362841 - javascript History Object length property is always 0
    
            * kwq/KWQKPartsBrowserInterface.mm:
            (KParts::BrowserInterface::property): For the historyLength property,
    	retturn a UInt variant, not Int, because that's what the kjs_window code
    	expects.
    
    WebKit:
    
            Reviewed by John.
    
    	- fixed 3362841 - javascript History Object length property is always 0
    
    	* WebCoreSupport.subproj/WebBridge.m:
            (-[WebBridge historyLength]): Add one to the length to match other browsers.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5522 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index de0da4d..60310ba 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2003-11-16  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by John.
+
+	- fixed 3362841 - javascript History Object length property is always 0
+
+        * kwq/KWQKPartsBrowserInterface.mm:
+        (KParts::BrowserInterface::property): For the historyLength property,
+	retturn a UInt variant, not Int, because that's what the kjs_window code
+	expects.
+
 2003-11-14  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by Ken and Dave.
diff --git a/WebCore/kwq/KWQKPartsBrowserInterface.mm b/WebCore/kwq/KWQKPartsBrowserInterface.mm
index 27bd845..50575c7 100644
--- a/WebCore/kwq/KWQKPartsBrowserInterface.mm
+++ b/WebCore/kwq/KWQKPartsBrowserInterface.mm
@@ -35,7 +35,7 @@ namespace KParts {
 QVariant BrowserInterface::property(const char *name) const
 {
     if (strcmp(name, "historyLength") == 0) {
-        return QVariant([_part->bridge() historyLength]);
+        return QVariant((uint)[_part->bridge() historyLength]);
     }
     ERROR("property %s not implemented", name);
     return QVariant();
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 3e43e29..d2734bd 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2003-11-16  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by John.
+
+	- fixed 3362841 - javascript History Object length property is always 0
+        
+	* WebCoreSupport.subproj/WebBridge.m:
+        (-[WebBridge historyLength]): Add one to the length to match other browsers.
+
 2003-11-14  John Sullivan  <sullivan at apple.com>
         
         - WebKit part of fix for <rdar://problem/3474757>: Safari on-screen text needs review
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index e59ac05..69e2f6a 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -879,7 +879,7 @@ static BOOL loggedObjectCacheSize = NO;
 
 - (int)historyLength
 {
-    return [[[_frame webView] backForwardList] backListCount];
+    return [[[_frame webView] backForwardList] backListCount] + 1;
 }
 
 - (void)goBackOrForward:(int)distance

-- 
WebKit Debian packaging