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

 Conflicts:
	.qmake.conf
	src/webengine/api/qquickwebengineview_p_p.h
	src/webenginewidgets/api/qwebenginepage_p.h
	tests/auto/quick/qmltests/data/TestWebEngineView.qml

Change-Id: Id2acc92e8d0364bdaaf5a63ea2d2cb9cd533ade3

1 files changed, 17 insertions, 8 deletions

diff --git a/src/core/renderer/user_resource_controller.cpp b/src/core/renderer/user_resource_controller.cpp
index b4375dfdb..f85879053 100644
--- a/src/core/renderer/user_resource_controller.cpp
+++ b/src/core/renderer/user_resource_controller.cpp
@@ -148,9 +148,14 @@ void UserResourceController::RenderFrameObserverHelper::runScripts(UserScriptDat
 void UserResourceController::runScripts(UserScriptData::InjectionPoint p, blink::WebLocalFrame *frame)
 {
     content::RenderFrame *renderFrame = content::RenderFrame::FromWebFrame(frame);
-    content::RenderView *renderView = renderFrame->GetRenderView();
+    if (!renderFrame)
+        return;
     const bool isMainFrame = renderFrame->IsMainFrame();
 
+    content::RenderView *renderView = renderFrame->GetRenderView();
+    if (!renderView)
+        return;
+
     QList<uint64_t> scriptsToRun = m_viewUserScriptMap.value(0).toList();
     scriptsToRun.append(m_viewUserScriptMap.value(renderView).toList());
 
@@ -233,7 +238,8 @@ void UserResourceController::RenderFrameObserverHelper::OnDestruct()
 void UserResourceController::RenderViewObserverHelper::OnDestruct()
 {
     // Remove all scripts associated with the render view.
-    UserResourceController::instance()->renderViewDestroyed(render_view());
+    if (content::RenderView *view = render_view())
+        UserResourceController::instance()->renderViewDestroyed(view);
     delete this;
 }
 
@@ -251,20 +257,23 @@ bool UserResourceController::RenderFrameObserverHelper::OnMessageReceived(const
 
 void UserResourceController::RenderFrameObserverHelper::onUserScriptAdded(const UserScriptData &script)
 {
-    content::RenderView *view = render_frame()->GetRenderView();
-    UserResourceController::instance()->addScriptForView(script, view);
+    if (content::RenderFrame *frame = render_frame())
+        if (content::RenderView *view = frame->GetRenderView())
+            UserResourceController::instance()->addScriptForView(script, view);
 }
 
 void UserResourceController::RenderFrameObserverHelper::onUserScriptRemoved(const UserScriptData &script)
 {
-    content::RenderView *view = render_frame()->GetRenderView();
-    UserResourceController::instance()->removeScriptForView(script, view);
+    if (content::RenderFrame *frame = render_frame())
+        if (content::RenderView *view = frame->GetRenderView())
+            UserResourceController::instance()->removeScriptForView(script, view);
 }
 
 void UserResourceController::RenderFrameObserverHelper::onScriptsCleared()
 {
-    content::RenderView *view = render_frame()->GetRenderView();
-    UserResourceController::instance()->clearScriptsForView(view);
+    if (content::RenderFrame *frame = render_frame())
+        if (content::RenderView *view = frame->GetRenderView())
+            UserResourceController::instance()->clearScriptsForView(view);
 }
 
 UserResourceController *UserResourceController::instance()