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/ImageLayerChromium.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/ImageLayerChromium.cpp')
| -rw-r--r-- | Source/WebCore/platform/graphics/chromium/ImageLayerChromium.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Source/WebCore/platform/graphics/chromium/ImageLayerChromium.cpp b/Source/WebCore/platform/graphics/chromium/ImageLayerChromium.cpp index d72fb1e..b0b7053 100644 --- a/Source/WebCore/platform/graphics/chromium/ImageLayerChromium.cpp +++ b/Source/WebCore/platform/graphics/chromium/ImageLayerChromium.cpp @@ -74,19 +74,19 @@ void ImageLayerChromium::paintContentsIfDirty(const IntRect&) if (!m_dirtyRect.isEmpty()) { m_decodedImage.updateFromImage(m_contents->nativeImageForCurrentFrame()); + updateLayerSize(m_decodedImage.size()); + IntRect paintRect(IntPoint(0, 0), m_decodedImage.size()); + if (!m_dirtyRect.isEmpty()) { + m_tiler->invalidateRect(paintRect); + m_dirtyRect = IntRect(); + } } } void ImageLayerChromium::updateCompositorResources() { - updateLayerSize(m_decodedImage.size()); - IntRect paintRect(IntPoint(0, 0), m_decodedImage.size()); - if (!m_dirtyRect.isEmpty()) { - m_tiler->invalidateRect(paintRect); - m_dirtyRect = IntRect(); - } - m_tiler->updateFromPixels(paintRect, m_decodedImage.pixels()); + m_tiler->updateFromPixels(paintRect, paintRect, m_decodedImage.pixels()); } IntRect ImageLayerChromium::layerBounds() const |