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

[tony at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit fae59c3b7d9439257e17051ffe63d49ae1c07a9e
Author: tony at chromium.org <tony at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 5 17:58:18 2010 +0000

    2010-10-05  Tony Chang  <tony at chromium.org>
    
            Reviewed by Kent Tamura.
    
            [chromium] properly paint really small scrollbar arrows on linux
            https://bugs.webkit.org/show_bug.cgi?id=47109
    
            * platform/chromium-linux/fast/frames/onlyCommentInIFrame-expected.checksum:
            * platform/chromium-linux/fast/frames/onlyCommentInIFrame-expected.png:
            * platform/chromium/test_expectations.txt: Remove passing test and remove windows test that has no failures on
                the dashboard
    2010-10-05  Tony Chang  <tony at chromium.org>
    
            Reviewed by Kent Tamura.
    
            [chromium] properly paint really small scrollbar arrows on linux
            https://bugs.webkit.org/show_bug.cgi?id=47109
    
            * platform/chromium/ScrollbarThemeChromiumLinux.cpp:
            (WebCore::ScrollbarThemeChromiumLinux::buttonSize): Clamp button size based on available size.  This matches what
                we do on Win.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69126 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 7a9efa0..dfa17df 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2010-10-05  Tony Chang  <tony at chromium.org>
+
+        Reviewed by Kent Tamura.
+
+        [chromium] properly paint really small scrollbar arrows on linux
+        https://bugs.webkit.org/show_bug.cgi?id=47109
+
+        * platform/chromium-linux/fast/frames/onlyCommentInIFrame-expected.checksum:
+        * platform/chromium-linux/fast/frames/onlyCommentInIFrame-expected.png:
+        * platform/chromium/test_expectations.txt: Remove passing test and remove windows test that has no failures on
+            the dashboard
+
 2010-10-04  Jeremy Orlow  <jorlow at chromium.org>
 
         Reviewed by Nate Chapin.
diff --git a/LayoutTests/platform/chromium-linux/fast/frames/onlyCommentInIFrame-expected.checksum b/LayoutTests/platform/chromium-linux/fast/frames/onlyCommentInIFrame-expected.checksum
index 7c40740..aab4ccf 100644
--- a/LayoutTests/platform/chromium-linux/fast/frames/onlyCommentInIFrame-expected.checksum
+++ b/LayoutTests/platform/chromium-linux/fast/frames/onlyCommentInIFrame-expected.checksum
@@ -1 +1 @@
-dcd87ca252c589089a74b3e4560ac5ca
\ No newline at end of file
+21e88899981167b85280efa884077f15
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-linux/fast/frames/onlyCommentInIFrame-expected.png b/LayoutTests/platform/chromium-linux/fast/frames/onlyCommentInIFrame-expected.png
index ae6c3e3..efa7b8a 100644
Binary files a/LayoutTests/platform/chromium-linux/fast/frames/onlyCommentInIFrame-expected.png and b/LayoutTests/platform/chromium-linux/fast/frames/onlyCommentInIFrame-expected.png differ
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index 68a2dc7..e9b6807 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -2186,12 +2186,6 @@ BUG31997 DEBUG WIN : fast/body-propagation/overflow/004-xhtml.xhtml = IMAGE+TEXT
 // Regression from Webkit merge 51772 -> 51784
 BUG35329 WIN : http/tests/appcache/resource-redirect-2.html = TIMEOUT PASS
 
-// Webkit Roll to r51875
-BUG29748 WIN DEBUG : fast/forms/input-align-image.html = IMAGE+TEXT PASS
-
-// The scrollbar arrows exceed the height of the iframe.
-BUG29748 LINUX : fast/frames/onlyCommentInIFrame.html = IMAGE
-
 // More Webkit Roll to r51875
 // Some of these went from IMAGE+TEXT to just IMAGE at r57886
 BUG29737 MAC : svg/custom/use-elementInstance-event-target.svg = IMAGE
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d61f1c0..ad28d7e 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-10-05  Tony Chang  <tony at chromium.org>
+
+        Reviewed by Kent Tamura.
+
+        [chromium] properly paint really small scrollbar arrows on linux
+        https://bugs.webkit.org/show_bug.cgi?id=47109
+
+        * platform/chromium/ScrollbarThemeChromiumLinux.cpp:
+        (WebCore::ScrollbarThemeChromiumLinux::buttonSize): Clamp button size based on available size.  This matches what
+            we do on Win.
+
 2010-10-05  Nate Chapin  <japhet at chromium.org>
 
         Reviewed by David Levin.
diff --git a/WebCore/platform/chromium/ScrollbarThemeChromiumLinux.cpp b/WebCore/platform/chromium/ScrollbarThemeChromiumLinux.cpp
index d8f2c79..d9434c7 100644
--- a/WebCore/platform/chromium/ScrollbarThemeChromiumLinux.cpp
+++ b/WebCore/platform/chromium/ScrollbarThemeChromiumLinux.cpp
@@ -190,10 +190,10 @@ bool ScrollbarThemeChromiumLinux::shouldCenterOnThumb(Scrollbar*, const Platform
 IntSize ScrollbarThemeChromiumLinux::buttonSize(Scrollbar* scrollbar)
 {
     if (scrollbar->orientation() == VerticalScrollbar)
-        return IntSize(scrollbarThicknessValue, buttonLength);
+        return IntSize(scrollbarThicknessValue, scrollbar->height() < 2 * buttonLength ? scrollbar->height() / 2 : buttonLength);
 
     // HorizontalScrollbar
-    return IntSize(buttonLength, scrollbarThicknessValue);
+    return IntSize(scrollbar->width() < 2 * buttonLength ? scrollbar->width() / 2 : buttonLength, scrollbarThicknessValue);
 }
 
 int ScrollbarThemeChromiumLinux::minimumThumbLength(Scrollbar* scrollbar)

-- 
WebKit Debian packaging