summaryrefslogtreecommitdiffstats
path: root/WebCore/platform/android/RenderThemeAndroid.cpp
diff options
context:
space:
mode:
authorLeon Scroggins <>2009-04-03 09:43:49 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-04-03 09:43:49 -0700
commit3620888aeeb06e4dd2960323413709461cab663b (patch)
treef8d1ccfac3892b3844e415dbe5373be587d9bda0 /WebCore/platform/android/RenderThemeAndroid.cpp
parent8a879ade4178f72acdea7654ec3ce57ee6c4d9fb (diff)
downloadexternal_webkit-3620888aeeb06e4dd2960323413709461cab663b.zip
external_webkit-3620888aeeb06e4dd2960323413709461cab663b.tar.gz
external_webkit-3620888aeeb06e4dd2960323413709461cab663b.tar.bz2
AI 144458: Remove our hack to prevent drawing the selection, and set our selection color to transparent. This gets us the same result while simplifying the merge.
Automated import of CL 144458
Diffstat (limited to 'WebCore/platform/android/RenderThemeAndroid.cpp')
-rw-r--r--WebCore/platform/android/RenderThemeAndroid.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/WebCore/platform/android/RenderThemeAndroid.cpp b/WebCore/platform/android/RenderThemeAndroid.cpp
index e104c8e..5a935ce 100644
--- a/WebCore/platform/android/RenderThemeAndroid.cpp
+++ b/WebCore/platform/android/RenderThemeAndroid.cpp
@@ -83,12 +83,14 @@ bool RenderThemeAndroid::stateChanged(RenderObject* o, ControlState state) const
Color RenderThemeAndroid::platformActiveSelectionBackgroundColor() const
{
- return Color(46, 251, 0);
+ // Make these transparent because we handle the selection background
+ // in our custom widget.
+ return Color(Color::transparent);
}
Color RenderThemeAndroid::platformInactiveSelectionBackgroundColor() const
{
- return Color(255, 255, 0, 255);
+ return Color(Color::transparent);
}
Color RenderThemeAndroid::platformActiveSelectionForegroundColor() const
@@ -103,7 +105,7 @@ Color RenderThemeAndroid::platformInactiveSelectionForegroundColor() const
Color RenderThemeAndroid::platformTextSearchHighlightColor() const
{
- return Color(192, 192, 192);
+ return Color(Color::transparent);
}
int RenderThemeAndroid::baselinePosition(const RenderObject* obj) const