summaryrefslogtreecommitdiffstats
path: root/WebCore/platform/android
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2010-05-26 11:26:00 +0100
committerSteve Block <steveblock@google.com>2010-05-27 11:16:16 +0100
commit605e3841dfeddd1eeaa36441c6bd4ec4667b89e8 (patch)
treef65f839f8b18ce9c80ec33a6b12e793bf4a9ed2e /WebCore/platform/android
parente88ab06a893a712c7de04b5bcac7d9645c8515cf (diff)
downloadexternal_webkit-605e3841dfeddd1eeaa36441c6bd4ec4667b89e8.zip
external_webkit-605e3841dfeddd1eeaa36441c6bd4ec4667b89e8.tar.gz
external_webkit-605e3841dfeddd1eeaa36441c6bd4ec4667b89e8.tar.bz2
Merge WebKit at r60074: RenderStyle color accessors are now private
See http://trac.webkit.org/changeset/59956 Change-Id: If1839f65ad960250c7dda5b565bd47278aa7df14
Diffstat (limited to 'WebCore/platform/android')
-rw-r--r--WebCore/platform/android/RenderThemeAndroid.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/WebCore/platform/android/RenderThemeAndroid.cpp b/WebCore/platform/android/RenderThemeAndroid.cpp
index ab93167..d20df98 100644
--- a/WebCore/platform/android/RenderThemeAndroid.cpp
+++ b/WebCore/platform/android/RenderThemeAndroid.cpp
@@ -443,7 +443,7 @@ void RenderThemeAndroid::adjustMenuListStyle(CSSStyleSelector*, RenderStyle* sty
bool RenderThemeAndroid::paintCombo(RenderObject* obj, const RenderObject::PaintInfo& info, const IntRect& rect)
{
- if (obj->style() && !obj->style()->backgroundColor().alpha())
+ if (obj->style() && !obj->style()->visitedDependentColor(CSSPropertyBackgroundColor).alpha())
return true;
return RenderSkinCombo::Draw(getCanvasFromInfo(info), obj->node(), rect.x(), rect.y(), rect.width(), rect.height());
}