diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2013-09-13 12:51:20 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-19 20:50:05 +0200 |
| commit | d441d6f39bb846989d95bcf5caf387b42414718d (patch) | |
| tree | e367e64a75991c554930278175d403c072de6bb8 /Source/WebKit/win/WebIconDatabase.cpp | |
| parent | 0060b2994c07842f4c59de64b5e3e430525c4b90 (diff) | |
| download | qtwebkit-d441d6f39bb846989d95bcf5caf387b42414718d.tar.gz | |
Import Qt5x2 branch of QtWebkit for Qt 5.2
Importing a new snapshot of webkit.
Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Diffstat (limited to 'Source/WebKit/win/WebIconDatabase.cpp')
| -rw-r--r-- | Source/WebKit/win/WebIconDatabase.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebKit/win/WebIconDatabase.cpp b/Source/WebKit/win/WebIconDatabase.cpp index 05a94908a..316a3588e 100644 --- a/Source/WebKit/win/WebIconDatabase.cpp +++ b/Source/WebKit/win/WebIconDatabase.cpp @@ -307,7 +307,7 @@ HBITMAP WebIconDatabase::getOrCreateDefaultIconBitmap(LPSIZE size) result = createDIB(size); m_defaultIconMap.set(*size, result); - if (!iconDatabase().defaultIcon(*size)->getHBITMAPOfSize(result, size)) { + if (!iconDatabase().defaultIcon(*size) || !iconDatabase().defaultIcon(*size)->getHBITMAPOfSize(result, size)) { LOG_ERROR("Failed to draw Image to HBITMAP"); return 0; } @@ -384,7 +384,7 @@ static void postDidRemoveAllIconsNotification(WebIconDatabase* iconDB) static void postDidAddIconNotification(const String& pageURL, WebIconDatabase* iconDB) { - RetainPtr<CFMutableDictionaryRef> dictionary(AdoptCF, + RetainPtr<CFMutableDictionaryRef> dictionary = adoptCF( CFDictionaryCreateMutable(0, 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks)); CFDictionaryAddValue(dictionary.get(), WebIconDatabase::iconDatabaseNotificationUserInfoURLKey(), pageURL.createCFString().get()); |