[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 cee12d6b0e117c07f8335fc05f5ed4401b6ce74a
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Sep 23 17:56:51 2002 +0000

    	Make overflow:auto and scroll map to hidden until we figure
    	out something better.
    
            * khtml/css/cssstyleselector.cpp:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2124 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 4127c3a..0e98943 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+\2002-09-23  David Hyatt  <hyatt at apple.com>
+
+	Make overflow:auto and scroll map to hidden until we figure
+	out something better.
+	
+        * khtml/css/cssstyleselector.cpp:
+ 
 2002-09-23  Darin Adler  <darin at apple.com>
 
 	More refinement of the AppKit hackery.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 4127c3a..0e98943 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,10 @@
+\2002-09-23  David Hyatt  <hyatt at apple.com>
+
+	Make overflow:auto and scroll map to hidden until we figure
+	out something better.
+	
+        * khtml/css/cssstyleselector.cpp:
+ 
 2002-09-23  Darin Adler  <darin at apple.com>
 
 	More refinement of the AppKit hackery.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 4127c3a..0e98943 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,10 @@
+\2002-09-23  David Hyatt  <hyatt at apple.com>
+
+	Make overflow:auto and scroll map to hidden until we figure
+	out something better.
+	
+        * khtml/css/cssstyleselector.cpp:
+ 
 2002-09-23  Darin Adler  <darin at apple.com>
 
 	More refinement of the AppKit hackery.
diff --git a/WebCore/khtml/css/cssstyleselector.cpp b/WebCore/khtml/css/cssstyleselector.cpp
index b22eabd..9917337 100644
--- a/WebCore/khtml/css/cssstyleselector.cpp
+++ b/WebCore/khtml/css/cssstyleselector.cpp
@@ -1541,11 +1541,12 @@ void CSSStyleSelector::applyRule( DOM::CSSProperty *prop )
         case CSS_VAL_VISIBLE:
             o = OVISIBLE; break;
         case CSS_VAL_HIDDEN:
-            o = OHIDDEN; break;
         case CSS_VAL_SCROLL:
-            o = SCROLL; break;
         case CSS_VAL_AUTO:
-            o = AUTO; break;
+            // For now we map overflow:auto and overflow:scroll to overflow:hidden.
+            // This at least keeps the layout of the surrounding page correct until
+            // we provide support for auto and scroll values. -dwh
+            o = OHIDDEN; break;
         default:
             return;
         }
diff --git a/WebCore/kwq/KWQListBox.mm b/WebCore/kwq/KWQListBox.mm
index 788a550..b0425dc 100644
--- a/WebCore/kwq/KWQListBox.mm
+++ b/WebCore/kwq/KWQListBox.mm
@@ -89,7 +89,6 @@
 
 @end
 
-
 QListBox::QListBox(QWidget *parent)
     : QScrollView(parent), m_insertingItems(false)
     , m_clicked(this, SIGNAL(clicked(QListBoxItem *)))

-- 
WebKit Debian packaging