summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordeanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-12 14:48:16 +0000
committerdeanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-12 14:48:16 +0000
commitd6d152b1dc70d8a6da19a0c783cadf5283592a69 (patch)
tree77cced4b438081c46f8bedc2e8d720b50168891e
parent091d9b0fc26e02eb6c019332a32d0f7317d70086 (diff)
downloadchromium_src-d6d152b1dc70d8a6da19a0c783cadf5283592a69.zip
chromium_src-d6d152b1dc70d8a6da19a0c783cadf5283592a69.tar.gz
chromium_src-d6d152b1dc70d8a6da19a0c783cadf5283592a69.tar.bz2
Make RenderThemeGtk match RenderThemeWin a bit more.
Review URL: http://codereview.chromium.org/14048 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6888 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/port/platform/chromium/RenderThemeGtk.cpp10
-rw-r--r--webkit/port/platform/chromium/RenderThemeGtk.h4
2 files changed, 8 insertions, 6 deletions
diff --git a/webkit/port/platform/chromium/RenderThemeGtk.cpp b/webkit/port/platform/chromium/RenderThemeGtk.cpp
index 3f7ffa0..4481770 100644
--- a/webkit/port/platform/chromium/RenderThemeGtk.cpp
+++ b/webkit/port/platform/chromium/RenderThemeGtk.cpp
@@ -278,6 +278,11 @@ Color RenderThemeGtk::platformInactiveSelectionForegroundColor() const
return makeColor(widget->style->text[GTK_STATE_ACTIVE]);
}
+Color RenderThemeGtk::platformTextSearchHighlightColor() const
+{
+ return Color(255, 255, 150);
+}
+
double RenderThemeGtk::caretBlinkInterval() const
{
// Disable the blinking caret in layout test mode, as it introduces
@@ -370,11 +375,6 @@ bool RenderThemeGtk::paintTextField(RenderObject* o, const RenderObject::PaintIn
return paintMozWidget(this, MOZ_GTK_ENTRY, o, i, rect);
}
-bool RenderThemeGtk::paintTextArea(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& r)
-{
- return paintTextField(o, i, r);
-}
-
bool RenderThemeGtk::paintSearchField(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& rect)
{
return paintTextField(o, i, rect);
diff --git a/webkit/port/platform/chromium/RenderThemeGtk.h b/webkit/port/platform/chromium/RenderThemeGtk.h
index d191089..90bc6f4 100644
--- a/webkit/port/platform/chromium/RenderThemeGtk.h
+++ b/webkit/port/platform/chromium/RenderThemeGtk.h
@@ -53,6 +53,7 @@ public:
virtual Color platformInactiveSelectionBackgroundColor() const;
virtual Color platformActiveSelectionForegroundColor() const;
virtual Color platformInactiveSelectionForegroundColor() const;
+ virtual Color platformTextSearchHighlightColor() const;
virtual double caretBlinkInterval() const;
@@ -71,7 +72,8 @@ public:
virtual bool paintTextField(RenderObject*, const RenderObject::PaintInfo&, const IntRect&);
- virtual bool paintTextArea(RenderObject*, const RenderObject::PaintInfo&, const IntRect&);
+ virtual bool paintTextArea(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& r)
+ { return paintTextField(o, i, r); }
virtual bool paintSearchField(RenderObject*, const RenderObject::PaintInfo&, const IntRect&);