Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
- index 5443f24..2bd4661 100644
- --- a/WebKit2/ChangeLog
- +++ b/WebKit2/ChangeLog
- @@ -1,5 +1,17 @@
- 2010-11-24 Andreas Kling <kling@webkit.org>
- + Reviewed by NOBODY (OOPS!).
- +
- + [Qt][WK2] Make deep copies of tile images
- +
- + We need the tile images we get from UpdateChunk::createImage() to persist,
- + so we should take a copy() of them.
- +
- + * UIProcess/qt/TiledDrawingAreaTileQt.cpp:
- + (WebKit::TiledDrawingAreaTile::updateFromChunk):
- +
- +2010-11-24 Andreas Kling <kling@webkit.org>
- +
- Reviewed by Kenneth Rohde Christiansen.
- [Qt] Fix uninitialized variable in QGraphicsWKViewPrivate
- diff --git a/WebKit2/UIProcess/qt/TiledDrawingAreaTileQt.cpp b/WebKit2/UIProcess/qt/TiledDrawingAreaTileQt.cpp
- index f4ca678..5f95d02 100644
- --- a/WebKit2/UIProcess/qt/TiledDrawingAreaTileQt.cpp
- +++ b/WebKit2/UIProcess/qt/TiledDrawingAreaTileQt.cpp
- @@ -170,9 +170,10 @@ void TiledDrawingAreaTile::updateFromChunk(UpdateChunk* updateChunk, float)
- #ifdef TILE_DEBUG_LOG
- qDebug() << "tile updated id=" << ID() << " rect=" << QRect(updateChunkRect);
- #endif
- - if (updateChunkRect.size() == m_proxy->tileSize())
- - m_backBuffer = QPixmap::fromImage(image);
- - else {
- + if (updateChunkRect.size() == m_proxy->tileSize()) {
- + // Make a deep copy of the image since it's in shared memory.
- + m_backBuffer = QPixmap::fromImage(image.copy());
- + } else {
- if (m_backBuffer.isNull())
- m_backBuffer = m_buffer.isNull() ? QPixmap(m_proxy->tileSize()) : m_buffer;
- QPainter painter(&m_backBuffer);
Add Comment
Please, Sign In to add comment