[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 56680859c0a8527b7ac10237cd06c20b5827f416
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Apr 10 18:48:51 2003 +0000

            Reviewed by Darin and Ken.
    
    	- fixed 3223127 - REGRESSION: windows for PopCap games show scroll bars now, did not in Safari-60
    
            * khtml/ecma/kjs_window.cpp:
            (WindowFunc::tryCall): Re-add scrollbars property, but change it
    	to default to on even when other properties are specified (unlike
    	other window properties). This seems to match what Mac IE, Win IE
    	and Windows Mozilla do.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4063 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index a2474c2..a735c8b 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,15 @@
+2003-04-10  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Darin and Ken.
+
+	- fixed 3223127 - REGRESSION: windows for PopCap games show scroll bars now, did not in Safari-60
+
+        * khtml/ecma/kjs_window.cpp:
+        (WindowFunc::tryCall): Re-add scrollbars property, but change it
+	to default to on even when other properties are specified (unlike
+	other window properties). This seems to match what Mac IE, Win IE
+	and Windows Mozilla do.
+
 2003-04-10  Darin Adler  <darin at apple.com>
 
         Reviewed by Trey.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index a2474c2..a735c8b 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,15 @@
+2003-04-10  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Darin and Ken.
+
+	- fixed 3223127 - REGRESSION: windows for PopCap games show scroll bars now, did not in Safari-60
+
+        * khtml/ecma/kjs_window.cpp:
+        (WindowFunc::tryCall): Re-add scrollbars property, but change it
+	to default to on even when other properties are specified (unlike
+	other window properties). This seems to match what Mac IE, Win IE
+	and Windows Mozilla do.
+
 2003-04-10  Darin Adler  <darin at apple.com>
 
         Reviewed by Trey.
diff --git a/WebCore/khtml/ecma/kjs_window.cpp b/WebCore/khtml/ecma/kjs_window.cpp
index b01c254..b156de0 100644
--- a/WebCore/khtml/ecma/kjs_window.cpp
+++ b/WebCore/khtml/ecma/kjs_window.cpp
@@ -1132,6 +1132,9 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
         winargs.menuBarVisible = false;
         winargs.toolBarsVisible = false;
         winargs.statusBarVisible = false;
+#if APPLE_CHANGES
+	winargs.scrollbarsVisible = true;
+#endif
         QStringList flist = QStringList::split(',', features);
         QStringList::ConstIterator it = flist.begin();
         while (it != flist.end()) {
@@ -1203,6 +1206,10 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
             winargs.resizable = (val == "1" || val == "yes");
           else if (key == "fullscreen")
             winargs.fullscreen = (val == "1" || val == "yes");
+#if APPLE_CHANGES
+          else if (key == "scrollbars")
+            winargs.scrollbarsVisible = !(val == "0" || val == "no");
+#endif
         }
       }
 

-- 
WebKit Debian packaging