From 4bd713d56aa9bb86bc96ea9cb0c64cbf94bf43d4 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Mon, 24 Apr 2017 22:40:03 +0300 Subject: Import WebKit commit 3040e0455efecd271f1aeef53cf287e75486a70d Change-Id: I7df106cef8ce93ce33e49ad6fb0d202cd066d87c Reviewed-by: Konstantin Tokarev --- Source/WebKit2/UIProcess/qt/QtWebIconDatabaseClient.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 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 f28fb4163..b641ab7f1 100644 --- a/Source/WebKit2/UIProcess/qt/QtWebIconDatabaseClient.cpp +++ b/Source/WebKit2/UIProcess/qt/QtWebIconDatabaseClient.cpp @@ -46,12 +46,12 @@ QtWebIconDatabaseClient::QtWebIconDatabaseClient(WKContextRef context) { m_iconDatabase = WKContextGetIconDatabase(context); - WKIconDatabaseClient iconDatabaseClient; - memset(&iconDatabaseClient, 0, sizeof(WKIconDatabaseClient)); - iconDatabaseClient.version = kWKIconDatabaseClientCurrentVersion; - iconDatabaseClient.clientInfo = this; + WKIconDatabaseClientV0 iconDatabaseClient; + memset(&iconDatabaseClient, 0, sizeof(WKIconDatabaseClientV0)); + iconDatabaseClient.base.version = 0; + iconDatabaseClient.base.clientInfo = this; iconDatabaseClient.didChangeIconForPageURL = didChangeIconForPageURL; - WKIconDatabaseSetIconDatabaseClient(m_iconDatabase, &iconDatabaseClient); + WKIconDatabaseSetIconDatabaseClient(m_iconDatabase, &iconDatabaseClient.base); // Triggers the startup of the icon database. WKRetainPtr path = adoptWK(WKStringCreateWithQString(QtWebContext::preparedStoragePath(QtWebContext::IconDatabaseStorage))); WKContextSetIconDatabasePath(context, path.get()); -- cgit v1.2.1