[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
hyatt at apple.com
hyatt at apple.com
Wed Dec 22 12:10:53 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 66849442556b523086e9ca05bffcb0f7f5251904
Author: hyatt at apple.com <hyatt at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Aug 16 21:28:06 2010 +0000
Fix Qt build bustage.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65452 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/platform/graphics/qt/ImageBufferQt.cpp b/WebCore/platform/graphics/qt/ImageBufferQt.cpp
index ed8f07c..85ad50f 100644
--- a/WebCore/platform/graphics/qt/ImageBufferQt.cpp
+++ b/WebCore/platform/graphics/qt/ImageBufferQt.cpp
@@ -76,7 +76,7 @@ ImageBufferData::ImageBufferData(const IntSize& size)
painter->setBrush(brush);
painter->setCompositionMode(QPainter::CompositionMode_SourceOver);
- m_data.m_image = StillImage::createForRendering(&m_data.m_pixmap);
+ m_image = StillImage::createForRendering(&m_data.m_pixmap);
}
ImageBuffer::ImageBuffer(const IntSize& size, ImageColorSpace, bool& success)
@@ -133,7 +133,7 @@ void ImageBuffer::drawPattern(GraphicsContext* destContext, const FloatRect& src
m_data.m_image->drawPattern(destContext, srcRect, patternTransform, phase, styleColorSpace, op, destRect);
}
-void ImageBuffer::clip(GraphicsContext* context, const FloatRect& floatRect)
+void ImageBuffer::clip(GraphicsContext* context, const FloatRect& floatRect) const
{
QPixmap* nativeImage = m_data.m_image->nativeImageForCurrentFrame();
if (!nativeImage)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list