Merge remote-tracking branch 'origin/5.15' into dev

Conflicts:
	src/3rdparty
	src/core/certificate_error_controller.cpp
	src/core/certificate_error_controller.h
	src/core/compositor/compositor.cpp
	src/core/compositor/compositor.h
	src/core/compositor/display_gl_output_surface.cpp
	src/core/content_browser_client_qt.cpp
	src/core/core_chromium.pri
	src/core/delegated_frame_host_client_qt.cpp
	src/core/ozone/gl_share_context_qt.h
	src/core/ozone/surface_factory_qt.cpp
	src/core/permission_manager_qt.cpp
	src/core/render_widget_host_view_qt.cpp
	src/core/render_widget_host_view_qt.h
	src/core/web_engine_context.cpp
	src/core/web_engine_settings.cpp
	src/core/web_event_factory.cpp
	tests/auto/widgets/qwebenginedownloadrequest/tst_qwebenginedownloadrequest.cpp

Change-Id: Ice14c3c350b139e800c7c7011b7cef1fc7010669

1 files changed, 7 insertions, 7 deletions

diff --git a/src/core/quota_permission_context_qt.cpp b/src/core/quota_permission_context_qt.cpp
index 94645b237..c7f1e856c 100644
--- a/src/core/quota_permission_context_qt.cpp
+++ b/src/core/quota_permission_context_qt.cpp
@@ -56,12 +56,12 @@ using content::WebContents;
 
 namespace QtWebEngineCore {
 
-void QuotaPermissionContextQt::RequestQuotaPermission(const StorageQuotaParams &params, int render_process_id, const PermissionCallback &callback)
+void QuotaPermissionContextQt::RequestQuotaPermission(const StorageQuotaParams &params, int render_process_id, PermissionCallback callback)
 {
     if (params.storage_type != blink::mojom::StorageType::kPersistent) {
         // For now we only support requesting quota with this interface
         // for Persistent storage type.
-        callback.Run(QUOTA_PERMISSION_RESPONSE_DISALLOW);
+        std::move(callback).Run(QUOTA_PERMISSION_RESPONSE_DISALLOW);
         return;
     }
 
@@ -69,7 +69,7 @@ void QuotaPermissionContextQt::RequestQuotaPermission(const StorageQuotaParams &
         base::PostTask(
             FROM_HERE, {content::BrowserThread::UI},
             base::BindOnce(&QuotaPermissionContextQt::RequestQuotaPermission, this,
-                           params, render_process_id, callback));
+                           params, render_process_id, std::move(callback)));
         return;
     }
 
@@ -86,11 +86,11 @@ void QuotaPermissionContextQt::RequestQuotaPermission(const StorageQuotaParams &
         return;
 
     QWebEngineQuotaRequest request(
-        QSharedPointer<QuotaRequestControllerImpl>::create(this, params, callback));
+        QSharedPointer<QuotaRequestControllerImpl>::create(this, params, std::move(callback)));
     client->runQuotaRequest(std::move(request));
 }
 
-void QuotaPermissionContextQt::dispatchCallbackOnIOThread(const PermissionCallback &callback,
+void QuotaPermissionContextQt::dispatchCallbackOnIOThread(PermissionCallback callback,
                                                           QuotaPermissionContext::QuotaPermissionResponse response)
 {
     if (callback.is_null())
@@ -100,11 +100,11 @@ void QuotaPermissionContextQt::dispatchCallbackOnIOThread(const PermissionCallba
         base::PostTask(
             FROM_HERE, {content::BrowserThread::IO},
             base::BindOnce(&QuotaPermissionContextQt::dispatchCallbackOnIOThread,
-                           this, callback, response));
+                           this, std::move(callback), response));
         return;
     }
 
-    callback.Run(response);
+    std::move(callback).Run(response);
 }
 
 } // namespace QtWebEngineCore