From 4d6084feccab99c0a7b3ecef26bb49c41dd50201 Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@nokia.com>
Date: Wed, 18 Jul 2012 13:59:13 +0200
Subject: Imported WebKit commit ff52235a78888e5cb8e286a828a8698042200e67
 (http://svn.webkit.org/repository/webkit/trunk@122948)

New snapshot that should fix the rendering issues recently introduced
---
 Source/WebKit2/UIProcess/qt/QtWebIconDatabaseClient.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Source/WebKit2/UIProcess/qt/QtWebIconDatabaseClient.cpp')

diff --git a/Source/WebKit2/UIProcess/qt/QtWebIconDatabaseClient.cpp b/Source/WebKit2/UIProcess/qt/QtWebIconDatabaseClient.cpp
index 592bb371c..afdfa6fcd 100644
--- a/Source/WebKit2/UIProcess/qt/QtWebIconDatabaseClient.cpp
+++ b/Source/WebKit2/UIProcess/qt/QtWebIconDatabaseClient.cpp
@@ -90,11 +90,11 @@ QImage QtWebIconDatabaseClient::iconImageForPageURL(const WTF::String& pageURL,
 
     WebCore::IntSize size(iconSize.width(), iconSize.height());
 
-    QPixmap* nativeImage = m_iconDatabase->nativeImageForPageURL(pageURL, size);
+    QImage* nativeImage = m_iconDatabase->nativeImageForPageURL(pageURL, size);
     if (!nativeImage)
         return QImage();
 
-    return nativeImage->toImage();
+    return *nativeImage;
 }
 
 void QtWebIconDatabaseClient::retainIconForPageURL(const String& pageURL)
-- 
cgit v1.2.1