Adaptations for Chromium 85

Change-Id: I33c1af7c431055d95e0fb540246765cce684de15
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>

3 files changed, 6 insertions, 11 deletions

diff --git a/src/core/renderer/content_settings_observer_qt.cpp b/src/core/renderer/content_settings_observer_qt.cpp
index df9b77037..738d5bb87 100644
--- a/src/core/renderer/content_settings_observer_qt.cpp
+++ b/src/core/renderer/content_settings_observer_qt.cpp
@@ -89,14 +89,13 @@ bool ContentSettingsObserverQt::OnMessageReceived(const IPC::Message &message)
     return handled;
 }
 
-void ContentSettingsObserverQt::DidCommitProvisionalLoad(bool is_same_document_navigation, ui::PageTransition /*transition*/)
+void ContentSettingsObserverQt::DidCommitProvisionalLoad(ui::PageTransition /*transition*/)
 {
     blink::WebLocalFrame *frame = render_frame()->GetWebFrame();
     if (frame->Parent())
         return; // Not a top-level navigation.
 
-    if (!is_same_document_navigation)
-        ClearBlockedContentSettings();
+    ClearBlockedContentSettings();
 
     GURL url = frame->GetDocument().Url();
     // If we start failing this DCHECK, please makes sure we don't regress
diff --git a/src/core/renderer/content_settings_observer_qt.h b/src/core/renderer/content_settings_observer_qt.h
index 0c69d289c..a043f9e49 100644
--- a/src/core/renderer/content_settings_observer_qt.h
+++ b/src/core/renderer/content_settings_observer_qt.h
@@ -75,7 +75,7 @@ public:
 private:
     // RenderFrameObserver implementation:
     bool OnMessageReceived(const IPC::Message &message) override;
-    void DidCommitProvisionalLoad(bool is_same_document_navigation, ui::PageTransition transition) override;
+    void DidCommitProvisionalLoad(ui::PageTransition transition) override;
     void OnDestruct() override;
 
     // Message handlers.
diff --git a/src/core/renderer/user_resource_controller.cpp b/src/core/renderer/user_resource_controller.cpp
index cfda69acc..0c807d07a 100644
--- a/src/core/renderer/user_resource_controller.cpp
+++ b/src/core/renderer/user_resource_controller.cpp
@@ -150,7 +150,7 @@ public:
 
 private:
     // RenderFrameObserver implementation.
-    void DidCommitProvisionalLoad(bool is_same_document_navigation, ui::PageTransition transition) override;
+    void DidCommitProvisionalLoad(ui::PageTransition transition) override;
     void DidFinishDocumentLoad() override;
     void DidFinishLoad() override;
     void FrameDetached() override;
@@ -198,7 +198,7 @@ void UserResourceController::runScripts(QtWebEngineCore::UserScriptData::Injecti
         return;
     const bool isMainFrame = renderFrame->IsMainFrame();
 
-    QList<uint64_t> scriptsToRun = m_frameUserScriptMap.value(0).toList();
+    QList<uint64_t> scriptsToRun = m_frameUserScriptMap.value(globalScriptsIndex).toList();
     scriptsToRun.append(m_frameUserScriptMap.value(renderFrame).toList());
 
     for (uint64_t id : qAsConst(scriptsToRun)) {
@@ -239,12 +239,8 @@ void UserResourceController::RenderFrameObserverHelper::BindReceiver(
     m_binding.Bind(std::move(receiver));
 }
 
-void UserResourceController::RenderFrameObserverHelper::DidCommitProvisionalLoad(bool is_same_document_navigation,
-                                                                                 ui::PageTransition /*transitionbool*/)
+void UserResourceController::RenderFrameObserverHelper::DidCommitProvisionalLoad(ui::PageTransition /*transition*/)
 {
-    if (is_same_document_navigation)
-        return;
-
     // We are almost ready to run scripts. We still have to wait until the host
     // process has been notified of the DidCommitProvisionalLoad event to ensure
     // that the WebChannelTransportHost is ready to receive messages.