From 49233e234e5c787396cadb2cea33b31ae0cd65c1 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 20 Jun 2012 13:01:08 +0200 Subject: Imported WebKit commit 3a8c29f35d00659d2ce7a0ccdfa8304f14e82327 (http://svn.webkit.org/repository/webkit/trunk@120813) New snapshot with Windows build fixes --- Source/WebKit2/UIProcess/WebIconDatabase.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'Source/WebKit2/UIProcess/WebIconDatabase.cpp') diff --git a/Source/WebKit2/UIProcess/WebIconDatabase.cpp b/Source/WebKit2/UIProcess/WebIconDatabase.cpp index 10804f702..c0c70617b 100644 --- a/Source/WebKit2/UIProcess/WebIconDatabase.cpp +++ b/Source/WebKit2/UIProcess/WebIconDatabase.cpp @@ -190,6 +190,14 @@ Image* WebIconDatabase::imageForPageURL(const String& pageURL, const WebCore::In return m_iconDatabaseImpl->synchronousIconForPageURL(pageURL, iconSize); } +WebCore::NativeImagePtr WebIconDatabase::nativeImageForPageURL(const String& pageURL, const WebCore::IntSize& iconSize) +{ + if (!m_webContext || !m_iconDatabaseImpl || !m_iconDatabaseImpl->isOpen() || pageURL.isEmpty()) + return 0; + + return m_iconDatabaseImpl->synchronousNativeIconForPageURL(pageURL, iconSize); +} + bool WebIconDatabase::isOpen() { return m_iconDatabaseImpl && m_iconDatabaseImpl->isOpen(); -- cgit v1.2.1