Merge pull request #6154 from Rmys/master

qt5-5.12.0:ver.bump
This commit is contained in:
Rmys
2018-12-24 22:35:12 +03:00
committed by GitHub
32 changed files with 278 additions and 42 deletions
+3 -3
View File
@@ -14,7 +14,7 @@ def setup():
#shelltools.export("QT5LINK", "/usr/lib/qt5/bin")
#shelltools.export("QT5DIR", "/usr/lib/qt5")
#shelltools.export("CFLAGS", "%s -I/usr/lib/sqlite3.16.2" % get.CFLAGS())
shelltools.system("qmake-qt5 WEBENGINE_CONFIG+=use_proprietary_codecs WEBENGINE_CONFIG+=use_system_icu WEBENGINE_CONFIG+=use_system_protobuf WEBENGINE_CONFIG+=use_system_ffmpeg qtwebengine.pro")
shelltools.system("qmake WEBENGINE_CONFIG+=use_proprietary_codecs WEBENGINE_CONFIG+=use_system_icu WEBENGINE_CONFIG+=use_system_protobuf WEBENGINE_CONFIG+=use_system_ffmpeg qtwebengine.pro")
#pisitools.ldflags.add("-Wl,--no-keep-memory ")
qt5.configure()
@@ -25,7 +25,7 @@ def install():
qt5.install("INSTALL_ROOT=%s" % get.installDIR())
#I hope qtchooser will manage this issue
for bin in shelltools.ls("%s/usr/lib/qt5/bin" % get.installDIR()):
pisitools.dosym("/usr/lib/qt5/bin/%s" % bin, "/usr/bin/%s-qt5" % bin)
#for bin in shelltools.ls("%s/usr/lib/qt5/bin" % get.installDIR()):
#pisitools.dosym("/usr/lib/qt5/bin/%s" % bin, "/usr/bin/%s-qt5" % bin)
pisitools.dodoc("LICENSE*")
View File
View File
View File
View File
+101
View File
@@ -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
+121
View File
@@ -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
View File
View File
View File
View File
View File
+25 -18
View File
@@ -11,14 +11,14 @@
<Summary>Provides support for web applications using the Chromium browser project</Summary>
<Description>Provides support for web applications using the Chromium browser project</Description>
<License>LGPLv2.1-linking-exception</License>
<Archive sha1sum="a95ecab22d65c265f3550854d50376ff51ccc3da" type="tarxz">http://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtwebengine-everywhere-src-5.11.2.tar.xz</Archive>
<Archive sha1sum="840f24dd919c560c636b0cb421ce95509d919d5b" type="tarxz">http://download.qt.io/official_releases/qt/5.12/5.12.0/submodules/qtwebengine-everywhere-src-5.12.0.tar.xz</Archive>
<BuildDependencies>
<Dependency versionFrom="5.11.2">qt5-base-devel</Dependency>
<Dependency versionFrom="5.11.2">qt5-declarative-devel</Dependency>
<Dependency versionFrom="5.11.2">qt5-xmlpatterns-devel</Dependency>
<Dependency versionFrom="5.11.2">qt5-location-devel</Dependency>
<Dependency versionFrom="5.11.2">qt5-sensors-devel</Dependency>
<Dependency versionFrom="5.11.2">qt5-webchannel-devel</Dependency>
<Dependency versionFrom="5.12.0">qt5-base-devel</Dependency>
<Dependency versionFrom="5.12.0">qt5-declarative-devel</Dependency>
<Dependency versionFrom="5.12.0">qt5-xmlpatterns-devel</Dependency>
<Dependency versionFrom="5.12.0">qt5-location-devel</Dependency>
<Dependency versionFrom="5.12.0">qt5-sensors-devel</Dependency>
<Dependency versionFrom="5.12.0">qt5-webchannel-devel</Dependency>
<Dependency>bison</Dependency>
<Dependency>re2-devel</Dependency>
<Dependency>re2c</Dependency>
@@ -72,8 +72,8 @@
</BuildDependencies>
<Patches>
<Patch level="1">qtwebengine-harmony.patch</Patch>
<!-- <Patch level="1">qtwebengine-no-gpu.patch</Patch> -->
<!-- <Patch>qtwebengine-ffmpeg4.patch</Patch> -->
<Patch level="1">qtbug-71370.patch</Patch>
<Patch level="1">qtbug-69605.patch</Patch>
</Patches>
</Source>
@@ -111,7 +111,7 @@
<Dependency>libopus</Dependency>
<Dependency>libxml2</Dependency>
<Dependency>libvpx</Dependency>
<Dependency versionFrom="5.11.2">qt5-base</Dependency>
<Dependency versionFrom="5.12.0">qt5-base</Dependency>
<Dependency>alsa-lib</Dependency>
<Dependency>harfbuzz</Dependency>
<Dependency>libevent</Dependency>
@@ -121,11 +121,11 @@
<Dependency>libXScrnSaver</Dependency>
<Dependency>libXdamage</Dependency>
<Dependency>libXrender</Dependency>
<Dependency versionFrom="5.11.2">qt5-location</Dependency>
<Dependency versionFrom="5.12.0">qt5-location</Dependency>
<Dependency>libXcomposite</Dependency>
<Dependency>libjpeg-turbo</Dependency>
<Dependency versionFrom="5.11.2">qt5-webchannel</Dependency>
<Dependency versionFrom="5.11.2">qt5-declarative</Dependency>
<Dependency versionFrom="5.12.0">qt5-webchannel</Dependency>
<Dependency versionFrom="5.12.0">qt5-declarative</Dependency>
<Dependency>zlib</Dependency>
<Dependency>minizip</Dependency>
<Dependency>protobuf</Dependency>
@@ -141,17 +141,17 @@
</Files>
<RuntimeDependencies>
<Dependency release="current">qt5-webengine</Dependency>
<Dependency versionFrom="5.11.2">qt5-base-devel</Dependency>
<Dependency versionFrom="5.11.2">qt5-declarative-devel</Dependency>
<Dependency versionFrom="5.11.2">qt5-location-devel</Dependency>
<Dependency versionFrom="5.11.2">qt5-webchannel-devel</Dependency>
<Dependency versionFrom="5.12.0">qt5-base-devel</Dependency>
<Dependency versionFrom="5.12.0">qt5-declarative-devel</Dependency>
<Dependency versionFrom="5.12.0">qt5-location-devel</Dependency>
<Dependency versionFrom="5.12.0">qt5-webchannel-devel</Dependency>
</RuntimeDependencies>
</Package>
<Package>
<Name>qt5-webengine-docs</Name>
<RuntimeDependencies>
<Dependency versionFrom="5.11.2">qt5-base</Dependency>
<Dependency versionFrom="5.12.0">qt5-base</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="doc">/usr/share/doc</Path>
@@ -159,6 +159,13 @@
</Package>
<History>
<Update release="9">
<Date>2018-12-05</Date>
<Version>5.12.0</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="8">
<Date>2018-10-15</Date>
<Version>5.11.2</Version>
View File
+2 -2
View File
@@ -29,8 +29,8 @@ def install():
cmaketools.rawInstall("DESTDIR=%s" % get.installDIR())
#I hope qtchooser will manage this issue
for bin in shelltools.ls("%s/usr/lib/qt5/bin" % get.installDIR()):
pisitools.dosym("/usr/lib/qt5/bin/%s" % bin, "/usr/bin/%s-qt5" % bin)
#for bin in shelltools.ls("%s/usr/lib/qt5/bin" % get.installDIR()):
#pisitools.dosym("/usr/lib/qt5/bin/%s" % bin, "/usr/bin/%s-qt5" % bin)
shelltools.cd("..")
pisitools.dodoc("LICENSE*")
View File
View File
View File
View File
View File
View File
View File
+26 -19
View File
@@ -13,17 +13,17 @@
<License>LGPLv2.1-linking-exception</License>
<Archive type="tarxz" sha1sum="6a361cc3f3b7ab1d35955bafe20fbbae61bc80c8">https://github.com/annulen/webkit/releases/download/qtwebkit-5.212.0-alpha2/qtwebkit-5.212.0-alpha2.tar.xz</Archive>
<BuildDependencies>
<Dependency versionFrom="5.11.2">qt5-base-devel</Dependency>
<Dependency versionFrom="5.11.2">qt5-sensors-devel</Dependency>
<Dependency versionFrom="5.11.2">qt5-location-devel</Dependency>
<Dependency versionFrom="5.11.2">qt5-declarative-devel</Dependency>
<Dependency versionFrom="5.11.2">qt5-webchannel-devel</Dependency>
<Dependency versionFrom="5.11.2">qt5-designer-devel</Dependency>
<Dependency versionFrom="5.11.2">qt5-linguist</Dependency>
<Dependency versionFrom="5.11.2">qt5-qdbusviewer</Dependency>
<Dependency versionFrom="5.11.2">qt5-multimedia-devel</Dependency>
<Dependency versionFrom="5.11.2">qt5-assistant-devel</Dependency>
<Dependency versionFrom="5.11.2">qt5-sql-sqlite</Dependency>
<Dependency versionFrom="5.12.0">qt5-base-devel</Dependency>
<Dependency versionFrom="5.12.0">qt5-sensors-devel</Dependency>
<Dependency versionFrom="5.12.0">qt5-location-devel</Dependency>
<Dependency versionFrom="5.12.0">qt5-declarative-devel</Dependency>
<Dependency versionFrom="5.12.0">qt5-webchannel-devel</Dependency>
<Dependency versionFrom="5.12.0">qt5-designer-devel</Dependency>
<Dependency versionFrom="5.12.0">qt5-linguist</Dependency>
<Dependency versionFrom="5.12.0">qt5-qdbusviewer</Dependency>
<Dependency versionFrom="5.12.0">qt5-multimedia-devel</Dependency>
<Dependency versionFrom="5.12.0">qt5-assistant-devel</Dependency>
<Dependency versionFrom="5.12.0">qt5-sql-sqlite</Dependency>
<Dependency versionFrom="13.0.4">mesa-devel</Dependency>
<Dependency>cmake</Dependency>
<Dependency>libXtst-devel</Dependency>
@@ -78,7 +78,7 @@
<Path fileType="doc">/usr/share/doc</Path>
</Files>
<RuntimeDependencies>
<Dependency versionFrom="5.11.2">qt5-base</Dependency>
<Dependency versionFrom="5.12.0">qt5-base</Dependency>
<Dependency>mesa</Dependency>
<Dependency>webp</Dependency>
<Dependency>zlib</Dependency>
@@ -91,16 +91,16 @@
<Dependency>libxml2</Dependency>
<Dependency>libxslt</Dependency>
<Dependency>libXrender</Dependency>
<Dependency versionFrom="5.11.2">qt5-sensors</Dependency>
<Dependency versionFrom="5.11.2">qt5-webchannel</Dependency>
<Dependency versionFrom="5.12.0">qt5-sensors</Dependency>
<Dependency versionFrom="5.12.0">qt5-webchannel</Dependency>
<Dependency>libXcomposite</Dependency>
<Dependency>libjpeg-turbo</Dependency>
<Dependency>gstreamer</Dependency>
<Dependency>gstreamer</Dependency>
<Dependency>gst-plugins-base</Dependency>
<Dependency>gst-plugins-base</Dependency>
<Dependency versionFrom="5.11.2">qt5-location</Dependency>
<Dependency versionFrom="5.11.2">qt5-declarative</Dependency>
<Dependency versionFrom="5.12.0">qt5-location</Dependency>
<Dependency versionFrom="5.12.0">qt5-declarative</Dependency>
</RuntimeDependencies>
</Package>
@@ -112,7 +112,7 @@
</Files>
<RuntimeDependencies>
<Dependency release="current">qt5-webkit</Dependency>
<Dependency versionFrom="5.11.2">qt5-base-devel</Dependency>
<Dependency versionFrom="5.12.0">qt5-base-devel</Dependency>
<Dependency>mesa-devel</Dependency>
<Dependency>webp-devel</Dependency>
<Dependency>zlib-devel</Dependency>
@@ -124,16 +124,23 @@
<Dependency>libxml2-devel</Dependency>
<Dependency>libxslt-devel</Dependency>
<Dependency>libXrender-devel</Dependency>
<Dependency versionFrom="5.11.2">qt5-sensors-devel</Dependency>
<Dependency versionFrom="5.12.0">qt5-sensors-devel</Dependency>
<Dependency>libXcomposite-devel</Dependency>
<Dependency>libjpeg-turbo-devel</Dependency>
<Dependency>gstreamer-devel</Dependency>
<Dependency>gst-plugins-base-devel</Dependency>
<Dependency versionFrom="5.11.2">qt5-declarative-devel</Dependency>
<Dependency versionFrom="5.12.0">qt5-declarative-devel</Dependency>
</RuntimeDependencies>
</Package>
<History>
<Update release="13">
<Date>2018-12-05</Date>
<Version>5.212.0</Version>
<Comment>Rebuild.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="12">
<Date>2018-10-17</Date>
<Version>5.212.0</Version>
View File