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

[hyatt]

The following commit has been merged in the debian/unstable branch:
commit 33b233fa8635a3fc196200b6de90bfe6b8f03e84
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 25 22:47:11 2002 +0000

    	Implement scrollX and scrollY on the window object.  This
    	gets brainjar closer to reality. :)
    
            * khtml/ecma/kjs_window.cpp:
            (Window::get):
            * khtml/ecma/kjs_window.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2169 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index cdb2506..cdb1f5b 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,12 @@
+2002-09-25  David Hyatt  <hyatt at apple.com>
+
+	Implement scrollX and scrollY on the window object.  This
+	gets brainjar closer to reality. :)
+	
+        * khtml/ecma/kjs_window.cpp:
+        (Window::get):
+        * khtml/ecma/kjs_window.h:
+
 2002-09-25  Darin Adler  <darin at apple.com>
 
 	Fix error with the color "indigo".
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index cdb2506..cdb1f5b 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,12 @@
+2002-09-25  David Hyatt  <hyatt at apple.com>
+
+	Implement scrollX and scrollY on the window object.  This
+	gets brainjar closer to reality. :)
+	
+        * khtml/ecma/kjs_window.cpp:
+        (Window::get):
+        * khtml/ecma/kjs_window.h:
+
 2002-09-25  Darin Adler  <darin at apple.com>
 
 	Fix error with the color "indigo".
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index cdb2506..cdb1f5b 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2002-09-25  David Hyatt  <hyatt at apple.com>
+
+	Implement scrollX and scrollY on the window object.  This
+	gets brainjar closer to reality. :)
+	
+        * khtml/ecma/kjs_window.cpp:
+        (Window::get):
+        * khtml/ecma/kjs_window.h:
+
 2002-09-25  Darin Adler  <darin at apple.com>
 
 	Fix error with the color "indigo".
diff --git a/WebCore/khtml/ecma/kjs_window.cpp b/WebCore/khtml/ecma/kjs_window.cpp
index d33e117..1459e91 100644
--- a/WebCore/khtml/ecma/kjs_window.cpp
+++ b/WebCore/khtml/ecma/kjs_window.cpp
@@ -210,6 +210,8 @@ const ClassInfo Window::info = { "Window", 0, &WindowTable, 0 };
   scroll	Window::Scroll		DontDelete|Function 2
   scrollBy	Window::ScrollBy	DontDelete|Function 2
   scrollTo	Window::ScrollTo	DontDelete|Function 2
+  scrollX       Window::ScrollX         DontDelete|ReadOnly
+  scrollY       Window::ScrollY         DontDelete|ReadOnly
   moveBy	Window::MoveBy		DontDelete|Function 2
   moveTo	Window::MoveTo		DontDelete|Function 2
   resizeBy	Window::ResizeBy	DontDelete|Function 2
@@ -483,6 +485,12 @@ Value Window::get(ExecState *exec, const UString &p) const
 	  QRect sg = QApplication::desktop()->screenGeometry(QApplication::desktop()->screenNumber(m_part->view()));
       return Number(m_part->view()->mapToGlobal(QPoint(0,0)).y() + sg.y());
     }
+    case ScrollX: {
+      return Number(m_part->view()->contentsX());
+    }
+    case ScrollY: {
+      return Number(m_part->view()->contentsY());
+    }
     case Scrollbars:
       return Undefined(); // ###
     case Self:
diff --git a/WebCore/khtml/ecma/kjs_window.h b/WebCore/khtml/ecma/kjs_window.h
index 1061da4..74ba384 100644
--- a/WebCore/khtml/ecma/kjs_window.h
+++ b/WebCore/khtml/ecma/kjs_window.h
@@ -108,7 +108,7 @@ namespace KJS {
            OffscreenBuffering, Opener, OuterHeight, OuterWidth, PageXOffset, PageYOffset,
            Parent, Personalbar, ScreenX, ScreenY, Scrollbars, Scroll, ScrollBy,
            ScreenTop, ScreenLeft,
-           ScrollTo, MoveBy, MoveTo, ResizeBy, ResizeTo, Self, _Window, Top, _Screen,
+           ScrollTo, ScrollX, ScrollY, MoveBy, MoveTo, ResizeBy, ResizeTo, Self, _Window, Top, _Screen,
            Image, Option, Alert, Confirm, Prompt, Open, SetTimeout, ClearTimeout,
            Focus, Blur, Close, SetInterval, ClearInterval, CaptureEvents, Onabort, Onblur,
            Onchange, Onclick, Ondblclick, Ondragdrop, Onerror, Onfocus,

-- 
WebKit Debian packaging