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

Conflicts:
	src/core/content_browser_client_qt.cpp
	src/core/content_browser_client_qt.h

Change-Id: I3da791a82dab56fd7535ba1e4c0ab1d9ca74f547

1 files changed, 14 insertions, 1 deletions

diff --git a/src/core/renderer/content_renderer_client_qt.h b/src/core/renderer/content_renderer_client_qt.h
index 2a353caa6..8955a3797 100644
--- a/src/core/renderer/content_renderer_client_qt.h
+++ b/src/core/renderer/content_renderer_client_qt.h
@@ -96,7 +96,20 @@ public:
     blink::WebPrescientNetworking* GetPrescientNetworking() override;
     void AddSupportedKeySystems(std::vector<std::unique_ptr<media::KeySystemProperties>>* key_systems) override;
 
-    void RunScriptsAtDocumentEnd(content::RenderFrame* render_frame) override;
+    void RunScriptsAtDocumentStart(content::RenderFrame *render_frame) override;
+    void RunScriptsAtDocumentEnd(content::RenderFrame *render_frame) override;
+    void RunScriptsAtDocumentIdle(content::RenderFrame *render_frame) override;
+    bool OverrideCreatePlugin(content::RenderFrame* render_frame,
+        const blink::WebPluginParams& params, blink::WebPlugin** plugin) override;
+    content::BrowserPluginDelegate* CreateBrowserPluginDelegate(content::RenderFrame* render_frame,
+        const content::WebPluginInfo& info, const std::string& mime_type, const GURL& original_url) override;
+
+    void WillSendRequest(blink::WebLocalFrame *frame,
+                         ui::PageTransition transition_type,
+                         const blink::WebURL &url,
+                         const url::Origin *initiator_origin,
+                         GURL *new_url,
+                         bool *attach_same_site_cookies) override;
 
     void CreateRendererService(service_manager::mojom::ServiceRequest service_request) override;