[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 0c026cd17d4d9d87cee14c01c4c2410b0bf38c93
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Apr 14 07:10:04 2003 +0000

            Reviewed by Trey.
    
    	- fixed 3165326 - javascript getSelection not implemented
    
            * khtml/ecma/kjs_window.cpp:
            (Window::get):
            (WindowFunc::tryCall):
            * khtml/ecma/kjs_window.h:
            * khtml/ecma/kjs_window.lut.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4093 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 13377e9..ff50efe 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,15 @@
+2003-04-13  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Trey.
+
+	- fixed 3165326 - javascript getSelection not implemented
+	
+        * khtml/ecma/kjs_window.cpp:
+        (Window::get):
+        (WindowFunc::tryCall):
+        * khtml/ecma/kjs_window.h:
+        * khtml/ecma/kjs_window.lut.h:
+
 2003-04-13  Trey Matteson  <trey at apple.com>
 
 	3219720 - autofill mapping confused by tables, worse than MacIE (at store.apple.com)
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 13377e9..ff50efe 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,15 @@
+2003-04-13  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Trey.
+
+	- fixed 3165326 - javascript getSelection not implemented
+	
+        * khtml/ecma/kjs_window.cpp:
+        (Window::get):
+        (WindowFunc::tryCall):
+        * khtml/ecma/kjs_window.h:
+        * khtml/ecma/kjs_window.lut.h:
+
 2003-04-13  Trey Matteson  <trey at apple.com>
 
 	3219720 - autofill mapping confused by tables, worse than MacIE (at store.apple.com)
diff --git a/WebCore/khtml/ecma/kjs_window.cpp b/WebCore/khtml/ecma/kjs_window.cpp
index b156de0..96cf18d 100644
--- a/WebCore/khtml/ecma/kjs_window.cpp
+++ b/WebCore/khtml/ecma/kjs_window.cpp
@@ -233,6 +233,7 @@ const ClassInfo Window::info = { "Window", 0, &WindowTable, 0 };
   setTimeout	Window::SetTimeout	DontDelete|Function 2
   clearTimeout	Window::ClearTimeout	DontDelete|Function 1
   focus		Window::Focus		DontDelete|Function 0
+  getSelection  Window::GetSelection    DontDelete|Function 0
   blur		Window::Blur		DontDelete|Function 0
   close		Window::Close		DontDelete|Function 0
   setInterval	Window::SetInterval	DontDelete|Function 2
@@ -558,6 +559,7 @@ Value Window::get(ExecState *exec, const Identifier &p) const
     case ClearTimeout:
     case SetInterval:
     case ClearInterval:
+    case GetSelection:
       if (isSafeScript(exec))
         return lookupOrCreateFunction<WindowFunc>(exec,p,this,entry->value,entry->params,entry->attr);
       else
@@ -1405,6 +1407,10 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
     if (widget)
       widget->setActiveWindow();
     return Undefined();
+  case Window::GetSelection:
+    if (!window->isSafeScript(exec))
+        return Undefined();
+    return String(part->selectedText());
   case Window::Blur:
 #if APPLE_CHANGES
     KWQ(part)->unfocusWindow();
diff --git a/WebCore/khtml/ecma/kjs_window.h b/WebCore/khtml/ecma/kjs_window.h
index 14e7f9c..c71c972 100644
--- a/WebCore/khtml/ecma/kjs_window.h
+++ b/WebCore/khtml/ecma/kjs_window.h
@@ -116,7 +116,7 @@ namespace KJS {
            ScreenTop, ScreenLeft,
            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, 
+           Focus, GetSelection, Blur, Close, SetInterval, ClearInterval, CaptureEvents, 
            ReleaseEvents, AddEventListener, RemoveEventListener, Onabort, Onblur,
            Onchange, Onclick, Ondblclick, Ondragdrop, Onerror, Onfocus,
            Onkeydown, Onkeypress, Onkeyup, Onload, Onmousedown, Onmousemove,
diff --git a/WebCore/khtml/ecma/kjs_window.lut.h b/WebCore/khtml/ecma/kjs_window.lut.h
index b8f163b..e9ea4da 100644
--- a/WebCore/khtml/ecma/kjs_window.lut.h
+++ b/WebCore/khtml/ecma/kjs_window.lut.h
@@ -30,7 +30,7 @@ const struct HashEntry WindowTableEntries[] = {
    { 0, 0, 0, 0, 0 },
    { "offscreenBuffering", Window::OffscreenBuffering, DontDelete|ReadOnly, 0, 0 },
    { "setTimeout", Window::SetTimeout, DontDelete|Function, 2, 0 },
-   { 0, 0, 0, 0, 0 },
+   { "getSelection", Window::GetSelection, DontDelete|Function, 0, 0 },
    { 0, 0, 0, 0, 0 },
    { "DOMException", Window::DOMException, DontDelete, 0, &WindowTableEntries[103] },
    { "closed", Window::Closed, DontDelete|ReadOnly, 0, &WindowTableEntries[96] },

-- 
WebKit Debian packaging