diff options
Diffstat (limited to 'src/core/find_text_helper.cpp')
| -rw-r--r-- | src/core/find_text_helper.cpp | 71 |
1 files changed, 18 insertions, 53 deletions
diff --git a/src/core/find_text_helper.cpp b/src/core/find_text_helper.cpp index da9d7f352..5dc12fab7 100644 --- a/src/core/find_text_helper.cpp +++ b/src/core/find_text_helper.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2019 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtWebEngine 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 The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/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 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2021 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "find_text_helper.h" #include "qwebenginefindtextresult.h" @@ -64,17 +28,18 @@ FindTextHelper::~FindTextHelper() stopFinding(); } -void FindTextHelper::startFinding(const QString &findText, bool caseSensitively, bool findBackward, const QWebEngineCallback<bool> resultCallback) +void FindTextHelper::startFinding(const QString &findText, bool caseSensitively, bool findBackward, const std::function<void(const QWebEngineFindTextResult &)> &resultCallback) { if (findText.isEmpty()) { stopFinding(); m_viewClient->findTextFinished(QWebEngineFindTextResult()); - m_widgetCallbacks.invokeEmpty(resultCallback); + if (resultCallback) + resultCallback(QWebEngineFindTextResult()); return; } startFinding(findText, caseSensitively, findBackward); - m_widgetCallbacks.registerCallback(m_currentFindRequestId, resultCallback); + m_widgetCallbacks.insert(m_currentFindRequestId, resultCallback); } void FindTextHelper::startFinding(const QString &findText, bool caseSensitively, bool findBackward, const QJSValue &resultCallback) @@ -97,30 +62,30 @@ void FindTextHelper::startFinding(const QString &findText, bool caseSensitively, void FindTextHelper::startFinding(const QString &findText, bool caseSensitively, bool findBackward) { - if (findText.isEmpty()) { - stopFinding(); - return; - } + Q_ASSERT(!findText.isEmpty()); - if (m_currentFindRequestId > m_lastCompletedFindRequestId) { + const bool findNext = !m_previousFindText.isEmpty() && findText == m_previousFindText; + if (isFindTextInProgress()) { // There are cases where the render process will overwrite a previous request // with the new search and we'll have a dangling callback, leaving the application // waiting for it forever. // Assume that any unfinished find has been unsuccessful when a new one is started // to cover that case. m_lastCompletedFindRequestId = m_currentFindRequestId; + if (!findNext) + m_webContents->StopFinding(content::STOP_FIND_ACTION_KEEP_SELECTION); m_viewClient->findTextFinished(QWebEngineFindTextResult()); - invokeResultCallback(m_currentFindRequestId, 0); + invokeResultCallback(m_currentFindRequestId, 0, 0); } blink::mojom::FindOptionsPtr options = blink::mojom::FindOptions::New(); options->forward = !findBackward; options->match_case = caseSensitively; - options->find_next = findText == m_previousFindText; + options->new_session = !findNext; m_previousFindText = findText; m_currentFindRequestId = m_findRequestIdCounter++; - m_webContents->Find(m_currentFindRequestId, toString16(findText), std::move(options)); + m_webContents->Find(m_currentFindRequestId, toString16(findText), std::move(options), /*skip_delay=*/true); } void FindTextHelper::stopFinding() @@ -148,7 +113,7 @@ void FindTextHelper::handleFindReply(content::WebContents *source, int requestId Q_ASSERT(m_currentFindRequestId == requestId); m_lastCompletedFindRequestId = requestId; m_viewClient->findTextFinished(QWebEngineFindTextResult(numberOfMatches, activeMatch)); - invokeResultCallback(requestId, numberOfMatches); + invokeResultCallback(requestId, numberOfMatches, activeMatch); } void FindTextHelper::handleLoadCommitted() @@ -157,15 +122,15 @@ void FindTextHelper::handleLoadCommitted() m_previousFindText = QString(); } -void FindTextHelper::invokeResultCallback(int requestId, int numberOfMatches) +void FindTextHelper::invokeResultCallback(int requestId, int numberOfMatches, int activeMatch) { if (m_quickCallbacks.contains(requestId)) { QJSValue resultCallback = m_quickCallbacks.take(requestId); QJSValueList args; args.append(QJSValue(numberOfMatches)); resultCallback.call(args); - } else { - m_widgetCallbacks.invoke(requestId, numberOfMatches > 0); + } else if (auto func = m_widgetCallbacks.take(requestId)) { + func(QWebEngineFindTextResult(numberOfMatches, activeMatch)); } } |