[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
hyatt at apple.com
hyatt at apple.com
Mon Feb 21 00:34:41 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit 780ae888aff6583af4f071efca53d1e5d8dc2164
Author: hyatt at apple.com <hyatt at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Feb 1 22:56:36 2011 +0000
Fix Qt bustage.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77317 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebKit2/UIProcess/qt/TiledDrawingAreaTileQt.cpp b/Source/WebKit2/UIProcess/qt/TiledDrawingAreaTileQt.cpp
index 0e8fcc5..11e325f 100644
--- a/Source/WebKit2/UIProcess/qt/TiledDrawingAreaTileQt.cpp
+++ b/Source/WebKit2/UIProcess/qt/TiledDrawingAreaTileQt.cpp
@@ -89,11 +89,11 @@ void TiledDrawingAreaTile::invalidate(const IntRect& dirtyRect)
void TiledDrawingAreaTile::resize(const IntSize& newSize)
{
IntRect oldRect = m_rect;
- m_rect = IntRect(m_rect.topLeft(), newSize);
- if (m_rect.right() > oldRect.right())
- invalidate(IntRect(oldRect.right(), oldRect.y(), m_rect.right() - oldRect.right(), m_rect.height()));
- if (m_rect.bottom() > oldRect.bottom())
- invalidate(IntRect(oldRect.x(), oldRect.bottom(), m_rect.width(), m_rect.bottom() - oldRect.bottom()));
+ m_rect = IntRect(m_rect.location(), newSize);
+ if (m_rect.maxX() > oldRect.maxX())
+ invalidate(IntRect(oldRect.maxX(), oldRect.y(), m_rect.maxX() - oldRect.maxX(), m_rect.height()));
+ if (m_rect.maxY() > oldRect.maxY())
+ invalidate(IntRect(oldRect.x(), oldRect.maxY(), m_rect.width(), m_rect.maxY() - oldRect.maxY()));
}
void TiledDrawingAreaTile::swapBackBufferToFront()
@@ -132,7 +132,7 @@ void TiledDrawingAreaTile::updateFromChunk(UpdateChunk* updateChunk, float)
if (m_backBuffer.isNull())
m_backBuffer = m_buffer.isNull() ? QPixmap(m_proxy->tileSize()) : m_buffer;
QPainter painter(&m_backBuffer);
- IntSize drawPoint = updateChunkRect.topLeft() - m_rect.topLeft();
+ IntSize drawPoint = updateChunkRect.location() - m_rect.location();
painter.drawImage(QPoint(drawPoint.width(), drawPoint.height()), image);
}
m_hasUpdatePending = false;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list