Merge WebKit at r63859 : Initial merge by git.

Change-Id: Ie8096c63ec7c991c9a9cba8bdd9c3b74a3b8ed62

1 files changed, 14 insertions, 1 deletions

diff --git a/WebCore/platform/graphics/qt/ImageBufferQt.cpp b/WebCore/platform/graphics/qt/ImageBufferQt.cpp
index a546def..b4ca617 100644
--- a/WebCore/platform/graphics/qt/ImageBufferQt.cpp
+++ b/WebCore/platform/graphics/qt/ImageBufferQt.cpp
@@ -98,6 +98,14 @@ GraphicsContext* ImageBuffer::context() const
     return m_context.get();
 }
 
+Image* ImageBuffer::imageForRendering() const
+{
+    if (!m_image)
+        m_image = StillImage::createForRendering(&m_data.m_pixmap);
+
+    return m_image.get();
+}
+
 Image* ImageBuffer::image() const
 {
     if (!m_image) {
@@ -178,8 +186,13 @@ PassRefPtr<ImageData> getImageData(const IntRect& rect, const ImageBufferData& i
     unsigned destBytesPerRow = 4 * rect.width();
     unsigned char* destRows = data + desty * destBytesPerRow + destx * 4;
     for (int y = 0; y < numRows; ++y) {
+#if QT_VERSION >= 0x040700
+        const quint32* scanLine = reinterpret_cast<const quint32*>(image.constScanLine(y + originy));
+#else
+        quint32* scanLine = reinterpret_cast<quint32*>(image.scanLine(y + originy));
+#endif
         for (int x = 0; x < numColumns; x++) {
-            QRgb value = image.pixel(x + originx, y + originy);
+            QRgb value = scanLine[x + originx];
             int basex = x * 4;
 
             destRows[basex] = qRed(value);