Trivially implement the themed search field by mapping it to a text field

Also add a bunch of notImplemented warnings for other places where we don't
have an implementatin in RenderTheme.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@29521 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index b886711f2da7059ba0a1856933295d54e21e2fa9..72e2a0b5cbaff8bede215da9ace7b51fe75cc173 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,27 @@
+2008-01-16  Lars Knoll  <lars@trolltech.com>
+
+        Reviewed by Simon Hausmann <simon.hausmann@trolltech.com>.
+
+        Trivially implement the themed search field by mapping it to a text field
+
+        Also add a bunch of notImplemented warnings for other places where we don't
+        have an implementatin in RenderTheme.
+
+        * platform/qt/RenderThemeQt.cpp:
+        (WebCore::RenderThemeQt::paintTextField):
+        (WebCore::RenderThemeQt::paintMenuListButton):
+        (WebCore::RenderThemeQt::adjustMenuListButtonStyle):
+        (WebCore::RenderThemeQt::paintSliderTrack):
+        (WebCore::RenderThemeQt::paintSliderThumb):
+        (WebCore::RenderThemeQt::paintSearchField):
+        (WebCore::RenderThemeQt::adjustSearchFieldStyle):
+        (WebCore::RenderThemeQt::adjustSearchFieldCancelButtonStyle):
+        (WebCore::RenderThemeQt::paintSearchFieldCancelButton):
+        (WebCore::RenderThemeQt::adjustSearchFieldDecorationStyle):
+        (WebCore::RenderThemeQt::paintSearchFieldDecoration):
+        (WebCore::RenderThemeQt::adjustSearchFieldResultsDecorationStyle):
+        (WebCore::RenderThemeQt::paintSearchFieldResultsDecoration):
+
 2008-01-16  Holger Freyther  <holger.freyther@trolltech.com>
 
         Reviewed by Simon.

diff --git a/WebCore/platform/qt/RenderThemeQt.cpp b/WebCore/platform/qt/RenderThemeQt.cpp
index 44a418eed2f9266b012b3ab041486a4d43fa96a5..839c22faa8d019d5e806a70a3a43cb5574a2398f 100644 (file)
--- a/WebCore/platform/qt/RenderThemeQt.cpp
+++ b/WebCore/platform/qt/RenderThemeQt.cpp
@@ -27,6 +27,7 @@
 #include "config.h"
 
 #include "RenderThemeQt.h"
+#include "NotImplemented.h"
 
 #include <QApplication>
 #include <QColor>
@@ -267,7 +268,7 @@ bool RenderThemeQt::paintTextField(RenderObject* o, const RenderObject::PaintInf
 
     // Get the correct theme data for a button
     EAppearance appearance = applyTheme(panel, o);
-    Q_ASSERT(appearance == TextFieldAppearance);
+    Q_ASSERT(appearance == TextFieldAppearance || appearance == SearchFieldAppearance);
 
     // Now paint the text field.
     style->drawPrimitive(QStyle::PE_PanelLineEdit, &panel, painter, widget);
@@ -330,72 +331,84 @@ bool RenderThemeQt::paintMenuList(RenderObject* o, const RenderObject::PaintInfo
 bool RenderThemeQt::paintMenuListButton(RenderObject* o, const RenderObject::PaintInfo& pi,
                                         const IntRect& r)
 {
+    notImplemented();
     return RenderTheme::paintMenuListButton(o, pi, r);
 }
 
 void RenderThemeQt::adjustMenuListButtonStyle(CSSStyleSelector* selector, RenderStyle* style,
                                               Element* e) const
 {
+    notImplemented();
     RenderTheme::adjustMenuListButtonStyle(selector, style, e);
 }
 
 bool RenderThemeQt::paintSliderTrack(RenderObject* o, const RenderObject::PaintInfo& pi,
                                      const IntRect& r)
 {
+    notImplemented();
     return RenderTheme::paintSliderTrack(o, pi, r);
 }
 
 bool RenderThemeQt::paintSliderThumb(RenderObject* o, const RenderObject::PaintInfo& pi,
                                      const IntRect& r)
 {
+    notImplemented();
     return RenderTheme::paintSliderThumb(o, pi, r);
 }
 
 bool RenderThemeQt::paintSearchField(RenderObject* o, const RenderObject::PaintInfo& pi,
                                      const IntRect& r)
 {
-    return RenderTheme::paintSearchField(o, pi, r);
+    paintTextField(o, pi, r);
+    return false;
 }
 
 void RenderThemeQt::adjustSearchFieldStyle(CSSStyleSelector* selector, RenderStyle* style,
                                            Element* e) const
 {
+    notImplemented();
     RenderTheme::adjustSearchFieldStyle(selector, style, e);
 }
 
 void RenderThemeQt::adjustSearchFieldCancelButtonStyle(CSSStyleSelector* selector, RenderStyle* style,
                                                        Element* e) const
 {
+    notImplemented();
     RenderTheme::adjustSearchFieldCancelButtonStyle(selector, style, e);
 }
 
 bool RenderThemeQt::paintSearchFieldCancelButton(RenderObject* o, const RenderObject::PaintInfo& pi,
                                                  const IntRect& r)
 {
+    notImplemented();
     return RenderTheme::paintSearchFieldCancelButton(o, pi, r);
 }
 
 void RenderThemeQt::adjustSearchFieldDecorationStyle(CSSStyleSelector* selector, RenderStyle* style,
                                                      Element* e) const
 {
+    notImplemented();
     RenderTheme::adjustSearchFieldDecorationStyle(selector, style, e);
 }
 
 bool RenderThemeQt::paintSearchFieldDecoration(RenderObject* o, const RenderObject::PaintInfo& pi,
                                                const IntRect& r)
 {
+    notImplemented();
     return RenderTheme::paintSearchFieldDecoration(o, pi, r);
 }
 
 void RenderThemeQt::adjustSearchFieldResultsDecorationStyle(CSSStyleSelector* selector, RenderStyle* style,
                                                             Element* e) const
 {
+    notImplemented();
     RenderTheme::adjustSearchFieldResultsDecorationStyle(selector, style, e);
 }
 
 bool RenderThemeQt::paintSearchFieldResultsDecoration(RenderObject* o, const RenderObject::PaintInfo& pi,
                                                       const IntRect& r)
 {
+    notImplemented();
     return RenderTheme::paintSearchFieldResultsDecoration(o, pi, r);
 }