Added wayland buffer optimization (mozilla#1553747).

This commit is contained in:
Martin Stransky 2019-05-23 10:12:37 +02:00
parent be085d6310
commit e964700ac9
2 changed files with 74 additions and 1 deletions

View File

@ -99,7 +99,7 @@ ExcludeArch: s390x
Summary: Mozilla Firefox Web browser
Name: firefox
Version: 67.0
Release: 3%{?pre_tag}%{?dist}
Release: 4%{?pre_tag}%{?dist}
URL: https://www.mozilla.org/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+
Source0: https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz
@ -163,6 +163,7 @@ Patch579: mozilla-1468911.patch
Patch580: mozilla-1539471.patch
Patch581: mozilla-1517205.patch
Patch582: mozilla-1508378.patch
Patch583: mozilla-1553747.patch
# PGO/LTO patches
Patch600: pgo.patch
@ -377,6 +378,7 @@ This package contains results of tests executed during build.
%patch580 -p1 -b .mozilla-1539471
%patch581 -p1 -b .mozilla-1517205
%patch582 -p1 -b .mozilla-1508378
%patch583 -p1 -b .mozilla-1553747
# PGO patches
%patch600 -p1 -b .pgo
@ -934,6 +936,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#---------------------------------------------------------------------
%changelog
* Thu May 23 2019 Martin Stransky <stransky@redhat.com> - 67.0-4
- Added wayland buffer optimization (mozilla#1553747).
* Fri May 17 2019 Martin Stransky <stransky@redhat.com> - 67.0-3
- Use %lang() in regular builds.
- Updated to 67.0 Build 2

68
mozilla-1553747.patch Normal file
View File

@ -0,0 +1,68 @@
diff -up firefox-67.0/widget/gtk/WindowSurfaceWayland.cpp.old firefox-67.0/widget/gtk/WindowSurfaceWayland.cpp
--- firefox-67.0/widget/gtk/WindowSurfaceWayland.cpp.old 2019-05-23 09:57:11.794580879 +0200
+++ firefox-67.0/widget/gtk/WindowSurfaceWayland.cpp 2019-05-23 10:05:15.505606976 +0200
@@ -416,7 +416,7 @@ WindowSurfaceWayland::~WindowSurfaceWayl
}
WindowBackBuffer* WindowSurfaceWayland::GetWaylandBufferToDraw(int aWidth,
- int aHeight) {
+ int aHeight, bool aFullScreenUpdate) {
if (!mWaylandBuffer) {
LOGWAYLAND(("%s [%p] Create [%d x %d]\n", __PRETTY_FUNCTION__, (void*)this,
aWidth, aHeight));
@@ -473,8 +473,10 @@ WindowBackBuffer* WindowSurfaceWayland::
(void*)this, aWidth, aHeight));
// Former front buffer has the same size as a requested one.
// Gecko may expect a content already drawn on screen so copy
- // existing data to the new buffer.
- mWaylandBuffer->SetImageDataFromBuffer(lastWaylandBuffer);
+ // existing data to the new buffer if we don't do fullscreen redraw.
+ if (!aFullScreenUpdate) {
+ mWaylandBuffer->SetImageDataFromBuffer(lastWaylandBuffer);
+ }
// When buffer switches we need to damage whole screen
// (https://bugzilla.redhat.com/show_bug.cgi?id=1418260)
mWaylandBufferFullScreenDamage = true;
@@ -491,8 +493,9 @@ WindowBackBuffer* WindowSurfaceWayland::
}
already_AddRefed<gfx::DrawTarget> WindowSurfaceWayland::LockWaylandBuffer(
- int aWidth, int aHeight, bool aClearBuffer) {
- WindowBackBuffer* buffer = GetWaylandBufferToDraw(aWidth, aHeight);
+ int aWidth, int aHeight, bool aClearBuffer, bool aFullScreenUpdate) {
+ WindowBackBuffer* buffer = GetWaylandBufferToDraw(aWidth, aHeight,
+ aFullScreenUpdate);
if (!buffer) {
NS_WARNING(
"WindowSurfaceWayland::LockWaylandBuffer(): No buffer available");
@@ -557,7 +560,7 @@ already_AddRefed<gfx::DrawTarget> Window
if (mDrawToWaylandBufferDirectly) {
RefPtr<gfx::DrawTarget> dt =
LockWaylandBuffer(screenRect.width, screenRect.height,
- mWindow->WaylandSurfaceNeedsClear());
+ mWindow->WaylandSurfaceNeedsClear(), true);
if (dt) {
// When we have a request to update whole screen at once
// (surface was created, resized or changed somehow)
@@ -590,7 +593,8 @@ bool WindowSurfaceWayland::CommitImageSu
}
RefPtr<gfx::DrawTarget> dt = LockWaylandBuffer(
- screenRect.width, screenRect.height, mWindow->WaylandSurfaceNeedsClear());
+ screenRect.width, screenRect.height, mWindow->WaylandSurfaceNeedsClear(),
+ false);
RefPtr<gfx::SourceSurface> surf =
gfx::Factory::CreateSourceSurfaceForCairoSurface(
mImageSurface->CairoSurface(), mImageSurface->GetSize(),
diff -up firefox-67.0/widget/gtk/WindowSurfaceWayland.h.old firefox-67.0/widget/gtk/WindowSurfaceWayland.h
--- firefox-67.0/widget/gtk/WindowSurfaceWayland.h.old 2019-05-23 09:57:16.208572833 +0200
+++ firefox-67.0/widget/gtk/WindowSurfaceWayland.h 2019-05-23 09:58:34.497430120 +0200
@@ -96,7 +96,7 @@ class WindowSurfaceWayland : public Wind
WindowBackBuffer* GetWaylandBufferToDraw(int aWidth, int aHeight);
already_AddRefed<gfx::DrawTarget> LockWaylandBuffer(int aWidth, int aHeight,
- bool aClearBuffer);
+ bool aClearBuffer, bool aFullScreenUpdate);
already_AddRefed<gfx::DrawTarget> LockImageSurface(
const gfx::IntSize& aLockSize);
bool CommitImageSurfaceToWaylandBuffer(const LayoutDeviceIntRegion& aRegion);