MFH: r470586

www/waterfox: update to 56.2.0.13

Changes:	436898372f...d2cdd42f41
Approved by:	ports-secteam blanket
This commit is contained in:
Jan Beich 2018-05-22 00:25:14 +00:00
parent 0ae53c4611
commit 9953ed5f9b
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/branches/2018Q2/; revision=470589
3 changed files with 47 additions and 7 deletions

View File

@ -1,16 +1,15 @@
# $FreeBSD$
PORTNAME= waterfox
DISTVERSION= 56.2.0-7
DISTVERSIONSUFFIX= -g436898372f858
PORTREVISION= 1
DISTVERSION= 56.2.0-13
DISTVERSIONSUFFIX= -gd2cdd42f4115b
CATEGORIES= www ipv6
MAINTAINER= jbeich@FreeBSD.org
COMMENT= Distilled fork of Firefox
DEPRECATED= Temporary experiment
EXPIRATION_DATE=2018-07-03
EXPIRATION_DATE=2018-07-10
BUILD_DEPENDS= nspr>=4.16:devel/nspr \
nss>=3.32.1:security/nss \

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1526343922
SHA256 (MrAlex94-Waterfox-56.2.0-7-g436898372f858_GH0.tar.gz) = ed9b870b81e3263afaf92efa9830b2a8e84cd71d78e300feaa5de70395974aae
SIZE (MrAlex94-Waterfox-56.2.0-7-g436898372f858_GH0.tar.gz) = 395153667
TIMESTAMP = 1526579170
SHA256 (MrAlex94-Waterfox-56.2.0-13-gd2cdd42f4115b_GH0.tar.gz) = 3722c20ec52309b1b184e0c82d15ebd2bf0d793c3306099028f789415256c6ca
SIZE (MrAlex94-Waterfox-56.2.0-13-gd2cdd42f4115b_GH0.tar.gz) = 395161904

View File

@ -0,0 +1,41 @@
commit c0a881204f3a
Author: Martin Stransky <stransky@redhat.com>
Date: Thu May 17 14:40:21 2018 +0200
Bug 1461203 - Use GetScrollbarMetrics() to access scrollbar metrics. r=jhorak, a=RyanVM
MozReview-Commit-ID: 3gnFNfxQJZi
--HG--
extra : source : bdfce06ecdb44275214caa0c8333d3112bbb4d16
---
widget/gtk/gtk3drawing.cpp | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git widget/gtk/gtk3drawing.cpp widget/gtk/gtk3drawing.cpp
index 8efc4f70d1be2..71ddd1e9d4bb7 100644
--- widget/gtk/gtk3drawing.cpp
+++ widget/gtk/gtk3drawing.cpp
@@ -888,16 +888,14 @@ moz_gtk_scrollbar_button_paint(cairo_t *cr, const GdkRectangle* aRect,
// in case of horizontal scrollbars).
GtkOrientation orientation = flags & MOZ_GTK_STEPPER_VERTICAL ?
GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL;
- const auto& metrics = sScrollbarMetrics[orientation];
- if (!metrics.initialized) {
- NS_WARNING("Didn't measure before drawing?");
- }
+
+ const ScrollbarGTKMetrics* metrics = GetScrollbarMetrics(orientation);
if (flags & MOZ_GTK_STEPPER_VERTICAL) {
- rect.x += metrics.border.track.left;
- rect.width = metrics.size.thumb.width;
+ rect.x += metrics->border.track.left;
+ rect.width = metrics->size.thumb.width;
} else {
- rect.y += metrics.border.track.top;
- rect.height = metrics.size.thumb.height;
+ rect.y += metrics->border.track.top;
+ rect.height = metrics->size.thumb.height;
}
}