[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:11:07 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit fadc8ee1a6847ae039082550029cbb1a2a44b355
Author: hyatt at apple.com <hyatt at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Aug 16 21:37:07 2010 +0000

    Fix Qt build bustage.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65456 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/platform/graphics/qt/ImageBufferQt.cpp b/WebCore/platform/graphics/qt/ImageBufferQt.cpp
index 85ad50f..1a0adcc 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_image = StillImage::createForRendering(&m_data.m_pixmap);
+    m_image = StillImage::createForRendering(&m_pixmap);
 }
 
 ImageBuffer::ImageBuffer(const IntSize& size, ImageColorSpace, bool& success)
@@ -144,7 +144,7 @@ void ImageBuffer::clip(GraphicsContext* context, const FloatRect& floatRect) con
     if (alphaMask.width() != rect.width() || alphaMask.height() != rect.height())
         alphaMask = alphaMask.scaled(rect.width(), rect.height());
 
-    m_data->layers.push(new TransparencyLayer(m_data->p(), m_data->p()->transform().mapRect(rect), 1.0, alphaMask));
+    m_data.layers.push(new TransparencyLayer(m_data.p(), m_data.p()->transform().mapRect(rect), 1.0, alphaMask));
 }
 
 void ImageBuffer::platformTransformColorSpace(const Vector<int>& lookUpTable)

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list