From b7c99a422b6cb00661fd3e81cb0608d4b3034124 Mon Sep 17 00:00:00 2001 From: Chris Craik Date: Thu, 26 Jul 2012 16:18:42 -0700 Subject: Fix background tiles drawing Bug:6875992 Initialize the InstrumentedPlatformCanvas with the correct background color so that if no painting is done, the background color is returned as the pure color. Change-Id: Ibe928a4e158f0a4302e0996eca88c3e8b1f1b666 --- Source/WebCore/platform/graphics/android/rendering/BaseRenderer.cpp | 4 +++- .../platform/graphics/android/rendering/InstrumentedPlatformCanvas.h | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Source/WebCore/platform/graphics/android/rendering/BaseRenderer.cpp b/Source/WebCore/platform/graphics/android/rendering/BaseRenderer.cpp index 65e28f9..0ab72b7 100644 --- a/Source/WebCore/platform/graphics/android/rendering/BaseRenderer.cpp +++ b/Source/WebCore/platform/graphics/android/rendering/BaseRenderer.cpp @@ -95,8 +95,10 @@ void BaseRenderer::renderTiledContent(TileRenderInfo& renderInfo) const bool visualIndicator = TilesManager::instance()->getShowVisualIndicator(); const SkSize& tileSize = renderInfo.tileSize; + Color *background = renderInfo.tilePainter->background(); InstrumentedPlatformCanvas canvas(TilesManager::instance()->tileWidth(), - TilesManager::instance()->tileHeight()); + TilesManager::instance()->tileHeight(), + background ? *background : Color::transparent); setupCanvas(renderInfo, &canvas); if (!canvas.getDevice()) { diff --git a/Source/WebCore/platform/graphics/android/rendering/InstrumentedPlatformCanvas.h b/Source/WebCore/platform/graphics/android/rendering/InstrumentedPlatformCanvas.h index faa5bcd..508795a 100644 --- a/Source/WebCore/platform/graphics/android/rendering/InstrumentedPlatformCanvas.h +++ b/Source/WebCore/platform/graphics/android/rendering/InstrumentedPlatformCanvas.h @@ -36,10 +36,10 @@ namespace WebCore { class InstrumentedPlatformCanvas : public SkCanvas { public: - InstrumentedPlatformCanvas(int width, int height) + InstrumentedPlatformCanvas(int width, int height, Color initialColor) : m_size(width, height) , m_isSolidColor(true) - , m_solidColor(0, 0, 0, 0) + , m_solidColor(initialColor) { } -- cgit v1.1