qt5-5.12.0:ver.bump

2018-12-24 22:34:40 +03:00
parent 9afd58dd0a
commit d775f8891d
32 changed files with 278 additions and 42 deletions
@@ -0,0 +1,101 @@
+From 721cd2d24995df8f7960cc5e8a96be1d2cd05f29 Mon Sep 17 00:00:00 2001
+From: Michal Klocek <michal.klocek@qt.io>
+Date: Tue, 27 Nov 2018 12:07:00 +0100
+Subject: Fix missing TransportSecurityPersister
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Commit d603b7055 introduced TrasnsportSecurityPersister,
+however it did not survive merge form 5.11 to 5.12.
+
+Task-number: QTBUG-69605
+Change-Id: I6357af25afcfd5c08aae77695bd2131f1cef6b71
+Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
+---
+ src/core/profile_io_data_qt.cpp | 19 +++++++++++++++++--
+ src/core/profile_io_data_qt.h   |  3 +++
+ 2 files changed, 20 insertions(+), 2 deletions(-)
+
+diff --git a/src/core/profile_io_data_qt.cpp b/src/core/profile_io_data_qt.cpp
+index 7aaddc35..0a0d242a 100644
+--- a/src/core/profile_io_data_qt.cpp
+++ b/src/core/profile_io_data_qt.cpp
+@@ -59,6 +59,7 @@
+ #include "net/http/http_cache.h"
+ #include "net/http/http_server_properties_impl.h"
+ #include "net/http/http_network_session.h"
+#include "net/http/transport_security_persister.h"
+ #include "net/proxy_resolution/dhcp_pac_file_fetcher_factory.h"
+ #include "net/proxy_resolution/pac_file_fetcher_impl.h"
+ #include "net/proxy_resolution/proxy_config_service.h"
+@@ -267,6 +268,7 @@ void ProfileIODataQt::generateStorage()
+         // we need to get rid of dangling pointer due to coming storage deletion
+         m_urlRequestContext->set_http_transaction_factory(0);
+         m_httpNetworkSession.reset();
+        m_transportSecurityPersister.reset();
+     }
+ 
+     m_storage.reset(new net::URLRequestContextStorage(m_urlRequestContext.get()));
+@@ -299,8 +301,20 @@ void ProfileIODataQt::generateStorage()
+                                                 m_networkDelegate.get()));
+ 
+     m_storage->set_ssl_config_service(std::make_unique<net::SSLConfigServiceDefaults>());
+-    m_storage->set_transport_security_state(std::unique_ptr<net::TransportSecurityState>(
+-                                                new net::TransportSecurityState()));
+    m_storage->set_transport_security_state(std::make_unique<net::TransportSecurityState>());
+
+    if (!m_dataPath.isEmpty()) {
+        scoped_refptr<base::SequencedTaskRunner> background_task_runner(
+                    base::CreateSequencedTaskRunnerWithTraits(
+        {base::MayBlock(),
+         base::TaskPriority::BACKGROUND,
+         base::TaskShutdownBehavior::BLOCK_SHUTDOWN}));
+        m_transportSecurityPersister =
+                std::make_unique<net::TransportSecurityPersister>(
+                    m_urlRequestContext->transport_security_state(),
+                    toFilePath(m_dataPath),
+                    background_task_runner);
+    };
+ 
+     if (!m_httpAuthPreferences)
+         m_httpAuthPreferences.reset(new net::HttpAuthPreferences());
+@@ -566,6 +580,7 @@ void ProfileIODataQt::setFullConfiguration()
+     m_httpCachePath = m_profileAdapter->httpCachePath();
+     m_httpCacheMaxSize = m_profileAdapter->httpCacheMaxSize();
+     m_customUrlSchemes = m_profileAdapter->customUrlSchemes();
+    m_dataPath = m_profileAdapter->dataPath();
+ }
+ 
+ void ProfileIODataQt::updateStorageSettings()
+diff --git a/src/core/profile_io_data_qt.h b/src/core/profile_io_data_qt.h
+index 60f4d2d1..6961e2ad 100644
+--- a/src/core/profile_io_data_qt.h
+++ b/src/core/profile_io_data_qt.h
+@@ -58,6 +58,7 @@ class ProxyConfigService;
+ class URLRequestContext;
+ class URLRequestContextStorage;
+ class URLRequestJobFactoryImpl;
+class TransportSecurityPersister;
+ }
+ 
+ namespace QtWebEngineCore {
+@@ -113,6 +114,7 @@ private:
+     std::unique_ptr<net::DhcpPacFileFetcherFactory> m_dhcpPacFileFetcherFactory;
+     std::unique_ptr<net::HttpAuthPreferences> m_httpAuthPreferences;
+     std::unique_ptr<net::URLRequestJobFactory> m_jobFactory;
+    std::unique_ptr<net::TransportSecurityPersister> m_transportSecurityPersister;
+     base::WeakPtr<ProfileIODataQt> m_weakPtr;
+     scoped_refptr<CookieMonsterDelegateQt> m_cookieDelegate;
+     content::URLRequestInterceptorScopedVector m_requestInterceptors;
+@@ -141,6 +143,7 @@ private:
+     bool m_updateUserAgent = false;
+     bool m_ignoreCertificateErrors = false;
+     base::WeakPtrFactory<ProfileIODataQt> m_weakPtrFactory; // this should be always the last member
+    QString m_dataPath;
+     DISALLOW_COPY_AND_ASSIGN(ProfileIODataQt);
+ };
+ } // namespace QtWebEngineCore
+-- 
+cgit v1.2.1
+
@@ -0,0 +1,121 @@
+From 20238f2c472af7b94d48a837d7723a209a87fd9e Mon Sep 17 00:00:00 2001
+From: Allan Sandfeld Jensen <allan.jensen@qt.io>
+Date: Wed, 14 Nov 2018 16:29:35 +0100
+Subject: Fix autoscrolling
+
+We were missing the connection between on begin frame and progressing
+auto-scroll.
+
+Change-Id: I651b35c031afedc9aeef1dc6a16547757b869633
+Fixes: QTBUG-71370
+Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
+---
+ src/core/compositor.cpp                 | 11 +++++++----
+ src/core/compositor.h                   |  4 +++-
+ src/core/render_widget_host_view_qt.cpp |  7 ++++++-
+ src/core/render_widget_host_view_qt.h   |  1 +
+ 4 files changed, 17 insertions(+), 6 deletions(-)
+
+diff --git a/src/core/compositor.cpp b/src/core/compositor.cpp
+index 5dd05371..f7a5e651 100644
+--- a/src/core/compositor.cpp
+++ b/src/core/compositor.cpp
+@@ -40,15 +40,17 @@
+ #include "compositor.h"
+ 
+ #include "delegated_frame_node.h"
+#include "render_widget_host_view_qt.h"
+ 
+-#include <components/viz/common/resources/returned_resource.h>
+-#include <content/public/browser/browser_thread.h>
+-#include <services/viz/public/interfaces/compositing/compositor_frame_sink.mojom.h>
+#include "components/viz/common/resources/returned_resource.h"
+#include "content/public/browser/browser_thread.h"
+#include "services/viz/public/interfaces/compositing/compositor_frame_sink.mojom.h"
+ 
+ namespace QtWebEngineCore {
+ 
+-Compositor::Compositor()
+Compositor::Compositor(RenderWidgetHostViewQt *hostView)
+     : m_chromiumCompositorData(new ChromiumCompositorData)
+    , m_view(hostView)
+ {
+     DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+ 
+@@ -163,6 +165,7 @@ bool Compositor::OnBeginFrameDerivedImpl(const viz::BeginFrameArgs &args)
+ {
+     DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+ 
+    m_view->OnBeginFrame(args.frame_time);
+     m_beginFrameSource->OnUpdateVSyncParameters(args.frame_time, args.interval);
+     if (m_frameSinkClient)
+         m_frameSinkClient->OnBeginFrame(args);
+diff --git a/src/core/compositor.h b/src/core/compositor.h
+index 4852d059..7d7db5d0 100644
+--- a/src/core/compositor.h
+++ b/src/core/compositor.h
+@@ -60,6 +60,7 @@ class CompositorFrameSinkClient;
+ 
+ namespace QtWebEngineCore {
+ 
+class RenderWidgetHostViewQt;
+ class RenderWidgetHostViewQtDelegate;
+ class ChromiumCompositorData;
+ 
+@@ -84,7 +85,7 @@ class ChromiumCompositorData;
+ class Compositor final : private viz::BeginFrameObserverBase
+ {
+ public:
+-    explicit Compositor();
+    explicit Compositor(RenderWidgetHostViewQt *hostView);
+     ~Compositor() override;
+ 
+     void setViewDelegate(RenderWidgetHostViewQtDelegate *viewDelegate);
+@@ -105,6 +106,7 @@ private:
+ 
+     std::vector<viz::ReturnedResource> m_resourcesToRelease;
+     QExplicitlySharedDataPointer<ChromiumCompositorData> m_chromiumCompositorData;
+    RenderWidgetHostViewQt *m_view;
+     RenderWidgetHostViewQtDelegate *m_viewDelegate = nullptr;
+     std::unique_ptr<viz::SyntheticBeginFrameSource> m_beginFrameSource;
+     viz::mojom::CompositorFrameSinkClient *m_frameSinkClient = nullptr;
+diff --git a/src/core/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp
+index 9706ac07..4ed62504 100644
+--- a/src/core/render_widget_host_view_qt.cpp
+++ b/src/core/render_widget_host_view_qt.cpp
+@@ -260,7 +260,7 @@ RenderWidgetHostViewQt::RenderWidgetHostViewQt(content::RenderWidgetHost *widget
+     , m_gestureProvider(QtGestureProviderConfig(), this)
+     , m_sendMotionActionDown(false)
+     , m_touchMotionStarted(false)
+-    , m_compositor(new Compositor)
+    , m_compositor(new Compositor(this))
+     , m_loadVisuallyCommittedState(NotCommitted)
+     , m_adapterClient(0)
+     , m_imeInProgress(false)
+@@ -1637,6 +1637,11 @@ void RenderWidgetHostViewQt::SetNeedsBeginFrames(bool needs_begin_frames)
+     m_compositor->setNeedsBeginFrames(needs_begin_frames);
+ }
+ 
+void RenderWidgetHostViewQt::OnBeginFrame(base::TimeTicks frame_time)
+{
+    host()->ProgressFlingIfNeeded(frame_time);
+}
+
+ content::RenderFrameHost *RenderWidgetHostViewQt::getFocusedFrameHost()
+ {
+     content::RenderViewHostImpl *viewHost = content::RenderViewHostImpl::From(host());
+diff --git a/src/core/render_widget_host_view_qt.h b/src/core/render_widget_host_view_qt.h
+index 8db3351f..6dd4d57e 100644
+--- a/src/core/render_widget_host_view_qt.h
+++ b/src/core/render_widget_host_view_qt.h
+@@ -112,6 +112,7 @@ public:
+     RenderWidgetHostViewQtDelegate *delegate() { return m_delegate.get(); }
+     void setDelegate(RenderWidgetHostViewQtDelegate *delegate);
+     void setAdapterClient(WebContentsAdapterClient *adapterClient);
+    void OnBeginFrame(base::TimeTicks frame_time);
+ 
+     void InitAsChild(gfx::NativeView) override;
+     void InitAsPopup(content::RenderWidgetHostView*, const gfx::Rect&) override;
+-- 
+cgit v1.2.1
+