Imported WebKit commit cf4f8fc6f19b0629f51860cb2d4b25e139d07e00 (http://svn.webkit.org/repository/webkit/trunk@131592)

New snapshot that includes the build fixes for Mac OS X 10.6 and earlier as well
as the previously cherry-picked changes

1 files changed, 9 insertions, 4 deletions

diff --git a/Source/WebKit2/Shared/qt/ShareableBitmapQt.cpp b/Source/WebKit2/Shared/qt/ShareableBitmapQt.cpp
index 88e4d3aec..874e1c381 100644
--- a/Source/WebKit2/Shared/qt/ShareableBitmapQt.cpp
+++ b/Source/WebKit2/Shared/qt/ShareableBitmapQt.cpp
@@ -53,8 +53,8 @@ void ShareableBitmap::releaseSharedMemoryData(void* typelessBitmap)
 
 PassRefPtr<Image> ShareableBitmap::createImage()
 {
-    QImage* image = new QImage(createQImage());
-    return BitmapImage::create(image);
+    QPixmap* pixmap = new QPixmap(QPixmap::fromImage(createQImage()));
+    return BitmapImage::create(pixmap);
 }
 
 PassOwnPtr<GraphicsContext> ShareableBitmap::createGraphicsContext()
@@ -82,8 +82,13 @@ void ShareableBitmap::paint(GraphicsContext& context, float scaleFactor, const I
         return;
     }
 
-    // See <https://bugs.webkit.org/show_bug.cgi?id=64663>.
-    notImplemented();
+    QImage image = createQImage();
+    QPainter* painter = context.platformContext();
+
+    painter->save();
+    painter->scale(scaleFactor, scaleFactor);
+    painter->drawImage(dstPoint, image, QRect(srcRect));
+    painter->restore();
 }
 
 }