diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-06-20 13:01:08 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-06-20 13:01:08 +0200 |
| commit | 49233e234e5c787396cadb2cea33b31ae0cd65c1 (patch) | |
| tree | 5410cb9a8fd53168bb60d62c54b654d86f03c38d /Source/WebKit2/UIProcess/qt/QtWebIconDatabaseClient.cpp | |
| parent | b211c645d8ab690f713515dfdc84d80b11c27d2c (diff) | |
| download | qtwebkit-49233e234e5c787396cadb2cea33b31ae0cd65c1.tar.gz | |
Imported WebKit commit 3a8c29f35d00659d2ce7a0ccdfa8304f14e82327 (http://svn.webkit.org/repository/webkit/trunk@120813)
New snapshot with Windows build fixes
Diffstat (limited to 'Source/WebKit2/UIProcess/qt/QtWebIconDatabaseClient.cpp')
| -rw-r--r-- | Source/WebKit2/UIProcess/qt/QtWebIconDatabaseClient.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Source/WebKit2/UIProcess/qt/QtWebIconDatabaseClient.cpp b/Source/WebKit2/UIProcess/qt/QtWebIconDatabaseClient.cpp index 5132c7939..592bb371c 100644 --- a/Source/WebKit2/UIProcess/qt/QtWebIconDatabaseClient.cpp +++ b/Source/WebKit2/UIProcess/qt/QtWebIconDatabaseClient.cpp @@ -89,11 +89,8 @@ QImage QtWebIconDatabaseClient::iconImageForPageURL(const WTF::String& pageURL, MutexLocker locker(m_imageLock); WebCore::IntSize size(iconSize.width(), iconSize.height()); - RefPtr<WebCore::Image> image = m_iconDatabase->imageForPageURL(pageURL, size); - if (!image) - return QImage(); - QPixmap* nativeImage = image->nativeImageForCurrentFrame(); + QPixmap* nativeImage = m_iconDatabase->nativeImageForPageURL(pageURL, size); if (!nativeImage) return QImage(); |