diff options
| author | Peter Varga <pvarga@inf.u-szeged.hu> | 2016-02-27 22:59:51 +0100 |
|---|---|---|
| committer | Peter Varga <pvarga@inf.u-szeged.hu> | 2016-03-11 06:21:36 +0000 |
| commit | f658dcb0893e7869cc0c029bfe0be82838af4bb8 (patch) | |
| tree | cbb120c511ffb5ac2591cbd6d463e5e73083a847 /src/core/favicon_manager_p.h | |
| parent | a35cf1f491b69e3aba4f9cd95dd37eff8c0a34b1 (diff) | |
Clean up FaviconManager and fix icon url in NavigationEntry
Change-Id: I56a109c9071ef581c6a51b5b7b8ce5a2464c6a76
Task-number: QTBUG-51179
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Diffstat (limited to 'src/core/favicon_manager_p.h')
| -rw-r--r-- | src/core/favicon_manager_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/favicon_manager_p.h b/src/core/favicon_manager_p.h index 8358245a2..80a012474 100644 --- a/src/core/favicon_manager_p.h +++ b/src/core/favicon_manager_p.h @@ -82,19 +82,19 @@ public: FaviconManagerPrivate(content::WebContents *, WebContentsAdapterClient *); ~FaviconManagerPrivate(); - int downloadIcon(const QUrl &, bool); + int downloadIcon(const QUrl &); void iconDownloadFinished(int, int, const GURL &, const std::vector<SkBitmap> &, const std::vector<gfx::Size> &); void storeIcon(int, const QIcon &); void downloadPendingRequests(); + void propagateIcon() const; content::WebContents *m_webContents; WebContentsAdapterClient *m_viewClient; base::WeakPtrFactory<FaviconManagerPrivate> m_weakFactory; QMap<QUrl, QIcon> m_icons; - QMap<int, QUrl> m_inProgressCandidateRequests; - QMap<int, QUrl> m_inProgressCustomRequests; + QMap<int, QUrl> m_inProgressRequests; QMap<int, QUrl> m_pendingRequests; Q_DECLARE_PUBLIC(FaviconManager) |