Merge remote-tracking branch 'origin/5.12' into 5.13

 Conflicts:
    .qmake.conf
    src/3rdparty
    src/core/configure.json
    src/core/profile_io_data_qt.cpp
    tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp

Change-Id: Ie8ae4aa03881a0733ff497fff46e3f7040735650

1 files changed, 21 insertions, 0 deletions

diff --git a/src/core/web_contents_delegate_qt.h b/src/core/web_contents_delegate_qt.h
index 1629222c2..f6ba71256 100644
--- a/src/core/web_contents_delegate_qt.h
+++ b/src/core/web_contents_delegate_qt.h
@@ -40,6 +40,7 @@
 #ifndef WEB_CONTENTS_DELEGATE_QT_H
 #define WEB_CONTENTS_DELEGATE_QT_H
 
+#include "content/browser/frame_host/frame_tree_node.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "third_party/skia/include/core/SkColor.h"
@@ -70,6 +71,23 @@ class WebContentsAdapter;
 class WebContentsAdapterClient;
 class WebEngineSettings;
 
+class FrameFocusedObserver : public content::FrameTreeNode::Observer
+{
+public:
+    FrameFocusedObserver(WebContentsAdapterClient *adapterClient);
+    ~FrameFocusedObserver();
+    void addNode(content::FrameTreeNode *node);
+    void removeNode(content::FrameTreeNode *node);
+
+protected:
+    void OnFrameTreeNodeFocused(content::FrameTreeNode *node) override;
+    void OnFrameTreeNodeDestroyed(content::FrameTreeNode *node) override;
+
+private:
+    WebContentsAdapterClient *m_viewClient;
+    QVector<content::FrameTreeNode *> m_observedNodes;
+};
+
 class SavePageInfo
 {
 public:
@@ -132,7 +150,9 @@ public:
     bool TakeFocus(content::WebContents *source, bool reverse) override;
 
     // WebContentsObserver overrides
+    void RenderFrameCreated(content::RenderFrameHost *render_frame_host) override;
     void RenderFrameDeleted(content::RenderFrameHost *render_frame_host) override;
+    void RenderFrameHostChanged(content::RenderFrameHost *old_host, content::RenderFrameHost *new_host) override;
     void RenderViewHostChanged(content::RenderViewHost *old_host, content::RenderViewHost *new_host) override;
     void DidStartNavigation(content::NavigationHandle *navigation_handle) override;
     void DidFinishNavigation(content::NavigationHandle *navigation_handle) override;
@@ -175,6 +195,7 @@ private:
     QSharedPointer<FilePickerController> m_filePickerController;
     QUrl m_initialTargetUrl;
     int m_lastLoadProgress;
+    FrameFocusedObserver m_frameFocusedObserver;
 
     QUrl m_url;
     QString m_title;