[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[pkasting at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit d46713f15443c13f8c600d2f3db47938567cf2e9
Author: pkasting at chromium.org <pkasting at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 8 20:33:06 2010 +0000

    WebCore: Not reviewed, fallout from http://trac.webkit.org/changeset/67001
    
    Fix compile failures and add svn:eol-style on two new files.
    
    * platform/ScrollAnimator.h: Added property svn:eol-style.
    * platform/ScrollAnimatorWin.cpp: Added property svn:eol-style.
    * platform/win/PopupMenuWin.cpp: Fix compile errors.
    (WebCore::PopupMenuWin::scrollToRevealSelection):
    (WebCore::PopupMenuWin::scrollSize):
    
    LayoutTests: Not reviewed, skip failing layout tests.
    
    https://bugs.webkit.org/show_bug.cgi?id=45411
    
    * platform/qt/Skipped:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67009 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 850617a..654bc42 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,11 @@
+2010-09-08  Peter Kasting  <pkasting at google.com>
+
+        Not reviewed, skip failing layout tests.
+
+        https://bugs.webkit.org/show_bug.cgi?id=45411
+
+        * platform/qt/Skipped:
+
 2010-09-08  Martin Robinson  <mrobinson at igalia.com>
 
         Skip websocket tests until the GLib/GIO situation on the
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index 2c32b4c..1bfccfe 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -5451,3 +5451,9 @@ fullscreen/
 
 # https://bugs.webkit.org/show_bug.cgi?id=45194
 fast/text/decomposed-after-stacked-diacritics.html
+
+# https://bugs.webkit.org/show_bug.cgi?id=45411
+fast/events/continuous-platform-wheelevent-in-scrolling-div.html
+fast/events/scroll-event-does-not-bubble.html
+fast/events/spatial-navigation/snav-only-clipped-overflow-content.html
+fast/events/wheelevent-in-scrolling-div.html
\ No newline at end of file
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 33dd13d..fcff9ad 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-08  Peter Kasting  <pkasting at google.com>
+
+        Not reviewed, fallout from http://trac.webkit.org/changeset/67001
+
+        Fix compile failures and add svn:eol-style on two new files.
+
+        * platform/ScrollAnimator.h: Added property svn:eol-style.
+        * platform/ScrollAnimatorWin.cpp: Added property svn:eol-style.
+        * platform/win/PopupMenuWin.cpp: Fix compile errors.
+        (WebCore::PopupMenuWin::scrollToRevealSelection):
+        (WebCore::PopupMenuWin::scrollSize):
+
 2010-09-08  James Robinson  <jamesr at chromium.org>
 
         Reviewed by Kenneth Russell.
diff --git a/WebCore/platform/win/PopupMenuWin.cpp b/WebCore/platform/win/PopupMenuWin.cpp
index 5dc43c2..a782b03 100644
--- a/WebCore/platform/win/PopupMenuWin.cpp
+++ b/WebCore/platform/win/PopupMenuWin.cpp
@@ -531,12 +531,12 @@ bool PopupMenuWin::scrollToRevealSelection()
     int index = focusedIndex();
 
     if (index < m_scrollOffset) {
-        m_scrollbar->setValue(index);
+        m_scrollbar->setValue(index, Scrollbar::NotFromScrollAnimator);
         return true;
     }
 
     if (index >= m_scrollOffset + visibleItems()) {
-        m_scrollbar->setValue(index - visibleItems() + 1);
+        m_scrollbar->setValue(index - visibleItems() + 1, Scrollbar::NotFromScrollAnimator);
         return true;
     }
 
@@ -666,7 +666,7 @@ void PopupMenuWin::paint(const IntRect& damageRect, HDC hdc)
 
 int PopupMenuWin::scrollSize(ScrollbarOrientation orientation) const
 {
-    return ((orientation == VerticallScrollbar) && m_scrollbar) ? (m_scrollbar->totalSize() - m_scrollbar->visibleSize()) : 0;
+    return ((orientation == VerticalScrollbar) && m_scrollbar) ? (m_scrollbar->totalSize() - m_scrollbar->visibleSize()) : 0;
 }
 
 void PopupMenuWin::setScrollOffsetFromAnimation(const IntPoint& offset)

-- 
WebKit Debian packaging