diff options
author | Chris Craik <ccraik@google.com> | 2012-06-19 18:07:29 -0700 |
---|---|---|
committer | Chris Craik <ccraik@google.com> | 2012-06-19 18:20:19 -0700 |
commit | ec90800d68fd500bb07f052c81fda0f54a794b1f (patch) | |
tree | 842f4f66af2b6f653db51713e5ef63670b72a5c1 /Source/WebCore/platform/graphics/android/rendering/RasterRenderer.cpp | |
parent | cfad1b4c7cfa8eb502d1263c81f43e37e28ee928 (diff) | |
download | external_webkit-ec90800d68fd500bb07f052c81fda0f54a794b1f.zip external_webkit-ec90800d68fd500bb07f052c81fda0f54a794b1f.tar.gz external_webkit-ec90800d68fd500bb07f052c81fda0f54a794b1f.tar.bz2 |
Pin renderers to threads instead of tiles
Move thread local bitmaps to renderers, so the renderers own them, and can
perform optimizations.
Change-Id: I60d604759f4ce2ec9981990d1613eaf23cd1e625
Diffstat (limited to 'Source/WebCore/platform/graphics/android/rendering/RasterRenderer.cpp')
-rw-r--r-- | Source/WebCore/platform/graphics/android/rendering/RasterRenderer.cpp | 36 |
1 files changed, 24 insertions, 12 deletions
diff --git a/Source/WebCore/platform/graphics/android/rendering/RasterRenderer.cpp b/Source/WebCore/platform/graphics/android/rendering/RasterRenderer.cpp index 8ad1fc8..a67a890 100644 --- a/Source/WebCore/platform/graphics/android/rendering/RasterRenderer.cpp +++ b/Source/WebCore/platform/graphics/android/rendering/RasterRenderer.cpp @@ -42,8 +42,14 @@ namespace WebCore { -RasterRenderer::RasterRenderer() : BaseRenderer(BaseRenderer::Raster) +RasterRenderer::RasterRenderer() + : BaseRenderer(BaseRenderer::Raster) + , m_bitmapIsPureColor(false) { + m_bitmap.setConfig(SkBitmap::kARGB_8888_Config, + TilesManager::instance()->tileWidth(), + TilesManager::instance()->tileHeight()); + m_bitmap.allocPixels(); #ifdef DEBUG_COUNT ClassTracker::instance()->increment("RasterRenderer"); #endif @@ -60,10 +66,12 @@ void RasterRenderer::setupCanvas(const TileRenderInfo& renderInfo, SkCanvas* can { TRACE_METHOD(); - SkBitmap* bitmap = TilesManager::instance()->threadLocalBitmap(); if (renderInfo.baseTile->isLayerTile()) { - bitmap->setIsOpaque(false); - bitmap->eraseARGB(0, 0, 0, 0); + m_bitmap.setIsOpaque(false); + + // clear bitmap if necessary + if (!m_bitmapIsPureColor || m_bitmapPureColor != Color::transparent) + m_bitmap.eraseARGB(0, 0, 0, 0); } else { Color defaultBackground = Color::white; Color* background = renderInfo.tilePainter->background(); @@ -72,12 +80,15 @@ void RasterRenderer::setupCanvas(const TileRenderInfo& renderInfo, SkCanvas* can background = &defaultBackground; } ALOGV("setupCanvas use background on Base Layer %x", background->rgb()); - bitmap->setIsOpaque(!background->hasAlpha()); - bitmap->eraseARGB(background->alpha(), background->red(), - background->green(), background->blue()); + m_bitmap.setIsOpaque(!background->hasAlpha()); + + // fill background color if necessary + if (!m_bitmapIsPureColor || m_bitmapPureColor != *background) + m_bitmap.eraseARGB(background->alpha(), background->red(), + background->green(), background->blue()); } - SkDevice* device = new SkDevice(*bitmap); + SkDevice* device = new SkDevice(m_bitmap); canvas->setDevice(device); @@ -86,14 +97,15 @@ void RasterRenderer::setupCanvas(const TileRenderInfo& renderInfo, SkCanvas* can void RasterRenderer::renderingComplete(const TileRenderInfo& renderInfo, SkCanvas* canvas) { - const SkBitmap& bitmap = canvas->getDevice()->accessBitmap(false); - GLUtils::paintTextureWithBitmap(&renderInfo, bitmap); + GLUtils::paintTextureWithBitmap(&renderInfo, m_bitmap); } void RasterRenderer::checkForPureColor(TileRenderInfo& renderInfo, SkCanvas* canvas) { - const SkBitmap& bitmap = canvas->getDevice()->accessBitmap(false); - renderInfo.isPureColor = GLUtils::isPureColorBitmap(bitmap, renderInfo.pureColor); + m_bitmapIsPureColor = GLUtils::isPureColorBitmap(m_bitmap, m_bitmapPureColor); + + renderInfo.isPureColor = m_bitmapIsPureColor; + renderInfo.pureColor = m_bitmapPureColor; } } // namespace WebCore |