summaryrefslogtreecommitdiffstats
path: root/WebKit/android/nav
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 /WebKit/android/nav
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 'WebKit/android/nav')
-rw-r--r--WebKit/android/nav/CacheBuilder.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/WebKit/android/nav/CacheBuilder.cpp b/WebKit/android/nav/CacheBuilder.cpp
index c343fa0..9f9a5f1 100644
--- a/WebKit/android/nav/CacheBuilder.cpp
+++ b/WebKit/android/nav/CacheBuilder.cpp
@@ -1055,7 +1055,7 @@ void CacheBuilder::BuildFrame(Frame* root, Frame* frame,
RenderStyle* style = nodeRenderer->style();
if (style->visibility() == HIDDEN)
continue;
- isTransparent = style->hasBackground() == false;
+ isTransparent = nodeRenderer->hasBackground() == false;
#ifdef ANDROID_CSS_TAP_HIGHLIGHT_COLOR
hasCursorRing = style->tapHighlightColor().alpha() > 0;
#endif