[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 65db9595b0b12f97e94b13bd2a42f5c263891f34
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 23 02:26:12 2009 +0000

    2009-12-22  Carol Szabo  <carol.szabo at nokia.com>
    
            Reviewed by Eric Seidel.
    
            [Qt] The "Search" input type is not rendered correctly when styled.
            https://bugs.webkit.org/show_bug.cgi?id=32417
    
            There are no new tests because only pixel tests may be affected by
            this change and those changes can only be done on the build bot.
    
            * platform/qt/RenderThemeQt.cpp:
            (WebCore::RenderThemeQt::paintSearchField):
            Since currently we paint the Search control as a QLineEdit, I have
            deferred painting to WebCore, as in the case of the text input so
            that the painting is consistent.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52518 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 03b4ccc..c6e2c58 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2009-12-22  Carol Szabo  <carol.szabo at nokia.com>
+
+        Reviewed by Eric Seidel.
+
+        [Qt] The "Search" input type is not rendered correctly when styled.
+        https://bugs.webkit.org/show_bug.cgi?id=32417
+
+        There are no new tests because only pixel tests may be affected by
+        this change and those changes can only be done on the build bot.
+
+        * platform/qt/RenderThemeQt.cpp:
+        (WebCore::RenderThemeQt::paintSearchField):
+        Since currently we paint the Search control as a QLineEdit, I have
+        deferred painting to WebCore, as in the case of the text input so 
+        that the painting is consistent.
+
 2009-12-22  Yongjun Zhang  <yongjun.zhang at nokia.com>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebCore/platform/qt/RenderThemeQt.cpp b/WebCore/platform/qt/RenderThemeQt.cpp
index 74120d3..04e31b9 100644
--- a/WebCore/platform/qt/RenderThemeQt.cpp
+++ b/WebCore/platform/qt/RenderThemeQt.cpp
@@ -643,8 +643,7 @@ bool RenderThemeQt::paintSliderThumb(RenderObject* o, const RenderObject::PaintI
 bool RenderThemeQt::paintSearchField(RenderObject* o, const RenderObject::PaintInfo& pi,
                                      const IntRect& r)
 {
-    paintTextField(o, pi, r);
-    return false;
+    return true;
 }
 
 void RenderThemeQt::adjustSearchFieldStyle(CSSStyleSelector* selector, RenderStyle* style,

-- 
WebKit Debian packaging