diff options
| author | Chris Craik <ccraik@google.com> | 2012-07-27 15:50:49 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-07-27 15:50:49 -0700 |
| commit | c8d258504a2f5fbe37c63927fcdc744b901f2579 (patch) | |
| tree | ded12a757d73fa2258f5372a128abb16f1ead671 | |
| parent | 8f7bdaae7030fbbfd3c3cde0a8b0e8d489d0b14f (diff) | |
| parent | b7c99a422b6cb00661fd3e81cb0608d4b3034124 (diff) | |
| download | external_webkit-c8d258504a2f5fbe37c63927fcdc744b901f2579.zip external_webkit-c8d258504a2f5fbe37c63927fcdc744b901f2579.tar.gz external_webkit-c8d258504a2f5fbe37c63927fcdc744b901f2579.tar.bz2 | |
am b7c99a42: Fix background tiles drawing
* commit 'b7c99a422b6cb00661fd3e81cb0608d4b3034124':
Fix background tiles drawing
| -rw-r--r-- | Source/WebCore/platform/graphics/android/rendering/BaseRenderer.cpp | 4 | ||||
| -rw-r--r-- | Source/WebCore/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) { } |