[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 3d3b15fe50db8d71399489b87257f70a6b01e610
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jul 11 07:56:38 2002 +0000

            Fixed Radar 2953254 - JavaScript window.scroll() and
    	window.scrollBy() do not work
    
    	* khtml/ecma/kjs_window.cpp:
            (WindowFunc::tryCall): Handle Scroll the same as ScrollBy.
            * kwq/KWQScrollView.mm:
            (QScrollView::scrollBy): Implement this method, since it's needed
    	for JS scrolling.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1536 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 3f8559d..9eabf98 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,14 @@
+2002-07-11  Maciej Stachowiak  <mjs at apple.com>
+
+        Fixed Radar 2953254 - JavaScript window.scroll() and
+	window.scrollBy() do not work
+
+	* khtml/ecma/kjs_window.cpp:
+        (WindowFunc::tryCall): Handle Scroll the same as ScrollBy.
+        * kwq/KWQScrollView.mm:
+        (QScrollView::scrollBy): Implement this method, since it's needed
+	for JS scrolling.
+
 2002-07-10  Darin Adler  <darin at apple.com>
 
 	- fixed 2978796 -- Client-side image map not working
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 3f8559d..9eabf98 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,14 @@
+2002-07-11  Maciej Stachowiak  <mjs at apple.com>
+
+        Fixed Radar 2953254 - JavaScript window.scroll() and
+	window.scrollBy() do not work
+
+	* khtml/ecma/kjs_window.cpp:
+        (WindowFunc::tryCall): Handle Scroll the same as ScrollBy.
+        * kwq/KWQScrollView.mm:
+        (QScrollView::scrollBy): Implement this method, since it's needed
+	for JS scrolling.
+
 2002-07-10  Darin Adler  <darin at apple.com>
 
 	- fixed 2978796 -- Client-side image map not working
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 3f8559d..9eabf98 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2002-07-11  Maciej Stachowiak  <mjs at apple.com>
+
+        Fixed Radar 2953254 - JavaScript window.scroll() and
+	window.scrollBy() do not work
+
+	* khtml/ecma/kjs_window.cpp:
+        (WindowFunc::tryCall): Handle Scroll the same as ScrollBy.
+        * kwq/KWQScrollView.mm:
+        (QScrollView::scrollBy): Implement this method, since it's needed
+	for JS scrolling.
+
 2002-07-10  Darin Adler  <darin at apple.com>
 
 	- fixed 2978796 -- Client-side image map not working
diff --git a/WebCore/khtml/ecma/kjs_window.cpp b/WebCore/khtml/ecma/kjs_window.cpp
index 7b052fa..f4182b3 100644
--- a/WebCore/khtml/ecma/kjs_window.cpp
+++ b/WebCore/khtml/ecma/kjs_window.cpp
@@ -1169,6 +1169,9 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
         return Undefined();
     }
   }
+#ifdef APPLE_CHANGES
+  case Window::Scroll:
+#endif
   case Window::ScrollBy:
     if(args.size() == 2 && widget)
       widget->scrollBy(args[0].toInt32(exec), args[1].toInt32(exec));
diff --git a/WebCore/kwq/KWQScrollView.mm b/WebCore/kwq/KWQScrollView.mm
index cee7547..087a3d4 100644
--- a/WebCore/kwq/KWQScrollView.mm
+++ b/WebCore/kwq/KWQScrollView.mm
@@ -163,7 +163,7 @@ int QScrollView::childY(QWidget *)
 
 void QScrollView::scrollBy(int dx, int dy)
 {
-    _logNeverImplemented();
+    setContentsPos(contentsX() + dx, contentsY() + dy);
 }
 
 void QScrollView::setContentsPos(int x, int y)

-- 
WebKit Debian packaging