diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-07-23 10:59:10 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-08-10 08:36:08 +0200 |
| commit | c4d794898394d7d0f79001a04c8cff50dbc4fba7 (patch) | |
| tree | 9572e6aa9b20be496286c5c95bc51335576fb86c /src/core/web_contents_adapter.cpp | |
| parent | b405ed26336a44ad4f359cdb4e1909e31c113cd4 (diff) | |
Remove QWebEngineCallback
Was no longer used in exposed APIs
Pick-to: 6.2
Fixes: QTBUG-74588
Change-Id: Iaf4943983655fc79e67df28f5cd4c4961b360579
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'src/core/web_contents_adapter.cpp')
| -rw-r--r-- | src/core/web_contents_adapter.cpp | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp index 733283cc7..0a83b248f 100644 --- a/src/core/web_contents_adapter.cpp +++ b/src/core/web_contents_adapter.cpp @@ -438,15 +438,15 @@ QSharedPointer<WebContentsAdapter> WebContentsAdapter::createFromSerializedNavig return QSharedPointer<WebContentsAdapter>::create(std::move(newWebContents)); } -WebContentsAdapter::WebContentsAdapter() +WebContentsAdapter::WebContentsAdapter(std::unique_ptr<content::WebContents> webContents) : m_profileAdapter(nullptr) - , m_webContents(nullptr) + , m_webContents(std::move(webContents)) #if QT_CONFIG(webengine_webchannel) , m_webChannel(nullptr) , m_webChannelWorld(0) #endif , m_adapterClient(nullptr) - , m_nextRequestId(CallbackDirectory::ReservedCallbackIdsEnd) + , m_nextRequestId(1) , m_currentDropAction(blink::kDragOperationNone) , m_devToolsFrontend(nullptr) { @@ -454,20 +454,9 @@ WebContentsAdapter::WebContentsAdapter() WebEngineContext::current(); } -WebContentsAdapter::WebContentsAdapter(std::unique_ptr<content::WebContents> webContents) - : m_profileAdapter(nullptr) - , m_webContents(std::move(webContents)) -#if QT_CONFIG(webengine_webchannel) - , m_webChannel(nullptr) - , m_webChannelWorld(0) -#endif - , m_adapterClient(nullptr) - , m_nextRequestId(CallbackDirectory::ReservedCallbackIdsEnd) - , m_currentDropAction(blink::kDragOperationNone) - , m_devToolsFrontend(nullptr) +WebContentsAdapter::WebContentsAdapter() + : WebContentsAdapter(nullptr) { - // This has to be the first thing we create, and the last we destroy. - WebEngineContext::current(); } WebContentsAdapter::~WebContentsAdapter() |