diff options
-rw-r--r-- | src/core/web_contents_delegate_qt.cpp | 23 | ||||
-rw-r--r-- | tests/auto/quick/qmltests/data/favicon.html | 10 | ||||
-rw-r--r-- | tests/auto/quick/qmltests/data/favicon.png | bin | 0 -> 3961 bytes | |||
-rw-r--r-- | tests/auto/quick/qmltests/data/favicon2.html | 10 | ||||
-rw-r--r-- | tests/auto/quick/qmltests/data/small-favicon.png | bin | 0 -> 891 bytes | |||
-rw-r--r-- | tests/auto/quick/qmltests/data/tst_favIconLoad.qml | 103 | ||||
-rw-r--r-- | tests/auto/quick/qmltests/qmltests.pro | 5 |
7 files changed, 148 insertions, 3 deletions
diff --git a/src/core/web_contents_delegate_qt.cpp b/src/core/web_contents_delegate_qt.cpp index a803e8d4b..4ac20825a 100644 --- a/src/core/web_contents_delegate_qt.cpp +++ b/src/core/web_contents_delegate_qt.cpp @@ -46,9 +46,11 @@ #include "web_contents_adapter_client.h" #include "web_engine_context.h" +#include "content/public/browser/favicon_status.h" +#include "content/public/browser/invalidate_type.h" +#include "content/public/browser/navigation_entry.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" -#include "content/public/browser/invalidate_type.h" #include "content/public/common/favicon_url.h" #include "content/public/common/file_chooser_params.h" @@ -121,8 +123,18 @@ void WebContentsDelegateQt::DidFailLoad(int64, const GURL&, bool is_main_frame, void WebContentsDelegateQt::DidFinishLoad(int64, const GURL&, bool is_main_frame, content::RenderViewHost*) { - if (is_main_frame) + if (is_main_frame) { m_viewClient->loadFinished(true); + + content::NavigationEntry *entry = web_contents()->GetController().GetActiveEntry(); + if (!entry) + return; + content::FaviconStatus &favicon = entry->GetFavicon(); + if (favicon.valid) + m_viewClient->iconChanged(toQt(favicon.url)); + else + m_viewClient->iconChanged(QUrl()); + } } void WebContentsDelegateQt::DidUpdateFaviconURL(int32 page_id, const std::vector<content::FaviconURL>& candidates) @@ -130,7 +142,12 @@ void WebContentsDelegateQt::DidUpdateFaviconURL(int32 page_id, const std::vector Q_UNUSED(page_id) Q_FOREACH (content::FaviconURL candidate, candidates) { if (candidate.icon_type == content::FaviconURL::FAVICON && !candidate.icon_url.is_empty()) { - m_viewClient->iconChanged(toQt(candidate.icon_url)); + content::NavigationEntry *entry = web_contents()->GetController().GetActiveEntry(); + if (!entry) + continue; + content::FaviconStatus &favicon = entry->GetFavicon(); + favicon.url = candidate.icon_url; + favicon.valid = toQt(candidate.icon_url).isValid(); break; } } diff --git a/tests/auto/quick/qmltests/data/favicon.html b/tests/auto/quick/qmltests/data/favicon.html new file mode 100644 index 000000000..c9f225c52 --- /dev/null +++ b/tests/auto/quick/qmltests/data/favicon.html @@ -0,0 +1,10 @@ +<html> +<head> +</head> +<link type="image/png" href="favicon.png" sizes="48x48" rel="icon" /> +<body> +<p>It's expected that you see a favicon displayed for this page when you open it as a local file.</p> +<p>The favicon looks like this:</p> +<img src="favicon.png"/> +</body> +</html> diff --git a/tests/auto/quick/qmltests/data/favicon.png b/tests/auto/quick/qmltests/data/favicon.png Binary files differnew file mode 100644 index 000000000..35717cca5 --- /dev/null +++ b/tests/auto/quick/qmltests/data/favicon.png diff --git a/tests/auto/quick/qmltests/data/favicon2.html b/tests/auto/quick/qmltests/data/favicon2.html new file mode 100644 index 000000000..5548b867f --- /dev/null +++ b/tests/auto/quick/qmltests/data/favicon2.html @@ -0,0 +1,10 @@ +<html> +<head> +</head> +<link type="image/png" href="small-favicon.png" sizes="16x16" rel="icon" /> +<body> +<p>It's expected that you see a favicon displayed for this page when you open it as a local file.</p> +<p>The favicon looks like this:</p> +<img src="small-favicon.png"/> +</body> +</html> diff --git a/tests/auto/quick/qmltests/data/small-favicon.png b/tests/auto/quick/qmltests/data/small-favicon.png Binary files differnew file mode 100644 index 000000000..4462752a5 --- /dev/null +++ b/tests/auto/quick/qmltests/data/small-favicon.png diff --git a/tests/auto/quick/qmltests/data/tst_favIconLoad.qml b/tests/auto/quick/qmltests/data/tst_favIconLoad.qml new file mode 100644 index 000000000..cfa2535d8 --- /dev/null +++ b/tests/auto/quick/qmltests/data/tst_favIconLoad.qml @@ -0,0 +1,103 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the Qt Quick Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 +import QtTest 1.0 +import QtWebEngine 1.0 + +TestWebEngineView { + id: webEngineView + + SignalSpy { + id: spy + target: webEngineView + signalName: "iconChanged" + } + + // FIXME: This test is flaky if the loading of the icon image is asynchronous, + // because the iconChanged signal is emitted before the image has been downloaded. + // We can set this property to true after we have some kind of favicon downloading + // logic in the WebEngine. + + Image { + id: favicon + asynchronous: false + source: webEngineView.icon + } + + TestCase { + id: test + name: "WebEngineViewLoadFavIcon" + when: windowShown + + function init() { + if (webEngineView.icon != '') { + // If this is not the first test, then load a blank page without favicon, restoring the initial state. + webEngineView.url = 'about:blank' + verify(webEngineView.waitForLoadSucceeded()) + spy.wait() + } + spy.clear() + } + + function test_favIconLoad() { + compare(spy.count, 0) + var url = Qt.resolvedUrl("favicon.html") + webEngineView.url = url + verify(webEngineView.waitForLoadSucceeded()) + spy.wait() + compare(spy.count, 1) + compare(favicon.width, 48) + compare(favicon.height, 48) + } + + function test_favIconLoadEncodedUrl() { + compare(spy.count, 0) + var url = Qt.resolvedUrl("favicon2.html?favicon=load should work with#whitespace!") + webEngineView.url = url + verify(webEngineView.waitForLoadSucceeded()) + spy.wait() + compare(spy.count, 1) + compare(favicon.width, 16) + compare(favicon.height, 16) + } + } +} diff --git a/tests/auto/quick/qmltests/qmltests.pro b/tests/auto/quick/qmltests/qmltests.pro index 98d836a10..5b4fe5414 100644 --- a/tests/auto/quick/qmltests/qmltests.pro +++ b/tests/auto/quick/qmltests/qmltests.pro @@ -8,8 +8,13 @@ INCLUDEPATH += $$PWD/../shared OTHER_FILES += \ $$PWD/data/TestWebEngineView.qml \ + $$PWD/data/favicon.html \ + $$PWD/data/favicon.png \ + $$PWD/data/favicon2.html \ + $$PWD/data/small-favicon.png \ $$PWD/data/test1.html \ $$PWD/data/test3.html \ + $$PWD/data/tst_favIconLoad.qml \ $$PWD/data/tst_loadHtml.qml \ $$PWD/data/tst_loadProgress.qml \ $$PWD/data/tst_loadProgressSignal.qml \ |