Merge branch '5.12' into 5.13

Conflicts:
	src/3rdparty
	src/core/renderer/user_resource_controller.cpp
	src/core/web_contents_adapter.cpp
	src/webengine/doc/src/qtwebengine-overview.qdoc

Change-Id: I46be9d33b3b65d61dfa099ee72a3509afb9bd6a4

6 files changed, 18 insertions, 16 deletions

diff --git a/src/core/api/qwebengineurlrequestinfo.cpp b/src/core/api/qwebengineurlrequestinfo.cpp
index dc2d07740..16b282e74 100644
--- a/src/core/api/qwebengineurlrequestinfo.cpp
+++ b/src/core/api/qwebengineurlrequestinfo.cpp
@@ -82,7 +82,7 @@ ASSERT_ENUMS_MATCH(QtWebEngineCore::WebContentsAdapterClient::OtherNavigation, Q
     The QWebEngineUrlRequestInfo is useful for setting extra header fields for requests
     or for redirecting certain requests without payload data to another URL.
     This class cannot be instantiated or copied by the user, instead it will
-    be created by Qt WebEngine and sent through the virtual function
+    be created by \QWE and sent through the virtual function
     QWebEngineUrlRequestInterceptor::interceptRequest() if an interceptor has been set.
 */
 
diff --git a/src/core/api/qwebengineurlscheme.cpp b/src/core/api/qwebengineurlscheme.cpp
index 9f7288f2d..9b04f46c5 100644
--- a/src/core/api/qwebengineurlscheme.cpp
+++ b/src/core/api/qwebengineurlscheme.cpp
@@ -88,7 +88,7 @@ public:
   URLs.
 
   Custom URL schemes must be configured early at application startup, before
-  creating any Qt WebEngine classes. In general this means the schemes need to be configured before
+  creating any \QWE classes. In general this means the schemes need to be configured before
   a QGuiApplication or QApplication instance is created.
 
   Every registered scheme configuration applies globally to all profiles.
diff --git a/src/core/doc/src/qtwebenginecore-index.qdoc b/src/core/doc/src/qtwebenginecore-index.qdoc
index 4d540e277..692e33d1d 100644
--- a/src/core/doc/src/qtwebenginecore-index.qdoc
+++ b/src/core/doc/src/qtwebenginecore-index.qdoc
@@ -29,9 +29,9 @@
     \page qtwebenginecore-index.html
     \title Qt WebEngine Core
 
-    \brief Provides common API shared by Qt WebEngine and Qt WebEngine Widgets.
+    \brief Provides common API shared by \QWE and \QWE Widgets.
 
-    Qt WebEngine Core provides API shared by \l {Qt WebEngine} and \l {Qt WebEngine Widgets}.
+    \QWE Core provides API shared by \l {Qt WebEngine} and \l {Qt WebEngine Widgets}.
 
     \section1 Getting Started
 
@@ -61,7 +61,7 @@
     This is a snapshot of the integration of Chromium into Qt.
 
     Qt Commercial Edition licensees that wish to distribute applications that
-    use the Qt WebEngine module need to be aware of their obligations under the
+    use the \QWE module need to be aware of their obligations under the
     GNU Library General Public License (LGPLv2).
 
     Developers using the Open Source Edition can choose to redistribute
diff --git a/src/core/doc/src/qtwebenginecore-module.qdoc b/src/core/doc/src/qtwebenginecore-module.qdoc
index 65e0766de..c976d024c 100644
--- a/src/core/doc/src/qtwebenginecore-module.qdoc
+++ b/src/core/doc/src/qtwebenginecore-module.qdoc
@@ -39,7 +39,7 @@
 
     \snippet qtwebenginecore_build_snippet.qdoc 1
 
-    If you use qmake to build your projects, Qt WebEngine Core is usually
+    If you use qmake to build your projects, \QWE Core is usually
     indirectly included through the \l{Qt WebEngine QML Types}{Qt WebEngine} or
     \l{Qt WebEngine Widgets C++ Classes}{Qt WebEngine Widgets} modules.
 
diff --git a/src/core/download_manager_delegate_qt.cpp b/src/core/download_manager_delegate_qt.cpp
index 724b33a7a..2af958068 100644
--- a/src/core/download_manager_delegate_qt.cpp
+++ b/src/core/download_manager_delegate_qt.cpp
@@ -175,8 +175,15 @@ bool DownloadManagerDelegateQt::DetermineDownloadTarget(download::DownloadItem*
     int uniquifier = base::GetUniquePathNumber(tmpFilePath, base::FilePath::StringType());
     if (uniquifier > 0)
         suggestedFilePath = toQt(tmpFilePath.InsertBeforeExtensionASCII(base::StringPrintf(" (%d)", uniquifier)).AsUTF8Unsafe());
-    else if (uniquifier == -1)
-        suggestedFilePath = toQt(tmpFilePath.InsertBeforeExtensionASCII(base::StringPrintf(" - %s", base::TimeToISO8601(item->GetStartTime()).c_str())).AsUTF8Unsafe());
+    else if (uniquifier == -1) {
+        base::Time::Exploded exploded;
+        item->GetStartTime().LocalExplode(&exploded);
+        std::string suffix = base::StringPrintf(
+                    " - %04d-%02d-%02dT%02d%02d%02d.%03d", exploded.year, exploded.month,
+                    exploded.day_of_month, exploded.hour, exploded.minute,
+                    exploded.second, exploded.millisecond);
+        suggestedFilePath = toQt(tmpFilePath.InsertBeforeExtensionASCII(suffix).AsUTF8Unsafe());
+    }
 
     item->AddObserver(this);
     QList<ProfileAdapterClient*> clients = m_profileAdapter->clients();
diff --git a/src/core/renderer/user_resource_controller.cpp b/src/core/renderer/user_resource_controller.cpp
index 46f5de2c2..be5e6f043 100644
--- a/src/core/renderer/user_resource_controller.cpp
+++ b/src/core/renderer/user_resource_controller.cpp
@@ -138,7 +138,6 @@ public:
 private:
     // RenderFrameObserver implementation.
     void DidCommitProvisionalLoad(bool is_same_document_navigation, ui::PageTransition transition) override;
-    void DidClearWindowObject() override;
     void DidFinishDocumentLoad() override;
     void DidFinishLoad() override;
     void FrameDetached() override;
@@ -241,14 +240,10 @@ void UserResourceController::RenderFrameObserverHelper::DidCommitProvisionalLoad
     // that the WebChannelTransportHost is ready to receive messages.
 
     m_runner.reset(new Runner(render_frame()->GetWebFrame()));
-}
 
-void UserResourceController::RenderFrameObserverHelper::DidClearWindowObject()
-{
-    // This is called both before and after DidCommitProvisionalLoad, non-null
-    // m_runner means it's after.
-    if (m_runner)
-        m_runner->run(UserScriptData::DocumentElementCreation);
+    base::ThreadTaskRunnerHandle::Get()->PostTask(
+            FROM_HERE,
+            base::BindOnce(&Runner::run, m_runner->AsWeakPtr(), UserScriptData::DocumentElementCreation));
 }
 
 void UserResourceController::RenderFrameObserverHelper::DidFinishDocumentLoad()