summaryrefslogtreecommitdiffstats
path: root/WebCore/platform/graphics/android/BaseLayerAndroid.h
diff options
context:
space:
mode:
authorNicolas Roard <nicolas@android.com>2010-11-02 12:52:48 -0700
committerNicolas Roard <nicolas@android.com>2010-11-02 16:43:41 -0700
commitd62fe68ed1fe9531732ba8503ca8c53e48ba09ba (patch)
tree3a0061956683752698da22504f54ca600d0072a5 /WebCore/platform/graphics/android/BaseLayerAndroid.h
parent48735f195bdb1f681dba8e1d67f0b85b9b74c1a8 (diff)
downloadexternal_webkit-d62fe68ed1fe9531732ba8503ca8c53e48ba09ba.zip
external_webkit-d62fe68ed1fe9531732ba8503ca8c53e48ba09ba.tar.gz
external_webkit-d62fe68ed1fe9531732ba8503ca8c53e48ba09ba.tar.bz2
Set the page background color in BaseLayerAndroid
This allows us to show the correct background even if the tiles aren't yet painted. Change-Id: Ia3ef97770aadb5f64490e44f20110ea21578ccd0
Diffstat (limited to 'WebCore/platform/graphics/android/BaseLayerAndroid.h')
-rw-r--r--WebCore/platform/graphics/android/BaseLayerAndroid.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/WebCore/platform/graphics/android/BaseLayerAndroid.h b/WebCore/platform/graphics/android/BaseLayerAndroid.h
index 66bf119..2e0646e 100644
--- a/WebCore/platform/graphics/android/BaseLayerAndroid.h
+++ b/WebCore/platform/graphics/android/BaseLayerAndroid.h
@@ -26,6 +26,7 @@
#ifndef BaseLayerAndroid_h
#define BaseLayerAndroid_h
+#include "Color.h"
#include "GLWebViewState.h"
#include "IntRect.h"
#include "PictureSet.h"
@@ -44,6 +45,7 @@ public:
#if USE(ACCELERATED_COMPOSITING)
void setGLWebViewState(GLWebViewState* infos) { m_glWebViewState = infos; }
+ void setBackgroundColor(Color& color) { m_color = color; }
#endif
void setContent(const android::PictureSet& src);
android::PictureSet* content() { return &m_content; }
@@ -56,14 +58,13 @@ public:
bool drawGL(IntRect& rect, SkRect& viewport,
float scale, SkColor color = SK_ColorWHITE);
- SkColor getColor(const SkIRect& rect);
-
private:
#if USE(ACCELERATED_COMPOSITING)
bool drawBasePictureInGL(SkRect& viewport, float scale);
GLWebViewState* m_glWebViewState;
android::Mutex m_drawLock;
+ Color m_color;
#endif
android::PictureSet m_content;
SkRect m_previousVisible;