Imported WebKit commit 1350e72f7345ced9da2bd9980deeeb5a8d62fab4 (http://svn.webkit.org/repository/webkit/trunk@117578)

Weekly snapshot

1 files changed, 6 insertions, 1 deletions

diff --git a/Source/WebKit2/UIProcess/WebIconDatabase.cpp b/Source/WebKit2/UIProcess/WebIconDatabase.cpp
index 8016cfbd6..10804f702 100644
--- a/Source/WebKit2/UIProcess/WebIconDatabase.cpp
+++ b/Source/WebKit2/UIProcess/WebIconDatabase.cpp
@@ -62,7 +62,7 @@ void WebIconDatabase::invalidate()
 
 void WebIconDatabase::setDatabasePath(const String& path)
 {
-    if (m_iconDatabaseImpl && m_iconDatabaseImpl->isOpen()) {
+    if (isOpen()) {
         LOG_ERROR("Icon database already has a path and is already open. We don't currently support changing its path and reopening.");
         return;
     }
@@ -190,6 +190,11 @@ Image* WebIconDatabase::imageForPageURL(const String& pageURL, const WebCore::In
     return m_iconDatabaseImpl->synchronousIconForPageURL(pageURL, iconSize);
 }
 
+bool WebIconDatabase::isOpen()
+{
+    return m_iconDatabaseImpl && m_iconDatabaseImpl->isOpen();
+}
+
 void WebIconDatabase::removeAllIcons()
 {
     m_iconDatabaseImpl->removeAllIcons();