summaryrefslogtreecommitdiffstats
path: root/Source/WebKit
diff options
context:
space:
mode:
authorNicolas Roard <nicolasroard@google.com>2012-05-09 10:12:22 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-05-09 10:12:22 -0700
commit4af8d3e6a11bf251020a9733fc0eaff7a37daa97 (patch)
treebca2d95bb8c55bf95ae96fdd3f80cf71e5216cad /Source/WebKit
parent4433109f6c1990e7d5cec3ffdbe8904df8e5aa29 (diff)
parent576098317db607e1d3b32a0e53d2551ea0e7ef21 (diff)
downloadexternal_webkit-4af8d3e6a11bf251020a9733fc0eaff7a37daa97.zip
external_webkit-4af8d3e6a11bf251020a9733fc0eaff7a37daa97.tar.gz
external_webkit-4af8d3e6a11bf251020a9733fc0eaff7a37daa97.tar.bz2
am 57609831: Complete implementation fixed background - extract image for body background (a lot more memory-friendly) - implement tiling / repeat - handles background color
* commit '576098317db607e1d3b32a0e53d2551ea0e7ef21': Complete implementation fixed background - extract image for body background (a lot more memory-friendly) - implement tiling / repeat - handles background color
Diffstat (limited to 'Source/WebKit')
-rw-r--r--Source/WebKit/android/jni/WebViewCore.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/Source/WebKit/android/jni/WebViewCore.cpp b/Source/WebKit/android/jni/WebViewCore.cpp
index 5c7012f..e621644 100644
--- a/Source/WebKit/android/jni/WebViewCore.cpp
+++ b/Source/WebKit/android/jni/WebViewCore.cpp
@@ -857,8 +857,12 @@ BaseLayerAndroid* WebViewCore::createBaseLayer()
if (bodyHasFixedBackgroundImage) {
base = new ForegroundBaseLayerAndroid(0);
base->setSize(content->width(), content->height());
- FixedBackgroundBaseLayerAndroid* baseBackground =
- new FixedBackgroundBaseLayerAndroid(content);
+
+ Document* document = m_mainFrame->document();
+ RefPtr<RenderStyle> style = document->styleForElementIgnoringPendingStylesheets(document->body());
+
+ FixedBackgroundImageLayerAndroid* baseBackground =
+ new FixedBackgroundImageLayerAndroid(style, content->width(), content->height());
realBase = new BaseLayerAndroid(0);
realBase->setSize(content->width(), content->height());