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

Conflicts:
	src/core/api/qtbug-60565.cpp

Change-Id: Iaad05aa248fb57a69033013161e10e3acddd48f6

4 files changed, 4 insertions, 7 deletions

diff --git a/src/core/renderer/extensions/renderer_permissions_policy_delegate_qt.cpp b/src/core/renderer/extensions/renderer_permissions_policy_delegate_qt.cpp
index 39412b76c..aef4903b7 100644
--- a/src/core/renderer/extensions/renderer_permissions_policy_delegate_qt.cpp
+++ b/src/core/renderer/extensions/renderer_permissions_policy_delegate_qt.cpp
@@ -47,8 +47,7 @@
 
 namespace QtWebEngineCore {
 
-RendererPermissionsPolicyDelegateQt::RendererPermissionsPolicyDelegateQt(extensions::Dispatcher *dispatcher)
-        : m_dispatcher(dispatcher)
+RendererPermissionsPolicyDelegateQt::RendererPermissionsPolicyDelegateQt(extensions::Dispatcher *)
 {
     extensions::PermissionsData::SetPolicyDelegate(this);
 }
diff --git a/src/core/renderer/extensions/renderer_permissions_policy_delegate_qt.h b/src/core/renderer/extensions/renderer_permissions_policy_delegate_qt.h
index e2af47657..385b7a4b0 100644
--- a/src/core/renderer/extensions/renderer_permissions_policy_delegate_qt.h
+++ b/src/core/renderer/extensions/renderer_permissions_policy_delegate_qt.h
@@ -58,8 +58,6 @@ public:
     bool IsRestrictedUrl(const GURL &, std::string *) override;
 
 private:
-    extensions::Dispatcher *m_dispatcher;
-
     DISALLOW_COPY_AND_ASSIGN(RendererPermissionsPolicyDelegateQt);
 };
 
diff --git a/src/core/renderer/extensions/resource_request_policy_qt.cpp b/src/core/renderer/extensions/resource_request_policy_qt.cpp
index a64b1fef8..efe44521d 100644
--- a/src/core/renderer/extensions/resource_request_policy_qt.cpp
+++ b/src/core/renderer/extensions/resource_request_policy_qt.cpp
@@ -154,9 +154,9 @@ bool ResourceRequestPolicyQt::CanRequestResource(const GURL &resource_url,
     // hybrid hosted/packaged apps. The one exception is access to icons, since
     // some extensions want to be able to do things like create their own
     // launchers.
-    base::StringPiece resource_root_relative_path =
+    /*base::StringPiece resource_root_relative_path =
             resource_url.path_piece().empty() ? base::StringPiece()
-                                              : resource_url.path_piece().substr(1);
+                                              : resource_url.path_piece().substr(1);*/
     if (extension->is_hosted_app() /*&& !IconsInfo::GetIcons(extension).ContainsPath(resource_root_relative_path)*/) {
         LOG(ERROR) << "Denying load of " << resource_url.spec() << " from "
                    << "hosted app.";
diff --git a/src/core/renderer/render_frame_observer_qt.h b/src/core/renderer/render_frame_observer_qt.h
index 3c54761f3..fb9fd3869 100644
--- a/src/core/renderer/render_frame_observer_qt.h
+++ b/src/core/renderer/render_frame_observer_qt.h
@@ -78,7 +78,7 @@ public:
 private:
     DISALLOW_COPY_AND_ASSIGN(RenderFrameObserverQt);
 
-    void ReadyToCommitNavigation(blink::WebDocumentLoader *);
+    void ReadyToCommitNavigation(blink::WebDocumentLoader *) override;
 
     bool m_isFrameDetached;
     service_manager::BinderRegistry registry_;