diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-09-30 13:59:22 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2015-10-06 07:56:49 +0000 |
| commit | 442ad85ee3f40a981fa721673dd6c7344d1daece (patch) | |
| tree | 324c86983c444ec3e38671afcb4619d6ad2261bd /src/core/browser_context_adapter.cpp | |
| parent | 295a915b5ae66ad9485b38e7d05040cf0321cd4e (diff) | |
Remove unnecessay delegation over CustomUrlSchemeHandler
With QWebEngineSchemeHandler in QtWebEngineCore, we do not need the
indirection and delegation CustomUrlSchemeHandler provided. This
means the class can be removed and we can also store the handlers
directly in BrowserContextAdapter and save a copy of the installed
handlers in the QWebEngineProfile.
Change-Id: Iabb5cc9d364c2f2a879bc77bfb2ff14b3c2ff640
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Diffstat (limited to 'src/core/browser_context_adapter.cpp')
| -rw-r--r-- | src/core/browser_context_adapter.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/core/browser_context_adapter.cpp b/src/core/browser_context_adapter.cpp index 02fa207c9..345741847 100644 --- a/src/core/browser_context_adapter.cpp +++ b/src/core/browser_context_adapter.cpp @@ -354,7 +354,7 @@ void BrowserContextAdapter::setHttpCacheMaxSize(int maxSize) m_browserContext->url_request_getter_->updateHttpCache(); } -QVector<CustomUrlSchemeHandler*> &BrowserContextAdapter::customUrlSchemeHandlers() +QHash<QByteArray, QWebEngineUrlSchemeHandler *> &BrowserContextAdapter::customUrlSchemeHandlers() { return m_customUrlSchemeHandlers; } @@ -365,10 +365,9 @@ void BrowserContextAdapter::updateCustomUrlSchemeHandlers() m_browserContext->url_request_getter_->updateStorageSettings(); } -void BrowserContextAdapter::removeCustomUrlSchemeHandler(CustomUrlSchemeHandler *handler) +void BrowserContextAdapter::removeCustomUrlSchemeHandler(QWebEngineUrlSchemeHandler *handler) { - m_customUrlSchemeHandlers.removeOne(handler); - Q_ASSERT(!m_customUrlSchemeHandlers.contains(handler)); + m_customUrlSchemeHandlers.remove(handler->scheme()); } UserScriptControllerHost *BrowserContextAdapter::userScriptController() |