diff options
author | Steve Block <steveblock@google.com> | 2011-06-10 16:52:27 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2011-06-14 01:14:02 +0100 |
commit | 54cdeeebc7adcbcd900e8b6a141a8cae27d9a631 (patch) | |
tree | 845b0d338b204a48560eca3b51b34cf92ed96840 /Source/WebCore/platform/graphics/chromium/ContentLayerChromium.cpp | |
parent | d2c5226a647dc21d0c15267e09a3d19cf3e0d593 (diff) | |
download | external_webkit-54cdeeebc7adcbcd900e8b6a141a8cae27d9a631.zip external_webkit-54cdeeebc7adcbcd900e8b6a141a8cae27d9a631.tar.gz external_webkit-54cdeeebc7adcbcd900e8b6a141a8cae27d9a631.tar.bz2 |
Merge WebKit at branches/chromium/742 r88085: Initial merge by git.
Change-Id: I0501b484b9528e31b0026e5ad64416dd6541cdde
Diffstat (limited to 'Source/WebCore/platform/graphics/chromium/ContentLayerChromium.cpp')
-rw-r--r-- | Source/WebCore/platform/graphics/chromium/ContentLayerChromium.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/Source/WebCore/platform/graphics/chromium/ContentLayerChromium.cpp b/Source/WebCore/platform/graphics/chromium/ContentLayerChromium.cpp index aff2981..98244b9 100644 --- a/Source/WebCore/platform/graphics/chromium/ContentLayerChromium.cpp +++ b/Source/WebCore/platform/graphics/chromium/ContentLayerChromium.cpp @@ -100,7 +100,11 @@ void ContentLayerChromium::paintContentsIfDirty(const IntRect& targetSurfaceRect IntRect layerRect = visibleLayerRect(targetSurfaceRect); if (layerRect.isEmpty()) return; - m_tiler->invalidateRect(enclosingIntRect(m_dirtyRect)); + + IntRect dirty = enclosingIntRect(m_dirtyRect); + dirty.intersect(layerBounds()); + m_tiler->invalidateRect(dirty); + m_tiler->update(painter, layerRect); m_dirtyRect = FloatRect(); } @@ -182,7 +186,6 @@ void ContentLayerChromium::draw(const IntRect& targetSurfaceRect) IntRect layerRect = visibleLayerRect(targetSurfaceRect); if (!layerRect.isEmpty()) m_tiler->draw(layerRect, transform, ccLayerImpl()->drawOpacity()); - m_tiler->unreserveTextures(); } void ContentLayerChromium::createTilerIfNeeded() @@ -215,11 +218,6 @@ void ContentLayerChromium::bindContentsTexture() texture->bindTexture(); } -void ContentLayerChromium::unreserveContentsTexture() -{ - m_tiler->unreserveTextures(); -} - void ContentLayerChromium::setIsMask(bool isMask) { setTilingOption(isMask ? NeverTile : AutoTile); |