Attachment 187676 Details for Bug 222693 – beta14

[patch] beta14

ff57.diff (text/plain), 109.85 KB, created by Jan Beich on 2017-11-03 01:41:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2017-11-03 01:41:36 UTC

Size: 109.85 KB

patch

obsolete

>From d771b1dfc9c3de611cef03887c85b34ec60bb790 Mon Sep 17 00:00:00 2001
>From: jbeich <jbeich@35697150-7ecd-e111-bb59-0022644237b5>
>Date: Wed, 27 Sep 2017 04:12:34 +0000
>Subject: [PATCH] www/firefox: update to 57.0
>
>Changes:	https://www.mozilla.org/firefox/57.0/releasenotes/
>PR:		222693
>Tested by:	pi, tobik, TrueOS
>Security:	f78eac48-c3d1-4666-8de5-63ceea25a578
>MFH:		2017Q4
>---
> Mk/Uses/gecko.mk                                   |   4 +-
> www/firefox-i18n/Makefile                          |   4 +-
> www/firefox-i18n/distinfo                          | 382 +++++------
> www/firefox/Makefile                               |  11 +-
> www/firefox/distinfo                               |   6 +-
> www/firefox/files/patch-bug1386887                 |  89 ---
> www/firefox/files/patch-bug1386957                 |  14 -
> www/firefox/files/patch-bug1393283                 | 144 ----
> www/firefox/files/patch-bug1401573                 |  27 -
> www/firefox/files/patch-bug1409680                 |  27 -
> www/firefox/files/patch-bug847568                  |   2 +-
> www/firefox/files/patch-build-pgo-profileserver.py |  20 +-
> www/firefox/files/patch-servo17934                 |  53 --
> www/firefox/files/patch-servo17969                 | 110 ---
> www/firefox/files/patch-servo18046                 | 763 ---------------------
> www/firefox/files/patch-servo18126                 | 232 -------
> 16 files changed, 214 insertions(+), 1674 deletions(-)
> delete mode 100644 www/firefox/files/patch-bug1386887
> delete mode 100644 www/firefox/files/patch-bug1386957
> delete mode 100644 www/firefox/files/patch-bug1393283
> delete mode 100644 www/firefox/files/patch-bug1401573
> delete mode 100644 www/firefox/files/patch-bug1409680
> delete mode 100644 www/firefox/files/patch-servo17934
> delete mode 100644 www/firefox/files/patch-servo17969
> delete mode 100644 www/firefox/files/patch-servo18046
> delete mode 100644 www/firefox/files/patch-servo18126
>
>diff --git a/Mk/Uses/gecko.mk b/Mk/Uses/gecko.mk
>index 1be490172a79..432c60edd28e 100644
>--- a/Mk/Uses/gecko.mk
>+++ b/Mk/Uses/gecko.mk
>@@ -37,12 +37,12 @@ RUN_DEPENDS+=	libxul>=45:www/libxul
> .elif ${gecko_ARGS:Mfirefox}
> 
> _GECKO_DEFAULT_VERSION=	52
>-_GECKO_VERSIONS=		52 56
>+_GECKO_VERSIONS=		52 57
> _GECKO_TYPE=	firefox
> 
> # Dependence lines for different Firefox versions
> 52_DEPENDS=		${LOCALBASE}/lib/firefox/firefox:www/firefox-esr
>-56_DEPENDS=		${LOCALBASE}/lib/firefox/firefox:www/firefox
>+57_DEPENDS=		${LOCALBASE}/lib/firefox/firefox:www/firefox
> 
> .if exists(${LOCALBASE}/bin/firefox)
> _GECKO_INSTALLED_VER!=	${LOCALBASE}/bin/firefox --version 2>/dev/null
>diff --git a/www/firefox-i18n/Makefile b/www/firefox-i18n/Makefile
>index 2d34e53e1fbe..14f63b79e746 100644
>--- a/www/firefox-i18n/Makefile
>+++ b/www/firefox-i18n/Makefile
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	firefox-i18n
>-PORTVERSION=	56.0.2
>+PORTVERSION=	57.0b14
> CATEGORIES=	www
> MASTER_SITES=	MOZILLA/${PORTNAME:S|-i18n||}/releases/${DISTVERSION}/linux-i686/xpi \
> 		MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build1/linux-i686/xpi
>@@ -15,7 +15,7 @@ COMMENT=	Localized interface for Firefox
> 
> EXTRACT_DEPENDS=	zip:archivers/zip
> 
>-USES=		zip:infozip gecko:firefox,56,build
>+USES=		zip:infozip gecko:firefox,57,build
> USE_XPI=	firefox
> 
> NO_ARCH=	yes
>diff --git a/www/firefox-i18n/distinfo b/www/firefox-i18n/distinfo
>index 5361ed4719b4..3883ea4eb82b 100644
>--- a/www/firefox-i18n/distinfo
>+++ b/www/firefox-i18n/distinfo
>@@ -1,191 +1,191 @@
>-TIMESTAMP = 1508873487
>-SHA256 (xpi/firefox-i18n-56.0.2/ach.xpi) = a78c4900c9dac71ea312d5ceda13987f4f8418ab078374c0e292cd30ce79aa23
>-SIZE (xpi/firefox-i18n-56.0.2/ach.xpi) = 454896
>-SHA256 (xpi/firefox-i18n-56.0.2/af.xpi) = e0ea5e99eb7cedd0c3893ae4baa3ca2af7f814bc069dcbf921069dcaba762fc6
>-SIZE (xpi/firefox-i18n-56.0.2/af.xpi) = 456214
>-SHA256 (xpi/firefox-i18n-56.0.2/an.xpi) = 18e3c4e6f85fb296bd955b110ba2c6a381ba4ba8de3a0e2990bc4618f9438593
>-SIZE (xpi/firefox-i18n-56.0.2/an.xpi) = 475863
>-SHA256 (xpi/firefox-i18n-56.0.2/ar.xpi) = c8dcb494321e5ef34092b7555ec67147461b387803df895c30858314f0509acb
>-SIZE (xpi/firefox-i18n-56.0.2/ar.xpi) = 500711
>-SHA256 (xpi/firefox-i18n-56.0.2/as.xpi) = e77f99a72083b49e30f453d1f40ac670e42e6a637b8bb4e7c914f74b24e6b582
>-SIZE (xpi/firefox-i18n-56.0.2/as.xpi) = 508237
>-SHA256 (xpi/firefox-i18n-56.0.2/ast.xpi) = e4fe6028af88b67dce678e6a1215cda2c2aa0cbe76eb95947c46e08d93bb23bc
>-SIZE (xpi/firefox-i18n-56.0.2/ast.xpi) = 469157
>-SHA256 (xpi/firefox-i18n-56.0.2/az.xpi) = 5d9cd26da6e1afe41c9d032054b066a9e0a13f7cfd9701e8126147f405ae6f1a
>-SIZE (xpi/firefox-i18n-56.0.2/az.xpi) = 484984
>-SHA256 (xpi/firefox-i18n-56.0.2/be.xpi) = 647318eb3b3060ba2384ecf4b4b96fb70fb54f1428c20f776d8d99f75eed5f49
>-SIZE (xpi/firefox-i18n-56.0.2/be.xpi) = 531385
>-SHA256 (xpi/firefox-i18n-56.0.2/bg.xpi) = a844374d3453747f30382acf6019d379596f812f68d49ba7245a18993cea5ffb
>-SIZE (xpi/firefox-i18n-56.0.2/bg.xpi) = 528789
>-SHA256 (xpi/firefox-i18n-56.0.2/bn-BD.xpi) = caafe8df84189999ed513e4f88e91f8b8c35e8a1d13fa54bd54f3a0654ec1f02
>-SIZE (xpi/firefox-i18n-56.0.2/bn-BD.xpi) = 542772
>-SHA256 (xpi/firefox-i18n-56.0.2/bn-IN.xpi) = 4278938cf3be47f2e7a865a2221c10f383b8c7930f71b2bd0c4ce09c1ff8a3c8
>-SIZE (xpi/firefox-i18n-56.0.2/bn-IN.xpi) = 534450
>-SHA256 (xpi/firefox-i18n-56.0.2/br.xpi) = 65e8b0a3e55e99701e0ecfb9cdb0775afc0946f23eab34d4ada4f0d973d2076d
>-SIZE (xpi/firefox-i18n-56.0.2/br.xpi) = 464256
>-SHA256 (xpi/firefox-i18n-56.0.2/bs.xpi) = fef54b5ba9231eaedbe216c1f9e7c86d831ed032d1fcd6e5dd15a06619ad69ac
>-SIZE (xpi/firefox-i18n-56.0.2/bs.xpi) = 472256
>-SHA256 (xpi/firefox-i18n-56.0.2/ca.xpi) = 11dc866f5f2a16622fa45c36c174150293e123bfd970890e4403ed224d6e4eb6
>-SIZE (xpi/firefox-i18n-56.0.2/ca.xpi) = 480364
>-SHA256 (xpi/firefox-i18n-56.0.2/cak.xpi) = 1ed05bcdb3977850ae21847f70122111ff459cc6669130ec9db5ccf11dde117f
>-SIZE (xpi/firefox-i18n-56.0.2/cak.xpi) = 489507
>-SHA256 (xpi/firefox-i18n-56.0.2/cs.xpi) = 1191121195a77ec1315ec379b307819f1ce6b15bfa1bb9fc31ec0148cb08bcf5
>-SIZE (xpi/firefox-i18n-56.0.2/cs.xpi) = 485090
>-SHA256 (xpi/firefox-i18n-56.0.2/cy.xpi) = a04d0d37f46b89d2aba85eebc1524daba41b3a6db468e61a924e83b2814d8845
>-SIZE (xpi/firefox-i18n-56.0.2/cy.xpi) = 466288
>-SHA256 (xpi/firefox-i18n-56.0.2/da.xpi) = 3822d31c6b83317216f5124d603d9a8b8180a06d2407426dd90b71891c155f0c
>-SIZE (xpi/firefox-i18n-56.0.2/da.xpi) = 460091
>-SHA256 (xpi/firefox-i18n-56.0.2/de.xpi) = ee02b96baf96be7e69ff12f06576a270e48ca454cc8f93c51070ebdd9c2a03f7
>-SIZE (xpi/firefox-i18n-56.0.2/de.xpi) = 473856
>-SHA256 (xpi/firefox-i18n-56.0.2/dsb.xpi) = 227588519f2ae092f6cbf0531287c5c36b7037c3355cc0d9e0e024d4e84472e3
>-SIZE (xpi/firefox-i18n-56.0.2/dsb.xpi) = 489897
>-SHA256 (xpi/firefox-i18n-56.0.2/el.xpi) = ace7c78e28297ea4dcc90a2b8c2881afc812a2416ae4cdba499749349bc2d3f3
>-SIZE (xpi/firefox-i18n-56.0.2/el.xpi) = 554120
>-SHA256 (xpi/firefox-i18n-56.0.2/en-GB.xpi) = 55fb37a478f2521b1b1543498d373ade08126c3ac71127bfbde504d8a3f95e16
>-SIZE (xpi/firefox-i18n-56.0.2/en-GB.xpi) = 447375
>-SHA256 (xpi/firefox-i18n-56.0.2/en-US.xpi) = 618f390c9a36aed65860d6ad20444c9c6224471d0a394de92a21262291327ff2
>-SIZE (xpi/firefox-i18n-56.0.2/en-US.xpi) = 446951
>-SHA256 (xpi/firefox-i18n-56.0.2/en-ZA.xpi) = 2fa254426d945152e9eb01cc02a8f86415fa5425aefed9825bd1dea9b6d0b76a
>-SIZE (xpi/firefox-i18n-56.0.2/en-ZA.xpi) = 445916
>-SHA256 (xpi/firefox-i18n-56.0.2/eo.xpi) = f1d9e7acc5bb36a2acfb1659ad0857e5d2c9800836d096f41ceb87977a6e7377
>-SIZE (xpi/firefox-i18n-56.0.2/eo.xpi) = 468952
>-SHA256 (xpi/firefox-i18n-56.0.2/es-AR.xpi) = 12f34c15fb4cf11e5c007ea19a97f91370a66e192cc3c0aed5405659be36eaa3
>-SIZE (xpi/firefox-i18n-56.0.2/es-AR.xpi) = 475449
>-SHA256 (xpi/firefox-i18n-56.0.2/es-CL.xpi) = 5239da279a01681c00ece001d1477abba04b41d50fd442e761140ba93b68870f
>-SIZE (xpi/firefox-i18n-56.0.2/es-CL.xpi) = 479922
>-SHA256 (xpi/firefox-i18n-56.0.2/es-ES.xpi) = 98b7422e833226916953ac89201652f406f84c805d293ab949adae475fc03a7c
>-SIZE (xpi/firefox-i18n-56.0.2/es-ES.xpi) = 365631
>-SHA256 (xpi/firefox-i18n-56.0.2/es-MX.xpi) = 9516c169b883f8208c996f461221e9bb917e2e56c1f67d01f67026a8f5de3a1b
>-SIZE (xpi/firefox-i18n-56.0.2/es-MX.xpi) = 482565
>-SHA256 (xpi/firefox-i18n-56.0.2/et.xpi) = dff5cbe5b933511fc10c1209dde31c45a521c9e687d909f4915eaf3eac8a3ad3
>-SIZE (xpi/firefox-i18n-56.0.2/et.xpi) = 462104
>-SHA256 (xpi/firefox-i18n-56.0.2/eu.xpi) = d47fe44fcab9328102334596678fe89289d8de44cd9018e13e1bcc70823ec6ec
>-SIZE (xpi/firefox-i18n-56.0.2/eu.xpi) = 467884
>-SHA256 (xpi/firefox-i18n-56.0.2/fa.xpi) = 8f25e71eb0ee9ad9e90d9948012713013ee03b6fe1b3837b1d903c5102be0a93
>-SIZE (xpi/firefox-i18n-56.0.2/fa.xpi) = 522909
>-SHA256 (xpi/firefox-i18n-56.0.2/ff.xpi) = b8416ca244cb8c99744dc3c6daa55d893754ed051ea9731f57b49edc2f0e18f1
>-SIZE (xpi/firefox-i18n-56.0.2/ff.xpi) = 463098
>-SHA256 (xpi/firefox-i18n-56.0.2/fi.xpi) = 1c6ecc0d72a500f5a77a8fdde5e288ce2c578bc1b1de3d1a062e6d7a71765130
>-SIZE (xpi/firefox-i18n-56.0.2/fi.xpi) = 461923
>-SHA256 (xpi/firefox-i18n-56.0.2/fr.xpi) = 3aa8e3e74e35a4e1ca948cb83b42bb9b2c95ec6abdbc8b0872129f6f75d4e2e1
>-SIZE (xpi/firefox-i18n-56.0.2/fr.xpi) = 484561
>-SHA256 (xpi/firefox-i18n-56.0.2/fy-NL.xpi) = 21b16ee4d0a232d6860c9fa6db296544e13e9500796451a98adebcdf35f88c66
>-SIZE (xpi/firefox-i18n-56.0.2/fy-NL.xpi) = 478044
>-SHA256 (xpi/firefox-i18n-56.0.2/ga-IE.xpi) = 4d780a2c0f362742f069842ae2d7ddf3dd8177e66405c9c570ef52b2e7de1f32
>-SIZE (xpi/firefox-i18n-56.0.2/ga-IE.xpi) = 489379
>-SHA256 (xpi/firefox-i18n-56.0.2/gd.xpi) = 9e4e1ffc31853fe3e0d4e9e23cd1ccdf0be1b50182cefc9581b902370a3ae2fc
>-SIZE (xpi/firefox-i18n-56.0.2/gd.xpi) = 476927
>-SHA256 (xpi/firefox-i18n-56.0.2/gl.xpi) = 7dc3615f3eca3bc09472207b8d78644923526dd51651a6a04cf8449bf78cca4b
>-SIZE (xpi/firefox-i18n-56.0.2/gl.xpi) = 466468
>-SHA256 (xpi/firefox-i18n-56.0.2/gn.xpi) = 32d64cb5ceb3a8b53abafd0699d9697f190e137155484fc06968efe3ab2da294
>-SIZE (xpi/firefox-i18n-56.0.2/gn.xpi) = 485790
>-SHA256 (xpi/firefox-i18n-56.0.2/gu-IN.xpi) = 574654d88abc8d620d5d29c09a281738ff463f8a0e09386373005a4c33cd7adf
>-SIZE (xpi/firefox-i18n-56.0.2/gu-IN.xpi) = 513740
>-SHA256 (xpi/firefox-i18n-56.0.2/he.xpi) = aa4437d071736c8009ff81f79cf51348fa7ce02d82dd603cc08c00997de79ddc
>-SIZE (xpi/firefox-i18n-56.0.2/he.xpi) = 488495
>-SHA256 (xpi/firefox-i18n-56.0.2/hi-IN.xpi) = 9faa3d8242f2e13e82334c91018137a23a88374d6d8bcbdbca0bac69b709487d
>-SIZE (xpi/firefox-i18n-56.0.2/hi-IN.xpi) = 538303
>-SHA256 (xpi/firefox-i18n-56.0.2/hr.xpi) = 78ea8859fc47c3fd35055ad7dacd3c89192619f637d1b10a5515db49c1aabd63
>-SIZE (xpi/firefox-i18n-56.0.2/hr.xpi) = 475058
>-SHA256 (xpi/firefox-i18n-56.0.2/hsb.xpi) = 7e868a01a8c881319703dd2d40aa7a90a2a6afda350a93cdee785c1cee3e334c
>-SIZE (xpi/firefox-i18n-56.0.2/hsb.xpi) = 487599
>-SHA256 (xpi/firefox-i18n-56.0.2/hu.xpi) = ba7c06ffe790cb31450c47ffc73c0ef402e759e8d6798c284ab3004aa9b1a154
>-SIZE (xpi/firefox-i18n-56.0.2/hu.xpi) = 490102
>-SHA256 (xpi/firefox-i18n-56.0.2/hy-AM.xpi) = 5a78e97fe3b0a106a9839714e2a811d52501e5c427ba9c943bdcbdd2beb303cb
>-SIZE (xpi/firefox-i18n-56.0.2/hy-AM.xpi) = 527711
>-SHA256 (xpi/firefox-i18n-56.0.2/id.xpi) = 916e89bb2bf8fcd0671a1cfe34944643e3f3bb1aeccf6bc7b86329e1f3261cb3
>-SIZE (xpi/firefox-i18n-56.0.2/id.xpi) = 459066
>-SHA256 (xpi/firefox-i18n-56.0.2/is.xpi) = f424cf833f52cb6a57933e6173bad7a1df2e01b9233feb0abfab0e9f3fd13a78
>-SIZE (xpi/firefox-i18n-56.0.2/is.xpi) = 467447
>-SHA256 (xpi/firefox-i18n-56.0.2/it.xpi) = 49e286eecc3e31a2581f728783f25717b994e466a1329f5121efff04d3400ccd
>-SIZE (xpi/firefox-i18n-56.0.2/it.xpi) = 358695
>-SHA256 (xpi/firefox-i18n-56.0.2/ja.xpi) = f981b5dd41b2d2479034720d4d8d4ec98b936e5d4b092e954057a3135b802d93
>-SIZE (xpi/firefox-i18n-56.0.2/ja.xpi) = 527926
>-SHA256 (xpi/firefox-i18n-56.0.2/ka.xpi) = c84ec7d427a84290cc760cf35a900a188621c7c8fbc3b48f63d7c000642eb3c1
>-SIZE (xpi/firefox-i18n-56.0.2/ka.xpi) = 509096
>-SHA256 (xpi/firefox-i18n-56.0.2/kab.xpi) = e8ffa26d1acef0cfb554eced0b86656c4ac504b5459bb8fd3eb86c5292df7b3e
>-SIZE (xpi/firefox-i18n-56.0.2/kab.xpi) = 477420
>-SHA256 (xpi/firefox-i18n-56.0.2/kk.xpi) = 5c918b32273f6a107c6a8d78be58c9e757884dcc28951949db39bba705c95d37
>-SIZE (xpi/firefox-i18n-56.0.2/kk.xpi) = 534932
>-SHA256 (xpi/firefox-i18n-56.0.2/km.xpi) = 52c280027d92449fda3cd321a091b2f65f401d417bff7fdce692191b748f99c2
>-SIZE (xpi/firefox-i18n-56.0.2/km.xpi) = 549344
>-SHA256 (xpi/firefox-i18n-56.0.2/kn.xpi) = 03120c4eb742e750c46f266fceb69cd1a8b97d3cf5bd0f2a55485d25af502272
>-SIZE (xpi/firefox-i18n-56.0.2/kn.xpi) = 545517
>-SHA256 (xpi/firefox-i18n-56.0.2/ko.xpi) = 60171b4d104a456df4a7fc60dc506eaa0ced1a32a216461bbddd2a215200f61b
>-SIZE (xpi/firefox-i18n-56.0.2/ko.xpi) = 502895
>-SHA256 (xpi/firefox-i18n-56.0.2/lij.xpi) = b0b07f9e4be734145b6472ef506b4cb99c85eea98ece31dad6efa2003d59f893
>-SIZE (xpi/firefox-i18n-56.0.2/lij.xpi) = 467275
>-SHA256 (xpi/firefox-i18n-56.0.2/lt.xpi) = 09302dfb196300ae49c47cf4a9a1ac9ec4df954defa8abd19bdd985852af94b5
>-SIZE (xpi/firefox-i18n-56.0.2/lt.xpi) = 488753
>-SHA256 (xpi/firefox-i18n-56.0.2/lv.xpi) = 9f47b7ef87c55320d6d67a15f61a87b0cc9e891a5aeac382badfe3e3b27b51e4
>-SIZE (xpi/firefox-i18n-56.0.2/lv.xpi) = 481628
>-SHA256 (xpi/firefox-i18n-56.0.2/mai.xpi) = f16a670648ebdc3b914620d7fbe4f6095952f65c658901ecfcfbbc37645f5fdb
>-SIZE (xpi/firefox-i18n-56.0.2/mai.xpi) = 524702
>-SHA256 (xpi/firefox-i18n-56.0.2/mk.xpi) = e537b92b6af439a1c1b9e667939f146b7a2ad17eae3d4f9075d1ad70bb958b0f
>-SIZE (xpi/firefox-i18n-56.0.2/mk.xpi) = 507818
>-SHA256 (xpi/firefox-i18n-56.0.2/ml.xpi) = 5714a5481f111e1467a596973c824e9d09cb1e464cc74c332582d5079b495efd
>-SIZE (xpi/firefox-i18n-56.0.2/ml.xpi) = 547547
>-SHA256 (xpi/firefox-i18n-56.0.2/mr.xpi) = 2993e10fa67e526691859805b5bf928be5607d59ceedbbb7aa68962688fa6723
>-SIZE (xpi/firefox-i18n-56.0.2/mr.xpi) = 536673
>-SHA256 (xpi/firefox-i18n-56.0.2/ms.xpi) = 7b4a6353a3b2e6e2fc923dc43191c0bc463aeacc9d9eaadb032f93f00376b6df
>-SIZE (xpi/firefox-i18n-56.0.2/ms.xpi) = 466107
>-SHA256 (xpi/firefox-i18n-56.0.2/my.xpi) = 9ef461ae9ec46bc6198456411232ed37a0ed68f11d4bc587d2b8b4d8247868d5
>-SIZE (xpi/firefox-i18n-56.0.2/my.xpi) = 536722
>-SHA256 (xpi/firefox-i18n-56.0.2/nb-NO.xpi) = ee407654fbfad2523ec72fc921b9072772bacc231636b460ac239c406a43132f
>-SIZE (xpi/firefox-i18n-56.0.2/nb-NO.xpi) = 465575
>-SHA256 (xpi/firefox-i18n-56.0.2/nl.xpi) = bbba1d13636b0f03868d202893eb995f3112a56ac2453bbdde6b8fb856fe49b1
>-SIZE (xpi/firefox-i18n-56.0.2/nl.xpi) = 469053
>-SHA256 (xpi/firefox-i18n-56.0.2/nn-NO.xpi) = 8120d52f0e9a0ecd870a0ea0d3b887df12b129d3bfda7c83f09e4036907d08e6
>-SIZE (xpi/firefox-i18n-56.0.2/nn-NO.xpi) = 466208
>-SHA256 (xpi/firefox-i18n-56.0.2/or.xpi) = 325acd5539ec48f65320ff0f5768fbdced82c788750f7c0cd00bf2a264751e32
>-SIZE (xpi/firefox-i18n-56.0.2/or.xpi) = 518165
>-SHA256 (xpi/firefox-i18n-56.0.2/pa-IN.xpi) = 2e3bcfc268606f1496226ca549df40e9c6b8b9f972cdd7f84d4d5c4b32173294
>-SIZE (xpi/firefox-i18n-56.0.2/pa-IN.xpi) = 509046
>-SHA256 (xpi/firefox-i18n-56.0.2/pl.xpi) = c6123361207e67bfd6f859c65c369fa0b22561fbb46b548d9b322433f209a712
>-SIZE (xpi/firefox-i18n-56.0.2/pl.xpi) = 377524
>-SHA256 (xpi/firefox-i18n-56.0.2/pt-BR.xpi) = 3a45de0fd1d0b18123e4f97de1de8f57c043a8c621a02f5267643fc5fb12c8bf
>-SIZE (xpi/firefox-i18n-56.0.2/pt-BR.xpi) = 470954
>-SHA256 (xpi/firefox-i18n-56.0.2/pt-PT.xpi) = b8412464435c2e3c79017bc7ecc6b7b7d7715b1b47d0ca5f6e7c320d2c2b87d1
>-SIZE (xpi/firefox-i18n-56.0.2/pt-PT.xpi) = 472803
>-SHA256 (xpi/firefox-i18n-56.0.2/rm.xpi) = 2054926b1f43459aa857234466b686553555e2afc2e6072ef3883f28b2ebc676
>-SIZE (xpi/firefox-i18n-56.0.2/rm.xpi) = 467019
>-SHA256 (xpi/firefox-i18n-56.0.2/ro.xpi) = d69ce50c34f429d4a6724b4b8d954bb3f78e5a7fb42302c2e9de9e5f870c4e0e
>-SIZE (xpi/firefox-i18n-56.0.2/ro.xpi) = 470785
>-SHA256 (xpi/firefox-i18n-56.0.2/ru.xpi) = 2339cce445c2c01de77fd89079c121301dfcc082f9f8e3b0f640d0f42a648cac
>-SIZE (xpi/firefox-i18n-56.0.2/ru.xpi) = 541437
>-SHA256 (xpi/firefox-i18n-56.0.2/si.xpi) = 79c3fa18f421923b48505b74e39cd4fab474685584bb5daf71f41ebd8a388402
>-SIZE (xpi/firefox-i18n-56.0.2/si.xpi) = 515921
>-SHA256 (xpi/firefox-i18n-56.0.2/sk.xpi) = 0292ae81d9ae0af15489b2b420f3156cb2f7266cd881deaa4c9e164c987271c7
>-SIZE (xpi/firefox-i18n-56.0.2/sk.xpi) = 495563
>-SHA256 (xpi/firefox-i18n-56.0.2/sl.xpi) = bea8af482218c1bfde800e3461f64d008b46b1419745127fe838a29724098b5f
>-SIZE (xpi/firefox-i18n-56.0.2/sl.xpi) = 473806
>-SHA256 (xpi/firefox-i18n-56.0.2/son.xpi) = 6f93b52c42355adafc0778516defce16af99a17ee41ec0d25003ab39bfc6dda1
>-SIZE (xpi/firefox-i18n-56.0.2/son.xpi) = 464322
>-SHA256 (xpi/firefox-i18n-56.0.2/sq.xpi) = 867d12980a8d3ee7ae28faa4f09f63ed405f9ea18b6c0c776da8194ecda937ed
>-SIZE (xpi/firefox-i18n-56.0.2/sq.xpi) = 479511
>-SHA256 (xpi/firefox-i18n-56.0.2/sr.xpi) = b300ada0279186be68dbf292d41d446828acc71e3dcca94cf88a2ef34b38abc9
>-SIZE (xpi/firefox-i18n-56.0.2/sr.xpi) = 504487
>-SHA256 (xpi/firefox-i18n-56.0.2/sv-SE.xpi) = 0ccdf643e1f62ff1e41ceb3fe9c35191aece0efcbfc6b24293f88f7ef1d55043
>-SIZE (xpi/firefox-i18n-56.0.2/sv-SE.xpi) = 473949
>-SHA256 (xpi/firefox-i18n-56.0.2/ta.xpi) = 0186d38239a9db92394562eb70a6960eeeee052abce62bc3672c8644a37cb859
>-SIZE (xpi/firefox-i18n-56.0.2/ta.xpi) = 530646
>-SHA256 (xpi/firefox-i18n-56.0.2/te.xpi) = 789359330bdfefb1fc379582b098c040cdb6a46f770e2c80b1695a7eb634db40
>-SIZE (xpi/firefox-i18n-56.0.2/te.xpi) = 549585
>-SHA256 (xpi/firefox-i18n-56.0.2/th.xpi) = abeb0f7ff018d44efbcea4cba5c0c62a78f42f6395ea1535f757f2045064c880
>-SIZE (xpi/firefox-i18n-56.0.2/th.xpi) = 520297
>-SHA256 (xpi/firefox-i18n-56.0.2/tr.xpi) = b3798722e3a732e422a1fbff8d1c9ca7716b3fe9b2f21cc219432ec998556e26
>-SIZE (xpi/firefox-i18n-56.0.2/tr.xpi) = 480549
>-SHA256 (xpi/firefox-i18n-56.0.2/uk.xpi) = 6854f076f5ef93e72a4f38f03a8dadc61e3a2f8afa402783bbd00bcc63b6f14f
>-SIZE (xpi/firefox-i18n-56.0.2/uk.xpi) = 535436
>-SHA256 (xpi/firefox-i18n-56.0.2/ur.xpi) = 01a4d64725be568e148d88dab405545f76a24a695d499a236a2be0599489324a
>-SIZE (xpi/firefox-i18n-56.0.2/ur.xpi) = 527354
>-SHA256 (xpi/firefox-i18n-56.0.2/uz.xpi) = 79092d2f830adbf05cc884aa014fa9348e3449fa206cf91286d5bfb40ebe729c
>-SIZE (xpi/firefox-i18n-56.0.2/uz.xpi) = 475101
>-SHA256 (xpi/firefox-i18n-56.0.2/vi.xpi) = 65633b00c1a124a23bfda2bdb7666ab8e12e113c956930cc975f838e3de04038
>-SIZE (xpi/firefox-i18n-56.0.2/vi.xpi) = 487150
>-SHA256 (xpi/firefox-i18n-56.0.2/xh.xpi) = af99554dc838c042310acbb0a7c2623d61ff3b3045667cf301cffeb29821c008
>-SIZE (xpi/firefox-i18n-56.0.2/xh.xpi) = 477838
>-SHA256 (xpi/firefox-i18n-56.0.2/zh-CN.xpi) = f2a1bb04222fbca3845b00694342a74c8d54cbf1a64104d96f1856879aed0abf
>-SIZE (xpi/firefox-i18n-56.0.2/zh-CN.xpi) = 498979
>-SHA256 (xpi/firefox-i18n-56.0.2/zh-TW.xpi) = 8c547d631522048d060be5305c277024e8038386dcad232ed742b1edf14a9471
>-SIZE (xpi/firefox-i18n-56.0.2/zh-TW.xpi) = 497765
>+TIMESTAMP = 1509661783
>+SHA256 (xpi/firefox-i18n-57.0b14/ach.xpi) = 4143dd4c8f1498c1068340a18bb53d451861777d8b193c4a00c0f2a82e3b3dc9
>+SIZE (xpi/firefox-i18n-57.0b14/ach.xpi) = 441111
>+SHA256 (xpi/firefox-i18n-57.0b14/af.xpi) = d7c883df3e0b089b6a88cbe968545810ee44b46b899c51a63beca2002ae4278e
>+SIZE (xpi/firefox-i18n-57.0b14/af.xpi) = 442206
>+SHA256 (xpi/firefox-i18n-57.0b14/an.xpi) = 862a491353b1170cdfc03056d16d89ba933b05a16494d697640d37809dd7b611
>+SIZE (xpi/firefox-i18n-57.0b14/an.xpi) = 462778
>+SHA256 (xpi/firefox-i18n-57.0b14/ar.xpi) = d9b4822ea9cf91376b07c20d3f3a8ea5dc3efd845ee360a094fa6aecd8e1569b
>+SIZE (xpi/firefox-i18n-57.0b14/ar.xpi) = 488160
>+SHA256 (xpi/firefox-i18n-57.0b14/as.xpi) = 28a31ba5ac4ca2614a40ee1778ddd52f8149f5af0fc1232f3364a863397a5e2a
>+SIZE (xpi/firefox-i18n-57.0b14/as.xpi) = 491075
>+SHA256 (xpi/firefox-i18n-57.0b14/ast.xpi) = e330b60a178a78f758c07b49d07c7d64dbe6052ca9f57494fb6b4133cc4493ea
>+SIZE (xpi/firefox-i18n-57.0b14/ast.xpi) = 455503
>+SHA256 (xpi/firefox-i18n-57.0b14/az.xpi) = 41a576be5f61c904e16eb85ba7ed3b43cb303aa8d92a8c4db501d7031b51dcbc
>+SIZE (xpi/firefox-i18n-57.0b14/az.xpi) = 466042
>+SHA256 (xpi/firefox-i18n-57.0b14/be.xpi) = 040a97cacb6f862aa083477daeb03066acefb80d2c39643c429db7fc86b35af0
>+SIZE (xpi/firefox-i18n-57.0b14/be.xpi) = 516091
>+SHA256 (xpi/firefox-i18n-57.0b14/bg.xpi) = f2e088e0b957e21d20058def0968b3f612e92fc6748e12804fb3cad434c2744a
>+SIZE (xpi/firefox-i18n-57.0b14/bg.xpi) = 510351
>+SHA256 (xpi/firefox-i18n-57.0b14/bn-BD.xpi) = d0597bfba7a74826ff39b29a6afcf4cf501bd45f1dea9b8994a3e2ab55d7da29
>+SIZE (xpi/firefox-i18n-57.0b14/bn-BD.xpi) = 527188
>+SHA256 (xpi/firefox-i18n-57.0b14/bn-IN.xpi) = c96414b7a3b435496b579716ac424183c391641a7fed52a5ee5e5e5cd26dd658
>+SIZE (xpi/firefox-i18n-57.0b14/bn-IN.xpi) = 516175
>+SHA256 (xpi/firefox-i18n-57.0b14/br.xpi) = 29989f17835e1cbde31eec06250a686a0afad364e19990f5c247b8854918d19e
>+SIZE (xpi/firefox-i18n-57.0b14/br.xpi) = 451865
>+SHA256 (xpi/firefox-i18n-57.0b14/bs.xpi) = 7729e6ac4e5a593f06e551dc8df1bcf4e1a4ca3c6ce075b0f7a876d2155e75d5
>+SIZE (xpi/firefox-i18n-57.0b14/bs.xpi) = 459649
>+SHA256 (xpi/firefox-i18n-57.0b14/ca.xpi) = 72cf63ab33280e455a23953b6f44fd39e05a2a0b0c1b7ec411a58479f5891f5d
>+SIZE (xpi/firefox-i18n-57.0b14/ca.xpi) = 466641
>+SHA256 (xpi/firefox-i18n-57.0b14/cak.xpi) = 37b1da6176fbe95a601990779a5e12a62e21be5581fba8b89b4c7f291de1bc93
>+SIZE (xpi/firefox-i18n-57.0b14/cak.xpi) = 475933
>+SHA256 (xpi/firefox-i18n-57.0b14/cs.xpi) = e70cf6f9088429381e7f699082830b4fcf1d9f90cda9f7fc6cc7d252a13865f0
>+SIZE (xpi/firefox-i18n-57.0b14/cs.xpi) = 469457
>+SHA256 (xpi/firefox-i18n-57.0b14/cy.xpi) = be8d2dd58bbac5cb22fd580a2200aa55e06d05e5744fd10bcd9af1f1b99f9f16
>+SIZE (xpi/firefox-i18n-57.0b14/cy.xpi) = 455788
>+SHA256 (xpi/firefox-i18n-57.0b14/da.xpi) = 5d6d82bba701b8e0a8a13d8f8cd935c5e65ea27a2065d13850f21a87818c5792
>+SIZE (xpi/firefox-i18n-57.0b14/da.xpi) = 448416
>+SHA256 (xpi/firefox-i18n-57.0b14/de.xpi) = f5a3151789e3cf6a11d0813617111b033aa22dc94f37f4614a5c641910e2e0b9
>+SIZE (xpi/firefox-i18n-57.0b14/de.xpi) = 460812
>+SHA256 (xpi/firefox-i18n-57.0b14/dsb.xpi) = 5533762bcafc1d9eb66859cc672026f71928f1a39a6edc4dc5d953bfb8503dc1
>+SIZE (xpi/firefox-i18n-57.0b14/dsb.xpi) = 479506
>+SHA256 (xpi/firefox-i18n-57.0b14/el.xpi) = d130b349798aaecf77256d1b0e6defec7a4f9e4c0fca328ed6a927ec67a82371
>+SIZE (xpi/firefox-i18n-57.0b14/el.xpi) = 534483
>+SHA256 (xpi/firefox-i18n-57.0b14/en-GB.xpi) = be6683eca735c7436f55e46e7fa0b127899ade9bed2f8d1e55618ad84377b761
>+SIZE (xpi/firefox-i18n-57.0b14/en-GB.xpi) = 435522
>+SHA256 (xpi/firefox-i18n-57.0b14/en-US.xpi) = 629fd830ad4a5261391aa0a380f4c9e1dc63d2dfb539d9ae3a603b7650573eb5
>+SIZE (xpi/firefox-i18n-57.0b14/en-US.xpi) = 437987
>+SHA256 (xpi/firefox-i18n-57.0b14/en-ZA.xpi) = 712a6476d7aec9001fad6abbf1b762293222b9eb51f184219118dfb0a3499d52
>+SIZE (xpi/firefox-i18n-57.0b14/en-ZA.xpi) = 432019
>+SHA256 (xpi/firefox-i18n-57.0b14/eo.xpi) = cbecb22bee240a6166f5accb68e6d3bda10e73e174da18d2e215a8b0f141fefc
>+SIZE (xpi/firefox-i18n-57.0b14/eo.xpi) = 454909
>+SHA256 (xpi/firefox-i18n-57.0b14/es-AR.xpi) = 746599aa83e802c33f70702207feb86405eaef03ec9e0e108d218dbdb0be6df3
>+SIZE (xpi/firefox-i18n-57.0b14/es-AR.xpi) = 462977
>+SHA256 (xpi/firefox-i18n-57.0b14/es-CL.xpi) = 2b52e89b8969db8e890e578060af203ebf74ac8da4af3e2729aa33f3ccf9d885
>+SIZE (xpi/firefox-i18n-57.0b14/es-CL.xpi) = 465513
>+SHA256 (xpi/firefox-i18n-57.0b14/es-ES.xpi) = cab059c1781b8eb87e571531aba3309c7f7c6189158634ca58476e6fbf67b78a
>+SIZE (xpi/firefox-i18n-57.0b14/es-ES.xpi) = 353622
>+SHA256 (xpi/firefox-i18n-57.0b14/es-MX.xpi) = 5f04468bfc960546a7aadc4eca4542a38f7c2d17c0b2492212e8f05f02f9b836
>+SIZE (xpi/firefox-i18n-57.0b14/es-MX.xpi) = 468091
>+SHA256 (xpi/firefox-i18n-57.0b14/et.xpi) = e4bf4e11f1b70d369f9560b011682ac53049578a94137288aed8e19ef1508227
>+SIZE (xpi/firefox-i18n-57.0b14/et.xpi) = 447277
>+SHA256 (xpi/firefox-i18n-57.0b14/eu.xpi) = 0425be3c9b63f2ce4fd15570b7fd5fd18fa86d8da0199e8f6fbb44fffa1aad02
>+SIZE (xpi/firefox-i18n-57.0b14/eu.xpi) = 454671
>+SHA256 (xpi/firefox-i18n-57.0b14/fa.xpi) = 77a79022e5780f4561dc1bf214b823bdffddde4de1b2a3077db5a842c81466e1
>+SIZE (xpi/firefox-i18n-57.0b14/fa.xpi) = 510828
>+SHA256 (xpi/firefox-i18n-57.0b14/ff.xpi) = b641f8af4c189ed9e0621e9b7b75d2cbb57d43723bc7f8748e5f0cb80d245b46
>+SIZE (xpi/firefox-i18n-57.0b14/ff.xpi) = 454015
>+SHA256 (xpi/firefox-i18n-57.0b14/fi.xpi) = 4a3542af71583e4926bd723715c1942451ab177566ae0a679679dbad907004a4
>+SIZE (xpi/firefox-i18n-57.0b14/fi.xpi) = 446243
>+SHA256 (xpi/firefox-i18n-57.0b14/fr.xpi) = 27d7b1bab9c19b9a4bf17af4cf6ce400af111370c30645cb1325b1ae3288d6f0
>+SIZE (xpi/firefox-i18n-57.0b14/fr.xpi) = 472721
>+SHA256 (xpi/firefox-i18n-57.0b14/fy-NL.xpi) = c4f2e43e338555d47c22c897cfa02c0ce47082feab17d050e3e84a6e1186b028
>+SIZE (xpi/firefox-i18n-57.0b14/fy-NL.xpi) = 465241
>+SHA256 (xpi/firefox-i18n-57.0b14/ga-IE.xpi) = aafd5de5e8ce591d6f23fa1bd2fd6025056b939a16cf4f520d20f86e3d043ab4
>+SIZE (xpi/firefox-i18n-57.0b14/ga-IE.xpi) = 475961
>+SHA256 (xpi/firefox-i18n-57.0b14/gd.xpi) = f6bde4118b14b0336c31e6baa670ddfb6ac27615fc69a97f64932c9bb1b5cec8
>+SIZE (xpi/firefox-i18n-57.0b14/gd.xpi) = 465122
>+SHA256 (xpi/firefox-i18n-57.0b14/gl.xpi) = bc69b36cd604e3cd7d0ac2392f31d17c4fcb1220eeb06fc5e46fceee0974f4fa
>+SIZE (xpi/firefox-i18n-57.0b14/gl.xpi) = 452030
>+SHA256 (xpi/firefox-i18n-57.0b14/gn.xpi) = 13aa972d3efc44a94144954af13dcef51cc26503d907847f3dcfb5dc18080b64
>+SIZE (xpi/firefox-i18n-57.0b14/gn.xpi) = 471955
>+SHA256 (xpi/firefox-i18n-57.0b14/gu-IN.xpi) = 505711d1fb461a3990ca819f31ed56c5d545f7f663f4cd1deb457defafee452b
>+SIZE (xpi/firefox-i18n-57.0b14/gu-IN.xpi) = 511988
>+SHA256 (xpi/firefox-i18n-57.0b14/he.xpi) = 4bb2134cdc37649e661f0b6e21ef6b89c4eb12a91458b03a00e416acdceca7eb
>+SIZE (xpi/firefox-i18n-57.0b14/he.xpi) = 471921
>+SHA256 (xpi/firefox-i18n-57.0b14/hi-IN.xpi) = 64d6bd79b494d60b93cf9ac466a50f6a276e7eeea50535e550686073f60ee948
>+SIZE (xpi/firefox-i18n-57.0b14/hi-IN.xpi) = 526108
>+SHA256 (xpi/firefox-i18n-57.0b14/hr.xpi) = 00d946df46cf846260e72f45288dc368f622bcc64a483acf065c5442ff0e21cd
>+SIZE (xpi/firefox-i18n-57.0b14/hr.xpi) = 460721
>+SHA256 (xpi/firefox-i18n-57.0b14/hsb.xpi) = 94bf6a497b1d8a98b860a4e3f6d2a1a0acf6223e723fb04982aaf8972de06d50
>+SIZE (xpi/firefox-i18n-57.0b14/hsb.xpi) = 476500
>+SHA256 (xpi/firefox-i18n-57.0b14/hu.xpi) = 7e9c5f4ebd6ba1e43c098b941aaebb0c0f42fc7cbc4f104381227350f9763a5c
>+SIZE (xpi/firefox-i18n-57.0b14/hu.xpi) = 476604
>+SHA256 (xpi/firefox-i18n-57.0b14/hy-AM.xpi) = 7e25177e892aa15e0ae6c621a3e714aaa5b85f187f87469574d68d7aa83056f8
>+SIZE (xpi/firefox-i18n-57.0b14/hy-AM.xpi) = 510824
>+SHA256 (xpi/firefox-i18n-57.0b14/id.xpi) = 284b1471552e9aba9f2af967b1fca1b66eebc0fd193cd785c11ed8fe8e79dd5a
>+SIZE (xpi/firefox-i18n-57.0b14/id.xpi) = 444041
>+SHA256 (xpi/firefox-i18n-57.0b14/is.xpi) = 6d2740ccf0d9807b597aa8e186817024428df88bf3042af31f7d6f30895ac93b
>+SIZE (xpi/firefox-i18n-57.0b14/is.xpi) = 452656
>+SHA256 (xpi/firefox-i18n-57.0b14/it.xpi) = 64c19d0b7a5d2cde4b8f51775f9eba663620802bfea9362d756759dacc0a8dd2
>+SIZE (xpi/firefox-i18n-57.0b14/it.xpi) = 347171
>+SHA256 (xpi/firefox-i18n-57.0b14/ja.xpi) = 8378b1cd9524b24a38748b1b1364b3693cf0432f9cc3e139052fac07c1d5f7a0
>+SIZE (xpi/firefox-i18n-57.0b14/ja.xpi) = 508551
>+SHA256 (xpi/firefox-i18n-57.0b14/ka.xpi) = 827dd9b541ef105a2a18c1dc1663d347de9592c3fc25c504196b668e92a635d5
>+SIZE (xpi/firefox-i18n-57.0b14/ka.xpi) = 492356
>+SHA256 (xpi/firefox-i18n-57.0b14/kab.xpi) = 29aa3e594504ad269429232d69ba03bd3e34de1dbe05879b97d8a555be3aabd8
>+SIZE (xpi/firefox-i18n-57.0b14/kab.xpi) = 462530
>+SHA256 (xpi/firefox-i18n-57.0b14/kk.xpi) = e43fc5cd321f71307cddd4c8862957bf4353ec4299acbf407f784b6030dcf884
>+SIZE (xpi/firefox-i18n-57.0b14/kk.xpi) = 519248
>+SHA256 (xpi/firefox-i18n-57.0b14/km.xpi) = 5246f724bf7d6a2b043028f56cfb08f7aa4f8e8f0ccdac819c4c8aa041b805f2
>+SIZE (xpi/firefox-i18n-57.0b14/km.xpi) = 530080
>+SHA256 (xpi/firefox-i18n-57.0b14/kn.xpi) = a0575d21a53347d65b0e03aff31f2df1dbc64b1013885c8e0e6fb460264d4d19
>+SIZE (xpi/firefox-i18n-57.0b14/kn.xpi) = 531316
>+SHA256 (xpi/firefox-i18n-57.0b14/ko.xpi) = 98969006fa1da02452a57ab2904a359114dc5ee36e79fd8e76a90ebdf6c511dc
>+SIZE (xpi/firefox-i18n-57.0b14/ko.xpi) = 487305
>+SHA256 (xpi/firefox-i18n-57.0b14/lij.xpi) = 96280b88461e4c30f118cc1c85962ae3ace203d6d5d3dbf84cc97854c133b3c1
>+SIZE (xpi/firefox-i18n-57.0b14/lij.xpi) = 452340
>+SHA256 (xpi/firefox-i18n-57.0b14/lt.xpi) = 2d6251cf9fb4b3a435fca5195031788608834bc8c0b1dff8f39cb86f4a892fb2
>+SIZE (xpi/firefox-i18n-57.0b14/lt.xpi) = 474955
>+SHA256 (xpi/firefox-i18n-57.0b14/lv.xpi) = 7e22d67417e8bffcee9f78fba2fa8e8388b1cae7a3bf52d3edb4bdca983d1c9a
>+SIZE (xpi/firefox-i18n-57.0b14/lv.xpi) = 465242
>+SHA256 (xpi/firefox-i18n-57.0b14/mai.xpi) = 6219e7c025fdf3d55e78f7919892490d980f79fe83607fcc19eb41fb7ca008d9
>+SIZE (xpi/firefox-i18n-57.0b14/mai.xpi) = 507395
>+SHA256 (xpi/firefox-i18n-57.0b14/mk.xpi) = c2b7f863c43c65f693e54c3640e7e884bb9bc7afbd19dddc7329190e78820fe3
>+SIZE (xpi/firefox-i18n-57.0b14/mk.xpi) = 490853
>+SHA256 (xpi/firefox-i18n-57.0b14/ml.xpi) = 5cde4795de8ac98c41c73ae77e8d689f5ecad381f3bad697c2a9ab0ee9b6c7c3
>+SIZE (xpi/firefox-i18n-57.0b14/ml.xpi) = 528255
>+SHA256 (xpi/firefox-i18n-57.0b14/mr.xpi) = 6ee7db03c2aa3d8c644e06d97ace9892b8962a67b6bdcc803d5259c7266fb81c
>+SIZE (xpi/firefox-i18n-57.0b14/mr.xpi) = 521289
>+SHA256 (xpi/firefox-i18n-57.0b14/ms.xpi) = d49ee8cb99e372e87e76f1fbe5cf88a8cd97cfef18df5c17b2c84d6e012bb371
>+SIZE (xpi/firefox-i18n-57.0b14/ms.xpi) = 451255
>+SHA256 (xpi/firefox-i18n-57.0b14/my.xpi) = 8b9cbb4bc8e7dec11a30187acf7f74568249324afd7cc9587e8f3e489ccb1088
>+SIZE (xpi/firefox-i18n-57.0b14/my.xpi) = 517703
>+SHA256 (xpi/firefox-i18n-57.0b14/nb-NO.xpi) = eab3c5ff9b2f766f9d060f134db878a3f90e60f0f5af93cce7d20053e02dcf98
>+SIZE (xpi/firefox-i18n-57.0b14/nb-NO.xpi) = 451557
>+SHA256 (xpi/firefox-i18n-57.0b14/nl.xpi) = 8fe3661b1c670aedc572413265e43b2b778ab1169ff7d909f72b3526e8bee9b3
>+SIZE (xpi/firefox-i18n-57.0b14/nl.xpi) = 457660
>+SHA256 (xpi/firefox-i18n-57.0b14/nn-NO.xpi) = 6bebf53336be5931ecbb974984f1ecf975fa839932ee2154545d36818fbc6ead
>+SIZE (xpi/firefox-i18n-57.0b14/nn-NO.xpi) = 452004
>+SHA256 (xpi/firefox-i18n-57.0b14/or.xpi) = cf835b40936e1f65915af8affb889264a3246c457a4f2406976356af6e82497f
>+SIZE (xpi/firefox-i18n-57.0b14/or.xpi) = 500864
>+SHA256 (xpi/firefox-i18n-57.0b14/pa-IN.xpi) = b53b98ed699ecf0dbb5172116bbbf68d611d818833d5cfc0b67e98b4a341cad1
>+SIZE (xpi/firefox-i18n-57.0b14/pa-IN.xpi) = 495270
>+SHA256 (xpi/firefox-i18n-57.0b14/pl.xpi) = 3c53b9b2932e1a9a55914e6da1ade67fbe437178c78adc8b1e83d2afe19eee70
>+SIZE (xpi/firefox-i18n-57.0b14/pl.xpi) = 364229
>+SHA256 (xpi/firefox-i18n-57.0b14/pt-BR.xpi) = 2c79edce22017cd09b45039011a7bd427f9b632f152403fe2c362474bc6987ae
>+SIZE (xpi/firefox-i18n-57.0b14/pt-BR.xpi) = 456483
>+SHA256 (xpi/firefox-i18n-57.0b14/pt-PT.xpi) = bcc15d172bcc6594f12a95d5e0ad210ca03d1947a1c9250e5ac8d01fb9562349
>+SIZE (xpi/firefox-i18n-57.0b14/pt-PT.xpi) = 459996
>+SHA256 (xpi/firefox-i18n-57.0b14/rm.xpi) = 1c955b1a7652c54d8de0acce6901b7537fbb35744cea508e1c9724413c4735db
>+SIZE (xpi/firefox-i18n-57.0b14/rm.xpi) = 451057
>+SHA256 (xpi/firefox-i18n-57.0b14/ro.xpi) = 1f54012df54b2b9f0c99f1a33bed7b20cd987c1f5ada0f1ae9d8b3eaf453fa92
>+SIZE (xpi/firefox-i18n-57.0b14/ro.xpi) = 455510
>+SHA256 (xpi/firefox-i18n-57.0b14/ru.xpi) = 3f8b4c24e8c6bce98ef19062fdb0872709c8686d2b87f2d6f9cb385e61382ce9
>+SIZE (xpi/firefox-i18n-57.0b14/ru.xpi) = 527005
>+SHA256 (xpi/firefox-i18n-57.0b14/si.xpi) = 94385e7462a2baf65244192835238ad1ca8c0951b70d44ce696e7536687b99c9
>+SIZE (xpi/firefox-i18n-57.0b14/si.xpi) = 498324
>+SHA256 (xpi/firefox-i18n-57.0b14/sk.xpi) = 5030989bf92542d66a1b77bdccf93425b06e8793220c9a1f4515925779106598
>+SIZE (xpi/firefox-i18n-57.0b14/sk.xpi) = 480396
>+SHA256 (xpi/firefox-i18n-57.0b14/sl.xpi) = 17cc487e111ca8b540bd52c19f94921045d2eb9f3c79e7e61a425862d61fb00c
>+SIZE (xpi/firefox-i18n-57.0b14/sl.xpi) = 459376
>+SHA256 (xpi/firefox-i18n-57.0b14/son.xpi) = 6fa42e977fe73ab7f5ba40dd365e0c7f27b05aeb4653994bfaa5ef589675fca9
>+SIZE (xpi/firefox-i18n-57.0b14/son.xpi) = 450928
>+SHA256 (xpi/firefox-i18n-57.0b14/sq.xpi) = e9c498badc80686e129fde96a219136032591c5e684e9c56bd16a8ab42c2a4a7
>+SIZE (xpi/firefox-i18n-57.0b14/sq.xpi) = 465051
>+SHA256 (xpi/firefox-i18n-57.0b14/sr.xpi) = c4bcb077337d06aa384db2b856b0bb60aed54ec990ed9f389c9bdecd296538af
>+SIZE (xpi/firefox-i18n-57.0b14/sr.xpi) = 487003
>+SHA256 (xpi/firefox-i18n-57.0b14/sv-SE.xpi) = 598d4ae8a3b58561fbb558824d098e6989de371796e48a59486cd15b823c09d0
>+SIZE (xpi/firefox-i18n-57.0b14/sv-SE.xpi) = 459663
>+SHA256 (xpi/firefox-i18n-57.0b14/ta.xpi) = 6733c475f1b07cc2d8a420b1c5cdf185ab4c43270957ec48b9afab208ab205d5
>+SIZE (xpi/firefox-i18n-57.0b14/ta.xpi) = 513225
>+SHA256 (xpi/firefox-i18n-57.0b14/te.xpi) = 77b27d2a0cbb23eb07de9b0350dd1d391598e03eedb41c85cbe8fc91e7c2f6ba
>+SIZE (xpi/firefox-i18n-57.0b14/te.xpi) = 530692
>+SHA256 (xpi/firefox-i18n-57.0b14/th.xpi) = 6e28fca8a0a21a0462d40580edde49acffdce5c6019c283890d3b98f9713ab20
>+SIZE (xpi/firefox-i18n-57.0b14/th.xpi) = 502451
>+SHA256 (xpi/firefox-i18n-57.0b14/tr.xpi) = 6fe0e5675be4d50d750e99b514027b3e1e9875a489fd8fb9b2d9764311f03b04
>+SIZE (xpi/firefox-i18n-57.0b14/tr.xpi) = 465580
>+SHA256 (xpi/firefox-i18n-57.0b14/uk.xpi) = e0ffffea97fbd62db2754fb5ab91218ab68f1695e1c4778dd3c481d6f8ea7db0
>+SIZE (xpi/firefox-i18n-57.0b14/uk.xpi) = 518138
>+SHA256 (xpi/firefox-i18n-57.0b14/ur.xpi) = a8439c206c43c2567988148dcca14265e2f21e52e35b66400f1b54a071dd2964
>+SIZE (xpi/firefox-i18n-57.0b14/ur.xpi) = 511133
>+SHA256 (xpi/firefox-i18n-57.0b14/uz.xpi) = 9082bc671556d950ad11ac96482c03f658455fe3f985d0e985357f3e342c0461
>+SIZE (xpi/firefox-i18n-57.0b14/uz.xpi) = 461694
>+SHA256 (xpi/firefox-i18n-57.0b14/vi.xpi) = d29df71118ca2688de28641b953d239d0095eac62981f71c9f4dddbbae1e8db6
>+SIZE (xpi/firefox-i18n-57.0b14/vi.xpi) = 471320
>+SHA256 (xpi/firefox-i18n-57.0b14/xh.xpi) = fc747e21dd3e555c5470622abf3d407bad94d40da360f5a4db12a9750f1f651d
>+SIZE (xpi/firefox-i18n-57.0b14/xh.xpi) = 464461
>+SHA256 (xpi/firefox-i18n-57.0b14/zh-CN.xpi) = 095b4fdff9ddbb4afcec3bac1f56858b919303bd6e9d7815dc120a012830adf6
>+SIZE (xpi/firefox-i18n-57.0b14/zh-CN.xpi) = 483625
>+SHA256 (xpi/firefox-i18n-57.0b14/zh-TW.xpi) = 5da62d2fc2e78d0aed66083d270d05df53fb6e292679dea58e2302308f5e7abd
>+SIZE (xpi/firefox-i18n-57.0b14/zh-TW.xpi) = 482346
>diff --git a/www/firefox/Makefile b/www/firefox/Makefile
>index 5c19cd951bf7..4db0cce08147 100644
>--- a/www/firefox/Makefile
>+++ b/www/firefox/Makefile
>@@ -2,9 +2,8 @@
> # $FreeBSD$
> 
> PORTNAME=	firefox
>-DISTVERSION=	56.0.2
>+DISTVERSION=	57.0b14
> DISTVERSIONSUFFIX=.source
>-PORTREVISION=	5
> PORTEPOCH=	1
> CATEGORIES=	www ipv6
> MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
>@@ -13,16 +12,16 @@ MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
> MAINTAINER=	gecko@FreeBSD.org
> COMMENT=	Web browser based on the browser portion of Mozilla
> 
>-BUILD_DEPENDS=	nspr>=4.16:devel/nspr \
>-		nss>=3.32.1:security/nss \
>+BUILD_DEPENDS=	nspr>=4.17:devel/nspr \
>+		nss>=3.33:security/nss \
> 		icu>=59.1,1:devel/icu \
> 		libevent>=2.1.8:devel/libevent \
>-		harfbuzz>=1.4.7:print/harfbuzz \
>+		harfbuzz>=1.5.1:print/harfbuzz \
> 		graphite2>=1.3.10:graphics/graphite2 \
> 		png>=1.6.31:graphics/png \
> 		libvorbis>=1.3.5,3:audio/libvorbis \
> 		libvpx>=1.5.0:multimedia/libvpx \
>-		sqlite3>=3.19.3:databases/sqlite3 \
>+		sqlite3>=3.20.1:databases/sqlite3 \
> 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
> 		v4l_compat>0:multimedia/v4l_compat \
> 		autoconf-2.13:devel/autoconf213 \
>diff --git a/www/firefox/distinfo b/www/firefox/distinfo
>index 1294136080e5..d6b060b26e3b 100644
>--- a/www/firefox/distinfo
>+++ b/www/firefox/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1508873487
>-SHA256 (firefox-56.0.2.source.tar.xz) = 6f7d284c31383a9860d7b52f05f866526d5a7c31e3ef2959d79122ba074f5ca1
>-SIZE (firefox-56.0.2.source.tar.xz) = 255658916
>+TIMESTAMP = 1509661783
>+SHA256 (firefox-57.0b14.source.tar.xz) = 1a94235f4e9783ea0528361d6fc601f8cb3a448eb69bcd0f521aed192e90dd10
>+SIZE (firefox-57.0b14.source.tar.xz) = 250365384
>diff --git a/www/firefox/files/patch-bug1386887 b/www/firefox/files/patch-bug1386887
>deleted file mode 100644
>index 7421a8d84012..000000000000
>--- a/www/firefox/files/patch-bug1386887
>+++ /dev/null
>@@ -1,89 +0,0 @@
>-commit efbe3a9af876
>-Author: Manish Goregaokar <manishearth@gmail.com>
>-Date:   Wed Aug 2 11:24:35 2017 -0700
>-
>-    Bug 1386887 - Clean up FFI lifetimes to work on nightly; r=emilio
>-    
>-    MozReview-Commit-ID: 5WAIVd6p2du
>----
>- layout/style/ServoBindingList.h  | 4 ++--
>- layout/style/ServoBindingTypes.h | 2 ++
>- layout/style/ServoBindings.h     | 4 ++--
>- layout/style/ServoBindings.toml  | 4 +++-
>- 4 files changed, 9 insertions(+), 5 deletions(-)
>-
>-diff --git layout/style/ServoBindingList.h layout/style/ServoBindingList.h
>-index 6c669ebb3d3e..87ade14ea4de 100644
>---- layout/style/ServoBindingList.h
>-+++ layout/style/ServoBindingList.h
>-@@ -379,10 +379,10 @@ SERVO_BINDING_FUNC(Servo_DeclarationBlock_HasCSSWideKeyword, bool,
>-                    nsCSSPropertyID property)
>- // Compose animation value for a given property.
>- // |base_values| is nsRefPtrHashtable<nsUint32HashKey, RawServoAnimationValue>.
>--// We use void* to avoid exposing nsRefPtrHashtable in FFI.
>-+// We use RawServoAnimationValueTableBorrowed to avoid exposing nsRefPtrHashtable in FFI.
>- SERVO_BINDING_FUNC(Servo_AnimationCompose, void,
>-                    RawServoAnimationValueMapBorrowedMut animation_values,
>--                   void* base_values,
>-+                   RawServoAnimationValueTableBorrowed base_values,
>-                    nsCSSPropertyID property,
>-                    RawGeckoAnimationPropertySegmentBorrowed animation_segment,
>-                    RawGeckoAnimationPropertySegmentBorrowed last_segment,
>-diff --git layout/style/ServoBindingTypes.h layout/style/ServoBindingTypes.h
>-index aaf4fc27e1b9..69be15ee9f51 100644
>---- layout/style/ServoBindingTypes.h
>-+++ layout/style/ServoBindingTypes.h
>-@@ -54,6 +54,8 @@ class nsXBLBinding;
>- using mozilla::dom::StyleChildrenIterator;
>- using mozilla::ServoElementSnapshot;
>- 
>-+typedef void* RawServoAnimationValueTableBorrowed;
>-+
>- typedef nsINode RawGeckoNode;
>- typedef mozilla::dom::Element RawGeckoElement;
>- typedef nsIDocument RawGeckoDocument;
>-diff --git layout/style/ServoBindings.h layout/style/ServoBindings.h
>-index 493ca63f932b..c6ced6d1fedb 100644
>---- layout/style/ServoBindings.h
>-+++ layout/style/ServoBindings.h
>-@@ -268,9 +268,9 @@ double Gecko_GetPositionInSegment(
>- // Get servo's AnimationValue for |aProperty| from the cached base style
>- // |aBaseStyles|.
>- // |aBaseStyles| is nsRefPtrHashtable<nsUint32HashKey, RawServoAnimationValue>.
>--// We use void* to avoid exposing nsRefPtrHashtable in FFI.
>-+// We use RawServoAnimationValueTableBorrowed to avoid exposing nsRefPtrHashtable in FFI.
>- RawServoAnimationValueBorrowedOrNull Gecko_AnimationGetBaseStyle(
>--  void* aBaseStyles,
>-+  RawServoAnimationValueTableBorrowed aBaseStyles,
>-   nsCSSPropertyID aProperty);
>- void Gecko_StyleTransition_SetUnsupportedProperty(
>-   mozilla::StyleTransition* aTransition,
>-diff --git layout/style/ServoBindings.toml layout/style/ServoBindings.toml
>-index 11e372541235..3c3902beea80 100644
>---- layout/style/ServoBindings.toml
>-+++ layout/style/ServoBindings.toml
>-@@ -357,6 +357,7 @@ raw-lines = [
>-     "pub type ServoStyleContextBorrowed<'a> = &'a ::properties::ComputedValues;",
>-     "pub type ServoStyleContextBorrowedOrNull<'a> = Option<&'a ::properties::ComputedValues>;",
>-     "pub type ServoComputedDataBorrowed<'a> = &'a ServoComputedData;",
>-+    "pub type RawServoAnimationValueTableBorrowed<'a> = &'a ();"
>- ]
>- whitelist-functions = ["Servo_.*", "Gecko_.*"]
>- structs-types = [
>-@@ -389,7 +390,7 @@ structs-types = [
>-     "RawGeckoPresContext",
>-     "RawGeckoPresContextOwned",
>-     "RawGeckoStyleAnimationList",
>--    "RawGeckoStyleChildrenIteratorBorrowedMut",
>-+    "RawGeckoStyleChildrenIterator",
>-     "RawGeckoServoStyleRuleList",
>-     "RawGeckoURLExtraData",
>-     "RawGeckoXBLBinding",
>-@@ -526,6 +527,7 @@ servo-borrow-types = [
>-     "RawGeckoFontFaceRuleList",
>-     "RawGeckoServoStyleRuleList",
>-     "RawGeckoServoAnimationValueList",
>-+    "RawGeckoStyleChildrenIterator",
>- ]
>- fixups = [
>-     # hack for gecko-owned string
>diff --git a/www/firefox/files/patch-bug1386957 b/www/firefox/files/patch-bug1386957
>deleted file mode 100644
>index 34b38c5c1298..000000000000
>--- a/www/firefox/files/patch-bug1386957
>+++ /dev/null
>@@ -1,14 +0,0 @@
>-https://github.com/kinetiknz/cubeb/commit/16f9ccc064f2
>-
>---- media/libcubeb/src/cubeb_jack.cpp.orig	2017-07-07 05:37:16 UTC
>-+++ media/libcubeb/src/cubeb_jack.cpp
>-@@ -8,7 +8,9 @@
>-  */
>- #define _DEFAULT_SOURCE
>- #define _BSD_SOURCE
>-+#ifndef __FreeBSD__
>- #define _POSIX_SOURCE
>-+#endif
>- #include <dlfcn.h>
>- #include <stdio.h>
>- #include <string.h>
>diff --git a/www/firefox/files/patch-bug1393283 b/www/firefox/files/patch-bug1393283
>deleted file mode 100644
>index 0a4b9327ea2b..000000000000
>--- a/www/firefox/files/patch-bug1393283
>+++ /dev/null
>@@ -1,144 +0,0 @@
>-commit d20c7d929c84
>-Author: Ethan <ettseng@mozilla.com>
>-Date:   Fri Sep 1 17:29:44 2017 +0800
>-
>-    Bug 1393283 - Use the last ESR version as the spoofed Firefox version. r=tihuang, r=mcmanus
>----
>- .../test/browser/browser_navigator.js              |  2 +-
>- netwerk/protocol/http/nsHttpHandler.cpp            | 16 +++----
>- .../resistfingerprinting/nsRFPService.cpp          | 56 ++++++++++++++++++++++
>- .../components/resistfingerprinting/nsRFPService.h |  3 ++
>- 4 files changed, 66 insertions(+), 11 deletions(-)
>-
>-diff --git browser/components/resistfingerprinting/test/browser/browser_navigator.js browser/components/resistfingerprinting/test/browser/browser_navigator.js
>-index 25c393d8bb2a..9f52e34a9451 100644
>---- browser/components/resistfingerprinting/test/browser/browser_navigator.js
>-+++ browser/components/resistfingerprinting/test/browser/browser_navigator.js
>-@@ -91,7 +91,7 @@ add_task(async function setup() {
>- 
>-   let appInfo = Cc["@mozilla.org/xre/app-info;1"].getService(Ci.nsIXULAppInfo);
>-   let appVersion = parseInt(appInfo.version);
>--  let spoofedVersion = appVersion - (appVersion % 10);
>-+  let spoofedVersion = appVersion - ((appVersion - 3) % 7);
>-   spoofedUserAgent = `Mozilla/5.0 (${SPOOFED_OSCPU}; rv:${spoofedVersion}.0) Gecko/20100101 Firefox/${spoofedVersion}.0`;
>- });
>- 
>-diff --git netwerk/protocol/http/nsHttpHandler.cpp netwerk/protocol/http/nsHttpHandler.cpp
>-index 31d0f8832732..b957d835b52f 100644
>---- netwerk/protocol/http/nsHttpHandler.cpp
>-+++ netwerk/protocol/http/nsHttpHandler.cpp
>-@@ -461,16 +461,12 @@ nsHttpHandler::Init()
>-         mAppVersion.AssignLiteral(MOZ_APP_UA_VERSION);
>-     }
>- 
>--    // Generating the spoofed userAgent for fingerprinting resistance.
>--    // The browser version will be rounded down to a multiple of 10.
>--    // By doing so, the anonymity group will cover more versions instead of one
>--    // version.
>--    uint32_t spoofedVersion = mAppVersion.ToInteger(&rv);
>--    if (NS_SUCCEEDED(rv)) {
>--        spoofedVersion = spoofedVersion - (spoofedVersion % 10);
>--        mSpoofedUserAgent.Assign(nsPrintfCString(
>--            "Mozilla/5.0 (%s; rv:%d.0) Gecko/%s Firefox/%d.0",
>--            SPOOFED_OSCPU, spoofedVersion, LEGACY_BUILD_ID, spoofedVersion));
>-+    // Generating the spoofed User Agent for fingerprinting resistance.
>-+    rv = nsRFPService::GetSpoofedUserAgent(mSpoofedUserAgent);
>-+    if (NS_FAILED(rv)) {
>-+      // Empty mSpoofedUserAgent to make sure the unsuccessful spoofed UA string
>-+      // will not be used anywhere.
>-+      mSpoofedUserAgent.Truncate();
>-     }
>- 
>-     mSessionStartTime = NowInSeconds();
>-diff --git toolkit/components/resistfingerprinting/nsRFPService.cpp toolkit/components/resistfingerprinting/nsRFPService.cpp
>-index 94554200c3b8..96a2940c04a0 100644
>---- toolkit/components/resistfingerprinting/nsRFPService.cpp
>-+++ toolkit/components/resistfingerprinting/nsRFPService.cpp
>-@@ -18,10 +18,13 @@
>- #include "nsServiceManagerUtils.h"
>- #include "nsString.h"
>- #include "nsXULAppAPI.h"
>-+#include "nsPrintfCString.h"
>- 
>- #include "nsIObserverService.h"
>- #include "nsIPrefBranch.h"
>- #include "nsIPrefService.h"
>-+#include "nsIXULAppInfo.h"
>-+#include "nsIXULRuntime.h"
>- #include "nsJSUtils.h"
>- 
>- #include "prenv.h"
>-@@ -162,6 +165,59 @@ nsRFPService::GetSpoofedPresentedFrames(double aTime, uint32_t aWidth, uint32_t
>-   return NSToIntFloor(time * sVideoFramesPerSec * ((100 - boundedDroppedRatio) / 100.0));
>- }
>- 
>-+/* static */
>-+nsresult
>-+nsRFPService::GetSpoofedUserAgent(nsACString &userAgent)
>-+{
>-+  // This function generates the spoofed value of User Agent.
>-+  // We spoof the values of the platform and Firefox version, which could be
>-+  // used as fingerprinting sources to identify individuals.
>-+  // Reference of the format of User Agent:
>-+  // https://developer.mozilla.org/en-US/docs/Web/API/NavigatorID/userAgent
>-+  // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/User-Agent
>-+
>-+  nsresult rv;
>-+  nsCOMPtr<nsIXULAppInfo> appInfo =
>-+    do_GetService("@mozilla.org/xre/app-info;1", &rv);
>-+  NS_ENSURE_SUCCESS(rv, rv);
>-+
>-+  nsAutoCString appVersion;
>-+  rv = appInfo->GetVersion(appVersion);
>-+  NS_ENSURE_SUCCESS(rv, rv);
>-+
>-+  // The browser version will be spoofed as the last ESR version.
>-+  // By doing so, the anonymity group will cover more versions instead of one
>-+  // version.
>-+  uint32_t firefoxVersion = appVersion.ToInteger(&rv);
>-+  NS_ENSURE_SUCCESS(rv, rv);
>-+
>-+  // Starting from Firefox 10, Firefox ESR was released once every seven
>-+  // Firefox releases, e.g. Firefox 10, 17, 24, 31, and so on.
>-+  // We infer the last and closest ESR version based on this rule.
>-+  nsCOMPtr<nsIXULRuntime> runtime =
>-+    do_GetService("@mozilla.org/xre/runtime;1", &rv);
>-+  NS_ENSURE_SUCCESS(rv, rv);
>-+
>-+  nsAutoCString updateChannel;
>-+  rv = runtime->GetDefaultUpdateChannel(updateChannel);
>-+  NS_ENSURE_SUCCESS(rv, rv);
>-+
>-+  // If we are running in Firefox ESR, determine whether the formula of ESR
>-+  // version has changed.  Once changed, we must update the formula in this
>-+  // function.
>-+  if (updateChannel.Equals("esr")) {
>-+    MOZ_ASSERT(((firefoxVersion % 7) == 3),
>-+      "Please udpate ESR version formula in nsRFPService.cpp");
>-+  }
>-+
>-+  uint32_t spoofedVersion = firefoxVersion - ((firefoxVersion - 3) % 7);
>-+  userAgent.Assign(nsPrintfCString(
>-+    "Mozilla/5.0 (%s; rv:%d.0) Gecko/%s Firefox/%d.0",
>-+    SPOOFED_OSCPU, spoofedVersion, LEGACY_BUILD_ID, spoofedVersion));
>-+
>-+  return rv;
>-+}
>-+
>- nsresult
>- nsRFPService::Init()
>- {
>-diff --git toolkit/components/resistfingerprinting/nsRFPService.h toolkit/components/resistfingerprinting/nsRFPService.h
>-index cf1f688bb992..bad80383883b 100644
>---- toolkit/components/resistfingerprinting/nsRFPService.h
>-+++ toolkit/components/resistfingerprinting/nsRFPService.h
>-@@ -49,6 +49,9 @@ public:
>-   static uint32_t GetSpoofedDroppedFrames(double aTime, uint32_t aWidth, uint32_t aHeight);
>-   static uint32_t GetSpoofedPresentedFrames(double aTime, uint32_t aWidth, uint32_t aHeight);
>- 
>-+  // This method generates the spoofed value of User Agent.
>-+  static nsresult GetSpoofedUserAgent(nsACString &userAgent);
>-+
>- private:
>-   nsresult Init();
>- 
>diff --git a/www/firefox/files/patch-bug1401573 b/www/firefox/files/patch-bug1401573
>deleted file mode 100644
>index 22fc6f569a59..000000000000
>--- a/www/firefox/files/patch-bug1401573
>+++ /dev/null
>@@ -1,27 +0,0 @@
>-commit d0ed05261f20
>-Author: jason laster <jlaster@mozilla.com>
>-Date:   Wed Sep 20 10:52:54 2017 -0400
>-
>-    Bug 1401573 - Fix PoE, Link, and linux issue. r=nchevobbe
>-    
>-    MozReview-Commit-ID: 35TA6bhW1Wr
>----
>- devtools/client/debugger/new/debugger.js           | 68 +++++++++++++++++-----
>- devtools/client/debugger/new/panel.js              | 27 ++++++++-
>- .../new/test/mochitest/browser_dbg-expressions.js  |  2 +-
>- 3 files changed, 79 insertions(+), 18 deletions(-)
>-
>-diff --git devtools/client/debugger/new/debugger.js devtools/client/debugger/new/debugger.js
>-index f52a3e380ab6..c1213180cb13 100644
>---- devtools/client/debugger/new/debugger.js
>-+++ devtools/client/debugger/new/debugger.js
>-@@ -29493,7 +29493,8 @@ return /******/ (function(modules) { // webpackBootstr
>- 	}
>- 
>- 	function getKeyForOS(os, action) {
>--	  return KEYS[os][action];
>-+         var osActions = KEYS[os] || KEYS.Linux;
>-+         return osActions[action];
>- 	}
>- 
>- 	function formatKey(action) {
>diff --git a/www/firefox/files/patch-bug1409680 b/www/firefox/files/patch-bug1409680
>deleted file mode 100644
>index 37c71ec234b2..000000000000
>--- a/www/firefox/files/patch-bug1409680
>+++ /dev/null
>@@ -1,27 +0,0 @@
>-Bug 1409680 - Extend --disable-debug-symbols to Rust code.
>-
>-This reduces disk I/O and memory usage during build that already lacks
>-debugging symbols from C++ code, allowing to use more jobs on 32bit hosts.
>-
>---disable-debug-symbols build on FreeBSD 10.3 i386 (8 cores) host:
>-Max RSS before:  libxul - 612 Mb, libgkrust - 1908 Mb
>-Max RSS after:   libxul - 444 Mb, libgkrust - 1471 Mb
>-Binary before:   libxul - 203 Mb, libgkrust -  732 Mb
>-Binary after:    libxul - 123 Mb, libgkrust -  301 Mb
>-
>---- config/rules.mk.orig	2017-09-14 20:15:53 UTC
>-+++ config/rules.mk
>-@@ -906,11 +906,13 @@ ifdef MOZ_USING_SCCACHE
>- sccache_wrap := RUSTC_WRAPPER='$(CCACHE)'
>- endif
>- 
>-+ifdef MOZ_DEBUG_SYMBOLS
>- # XXX hack to work around dsymutil failing on cross-OSX builds (bug 1380381)
>- ifeq ($(HOST_OS_ARCH)-$(OS_ARCH),Linux-Darwin)
>- default_rustflags += -C debuginfo=1
>- else
>- default_rustflags += -C debuginfo=2
>-+endif
>- endif
>- 
>- # We use the + prefix to pass down the jobserver fds to cargo, but we
>diff --git a/www/firefox/files/patch-bug847568 b/www/firefox/files/patch-bug847568
>index c2c40cc26b26..ed16b8d7caac 100644
>--- a/www/firefox/files/patch-bug847568
>+++ b/www/firefox/files/patch-bug847568
>@@ -261,7 +261,7 @@ index 9297e4d6f501..d8e273887e4b 100644
> +option('--with-system-harfbuzz',
> +       help="Use system harfbuzz (located with pkgconfig)")
> +
>-+system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 1.4.7',
>++system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 1.5.1',
> +                                    when='--with-system-harfbuzz')
> +
> +set_config('MOZ_SYSTEM_HARFBUZZ', depends_if(system_harfbuzz)(lambda _: True))
>diff --git a/www/firefox/files/patch-build-pgo-profileserver.py b/www/firefox/files/patch-build-pgo-profileserver.py
>index 31a3a0889c0a..aec54852f395 100644
>--- a/www/firefox/files/patch-build-pgo-profileserver.py
>+++ b/www/firefox/files/patch-build-pgo-profileserver.py
>@@ -1,11 +1,11 @@
>---- build/pgo/profileserver.py.orig	2011-02-24 21:49:47.000000000 +0100
>-+++ build/pgo/profileserver.py	2011-02-24 21:50:30.000000000 +0100
>-@@ -59,7 +59,7 @@ if __name__ == '__main__':
>-       env["MOZ_JAR_LOG_FILE"] = os.path.abspath(jarlog)
>-       print "jarlog: %s" % env["MOZ_JAR_LOG_FILE"]
>+--- build/pgo/profileserver.py.orig	2017-09-15 04:15:39 UTC
>++++ build/pgo/profileserver.py
>+@@ -87,7 +87,7 @@ if __name__ == '__main__':
>+             env["MOZ_JAR_LOG_FILE"] = os.path.abspath(jarlog)
>+             print "jarlog: %s" % env["MOZ_JAR_LOG_FILE"]
>  
>--    cmdargs = ["http://localhost:%d/index.html" % PORT]
>-+    cmdargs = ["http://127.0.0.1:%d/index.html" % PORT]
>-     runner = FirefoxRunner(profile=profile,
>-                            binary=build.get_binary_path(where="staged-package"),
>-                            cmdargs=cmdargs,
>+-        cmdargs = ["http://localhost:%d/index.html" % PORT]
>++        cmdargs = ["http://127.0.0.1:%d/index.html" % PORT]
>+         runner = FirefoxRunner(profile=profile,
>+                                binary=build.get_binary_path(
>+                                    where="staged-package"),
>diff --git a/www/firefox/files/patch-servo17934 b/www/firefox/files/patch-servo17934
>deleted file mode 100644
>index c6e4193a1f6c..000000000000
>--- a/www/firefox/files/patch-servo17934
>+++ /dev/null
>@@ -1,53 +0,0 @@
>-commit 4cbdfa028752
>-Author: Manish Goregaokar <manishsmail@gmail.com>
>-Date:   Tue Aug 1 12:57:42 2017 -0500
>-
>-    servo: Merge #17934 - Remove doc comment on statement (from Manishearth:doc-comment); r=canaltinova
>-    
>-    rustc warns about these now
>-    
>-    Source-Repo: https://github.com/servo/servo
>-    Source-Revision: b49311c65a083a9b8eb03741bf7ea980b64f1e03
>-    
>-    --HG--
>-    extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
>-    extra : subtree_revision : 6b3c7d7f4ffeb9e271c52d418cda42cac5dd378d
>----
>- servo/components/style/values/specified/image.rs | 6 +++---
>- 1 file changed, 3 insertions(+), 3 deletions(-)
>-
>-diff --git servo/components/style/values/specified/image.rs servo/components/style/values/specified/image.rs
>-index 37ed00ccf443..687c6f17d432 100644
>---- servo/components/style/values/specified/image.rs
>-+++ servo/components/style/values/specified/image.rs
>-@@ -686,14 +686,14 @@ impl LineDirection {
>-         input.try(|i| {
>-             let to_ident = i.try(|i| i.expect_ident_matching("to"));
>-             match *compat_mode {
>--                /// `to` keyword is mandatory in modern syntax.
>-+                // `to` keyword is mandatory in modern syntax.
>-                 CompatMode::Modern => to_ident?,
>-                 // Fall back to Modern compatibility mode in case there is a `to` keyword.
>-                 // According to Gecko, `-moz-linear-gradient(to ...)` should serialize like
>-                 // `linear-gradient(to ...)`.
>-                 CompatMode::Moz if to_ident.is_ok() => *compat_mode = CompatMode::Modern,
>--                /// There is no `to` keyword in webkit prefixed syntax. If it's consumed,
>--                /// parsing should throw an error.
>-+                // There is no `to` keyword in webkit prefixed syntax. If it's consumed,
>-+                // parsing should throw an error.
>-                 CompatMode::WebKit if to_ident.is_ok() => {
>-                     return Err(SelectorParseError::UnexpectedIdent("to".into()).into())
>-                 },
>-diff --git servo/components/style/properties/gecko.mako.rs servo/components/style/properties/gecko.mako.rs
>-index 37ed00ccf443..687c6f17d432 100644
>---- servo/components/style/properties/gecko.mako.rs
>-+++ servo/components/style/properties/gecko.mako.rs
>-@@ -2081,7 +2081,7 @@ fn static_assert() {
>-             return (parent_size, parent_unconstrained_size)
>-         }
>- 
>--        /// XXXManishearth this should also handle text zoom
>-+        // XXXManishearth this should also handle text zoom
>-         let min = Au(parent.gecko.mScriptMinSize);
>- 
>-         let scale = (parent.gecko.mScriptSizeMultiplier as f32).powi(delta as i32);
>diff --git a/www/firefox/files/patch-servo17969 b/www/firefox/files/patch-servo17969
>deleted file mode 100644
>index ca16754b987f..000000000000
>--- a/www/firefox/files/patch-servo17969
>+++ /dev/null
>@@ -1,110 +0,0 @@
>-commit 9f5c1f2e4b5b
>-Author: Manish Goregaokar <manishsmail@gmail.com>
>-Date:   Thu Aug 3 16:27:12 2017 -0500
>-
>-    servo: Merge #17969 - Update stylo code to work on nightly (from Manishearth:rustup); r=emilio
>-    
>-    r=emilio https://bugzilla.mozilla.org/show_bug.cgi?id=1386887
>-    
>-    Source-Repo: https://github.com/servo/servo
>-    Source-Revision: 7cee7d7fcc4194e410fa8a308a77d37ac452778a
>-    
>-    --HG--
>-    extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
>-    extra : subtree_revision : d9c874ebcfa1e64c86265d0ed2e5cff65d9133be
>----
>- servo/components/style/gecko/generated/bindings.rs | 12 +++++++++---
>- servo/components/style/gecko/wrapper.rs            |  7 ++++++-
>- servo/ports/geckolib/glue.rs                       |  3 ++-
>- 3 files changed, 17 insertions(+), 5 deletions(-)
>-
>-diff --git servo/components/style/gecko/generated/bindings.rs servo/components/style/gecko/generated/bindings.rs
>-index e46bdfe1e1ea..b6703ab95bf7 100644
>---- servo/components/style/gecko/generated/bindings.rs
>-+++ servo/components/style/gecko/generated/bindings.rs
>-@@ -8,6 +8,7 @@ type nsAString_internal = nsAString;
>- pub type ServoStyleContextBorrowed<'a> = &'a ::properties::ComputedValues;
>- pub type ServoStyleContextBorrowedOrNull<'a> = Option<&'a ::properties::ComputedValues>;
>- pub type ServoComputedDataBorrowed<'a> = &'a ServoComputedData;
>-+pub type RawServoAnimationValueTableBorrowed<'a> = &'a ();
>- use gecko_bindings::structs::mozilla::css::GridTemplateAreasValue;
>- use gecko_bindings::structs::mozilla::css::ErrorReporter;
>- use gecko_bindings::structs::mozilla::css::ImageValue;
>-@@ -37,7 +38,7 @@ use gecko_bindings::structs::RawServoStyleRule;
>- use gecko_bindings::structs::RawGeckoPresContext;
>- use gecko_bindings::structs::RawGeckoPresContextOwned;
>- use gecko_bindings::structs::RawGeckoStyleAnimationList;
>--use gecko_bindings::structs::RawGeckoStyleChildrenIteratorBorrowedMut;
>-+use gecko_bindings::structs::RawGeckoStyleChildrenIterator;
>- use gecko_bindings::structs::RawGeckoServoStyleRuleList;
>- use gecko_bindings::structs::RawGeckoURLExtraData;
>- use gecko_bindings::structs::RawGeckoXBLBinding;
>-@@ -320,6 +321,10 @@ pub type RawGeckoServoAnimationValueListBorrowed<'a> = &'a RawGeckoServoAnimatio
>- pub type RawGeckoServoAnimationValueListBorrowedOrNull<'a> = Option<&'a RawGeckoServoAnimationValueList>;
>- pub type RawGeckoServoAnimationValueListBorrowedMut<'a> = &'a mut RawGeckoServoAnimationValueList;
>- pub type RawGeckoServoAnimationValueListBorrowedMutOrNull<'a> = Option<&'a mut RawGeckoServoAnimationValueList>;
>-+pub type RawGeckoStyleChildrenIteratorBorrowed<'a> = &'a RawGeckoStyleChildrenIterator;
>-+pub type RawGeckoStyleChildrenIteratorBorrowedOrNull<'a> = Option<&'a RawGeckoStyleChildrenIterator>;
>-+pub type RawGeckoStyleChildrenIteratorBorrowedMut<'a> = &'a mut RawGeckoStyleChildrenIterator;
>-+pub type RawGeckoStyleChildrenIteratorBorrowedMutOrNull<'a> = Option<&'a mut RawGeckoStyleChildrenIterator>;
>- pub type ServoCssRulesStrong = ::gecko_bindings::sugar::ownership::Strong<ServoCssRules>;
>- pub type ServoCssRulesBorrowed<'a> = &'a ServoCssRules;
>- pub type ServoCssRulesBorrowedOrNull<'a> = Option<&'a ServoCssRules>;
>-@@ -840,7 +845,7 @@ extern "C" {
>- }
>- extern "C" {
>-     pub fn Gecko_AnimationGetBaseStyle(aBaseStyles:
>--                                           *mut ::std::os::raw::c_void,
>-+                                           RawServoAnimationValueTableBorrowed,
>-                                        aProperty: nsCSSPropertyID)
>-      -> RawServoAnimationValueBorrowedOrNull;
>- }
>-@@ -2602,7 +2607,8 @@ extern "C" {
>- extern "C" {
>-     pub fn Servo_AnimationCompose(animation_values:
>-                                       RawServoAnimationValueMapBorrowedMut,
>--                                  base_values: *mut ::std::os::raw::c_void,
>-+                                  base_values:
>-+                                      RawServoAnimationValueTableBorrowed,
>-                                   property: nsCSSPropertyID,
>-                                   animation_segment:
>-                                       RawGeckoAnimationPropertySegmentBorrowed,
>-diff --git servo/components/style/gecko/wrapper.rs servo/components/style/gecko/wrapper.rs
>-index dae898692313..6d62f54951cc 100644
>---- servo/components/style/gecko/wrapper.rs
>-+++ servo/components/style/gecko/wrapper.rs
>-@@ -387,7 +387,12 @@ impl<'a> Iterator for GeckoChildrenIterator<'a> {
>-                 curr
>-             },
>-             GeckoChildrenIterator::GeckoIterator(ref mut it) => unsafe {
>--                Gecko_GetNextStyleChild(it).map(GeckoNode)
>-+                // We do this unsafe lengthening of the lifetime here because
>-+                // structs::StyleChildrenIterator is actually StyleChildrenIterator<'a>,
>-+                // however we can't express this easily with bindgen, and it would
>-+                // introduce functions with two input lifetimes into bindgen,
>-+                // which would be out of scope for elision.
>-+                Gecko_GetNextStyleChild(&mut * (it as *mut _)).map(GeckoNode)
>-             }
>-         }
>-     }
>-diff --git servo/ports/geckolib/glue.rs servo/ports/geckolib/glue.rs
>-index 367d24ff87b2..e69959f3710b 100644
>---- servo/ports/geckolib/glue.rs
>-+++ servo/ports/geckolib/glue.rs
>-@@ -59,6 +59,7 @@ use style::gecko_bindings::bindings::RawGeckoServoStyleRuleListBorrowedMut;
>- use style::gecko_bindings::bindings::RawServoAnimationValueBorrowed;
>- use style::gecko_bindings::bindings::RawServoAnimationValueMapBorrowedMut;
>- use style::gecko_bindings::bindings::RawServoAnimationValueStrong;
>-+use style::gecko_bindings::bindings::RawServoAnimationValueTableBorrowed;
>- use style::gecko_bindings::bindings::RawServoStyleRuleBorrowed;
>- use style::gecko_bindings::bindings::ServoStyleContextBorrowedOrNull;
>- use style::gecko_bindings::bindings::nsTArrayBorrowed_uintptr_t;
>-@@ -374,7 +375,7 @@ pub extern "C" fn Servo_AnimationValues_ComputeDistance(from: RawServoAnimationV
>- 
>- #[no_mangle]
>- pub extern "C" fn Servo_AnimationCompose(raw_value_map: RawServoAnimationValueMapBorrowedMut,
>--                                         base_values: *mut ::std::os::raw::c_void,
>-+                                         base_values: RawServoAnimationValueTableBorrowed,
>-                                          css_property: nsCSSPropertyID,
>-                                          segment: RawGeckoAnimationPropertySegmentBorrowed,
>-                                          last_segment: RawGeckoAnimationPropertySegmentBorrowed,
>diff --git a/www/firefox/files/patch-servo18046 b/www/firefox/files/patch-servo18046
>deleted file mode 100644
>index 574e91f8831f..000000000000
>--- a/www/firefox/files/patch-servo18046
>+++ /dev/null
>@@ -1,763 +0,0 @@
>-commit ea9c8db790e4
>-Author: Simon Sapin <simon.sapin@exyr.org>
>-Date:   Tue Aug 15 07:31:04 2017 -0500
>-
>-    servo: Merge #18046 - Upgrade to rustc 1.21.0-nightly (13d94d5fa 2017-08-10) (from servo:rustup); r=emilio
>-    
>-    Source-Repo: https://github.com/servo/servo
>-    Source-Revision: 7d9b82b9efa7b10a2e34d93df5ac535d99518f7a
>-    
>-    --HG--
>-    extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
>-    extra : subtree_revision : e1b3d113c3edaea3c4c07f8b206f2e02922e3caf
>----
>- servo/Cargo.lock                                   |  6 +++---
>- servo/components/devtools/lib.rs                   |  2 +-
>- servo/components/layout/animation.rs               |  2 +-
>- servo/components/layout/construct.rs               |  6 +++---
>- servo/components/layout/display_list_builder.rs    |  2 +-
>- servo/components/layout/flex.rs                    |  6 +++---
>- servo/components/layout/inline.rs                  |  4 ++--
>- servo/components/layout/sequential.rs              |  2 +-
>- servo/components/layout/table_cell.rs              |  2 +-
>- servo/components/layout/text.rs                    |  2 +-
>- servo/components/net/cookie_storage.rs             |  2 +-
>- servo/components/profile/heartbeats.rs             |  4 ++--
>- servo/components/script/dom/bindings/js.rs         |  4 ++--
>- servo/components/script/dom/cssstyledeclaration.rs |  8 ++++----
>- servo/components/script/dom/cssstylerule.rs        |  2 +-
>- servo/components/script/dom/document.rs            | 12 ++++++------
>- servo/components/script/dom/medialist.rs           |  4 ++--
>- servo/components/script/dom/range.rs               |  4 ++--
>- .../script/dom/servoparser/async_html.rs           |  4 ++--
>- servo/components/script/dom/url.rs                 |  4 ++--
>- servo/components/script/dom/vrdisplay.rs           |  2 +-
>- .../components/script/dom/webglrenderingcontext.rs |  2 +-
>- servo/components/script/dom/xmlhttprequest.rs      |  2 +-
>- servo/components/script/lib.rs                     |  1 -
>- .../script_plugins/unrooted_must_root.rs           | 22 +++++++++++++++-------
>- servo/components/selectors/matching.rs             |  2 +-
>- servo/components/selectors/parser.rs               |  2 +-
>- .../style/invalidation/element/invalidator.rs      |  2 +-
>- servo/components/style/matching.rs                 |  2 +-
>- .../components/style/properties/properties.mako.rs |  2 +-
>- servo/components/style/style_adjuster.rs           |  2 +-
>- servo/components/style/style_resolver.rs           |  2 +-
>- servo/components/style/stylesheets/rule_list.rs    |  2 +-
>- servo/components/style/stylesheets/rule_parser.rs  |  2 +-
>- .../components/style/stylesheets/rules_iterator.rs |  2 +-
>- servo/components/style/values/animated/color.rs    |  2 +-
>- servo/components/style/values/computed/border.rs   |  2 +-
>- servo/components/webdriver_server/lib.rs           |  2 +-
>- servo/rust-commit-hash                             |  2 +-
>- servo/tests/unit/style/stylist.rs                  | 13 -------------
>- 40 files changed, 73 insertions(+), 79 deletions(-)
>-
>-diff --git servo/Cargo.lock servo/Cargo.lock
>-index 50dd6e1a785a..2aa7bd8ea3dd 100644
>---- servo/Cargo.lock
>-+++ servo/Cargo.lock
>-@@ -3577,7 +3577,7 @@ version = "0.1.4"
>- source = "registry+https://github.com/rust-lang/crates.io-index"
>- dependencies = [
>-  "error-chain 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
>-- "xcb 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)",
>-+ "xcb 0.7.7 (registry+https://github.com/rust-lang/crates.io-index)",
>- ]
>- 
>- [[package]]
>-@@ -3592,7 +3592,7 @@ dependencies = [
>- 
>- [[package]]
>- name = "xcb"
>--version = "0.7.6"
>-+version = "0.7.7"
>- source = "registry+https://github.com/rust-lang/crates.io-index"
>- dependencies = [
>-  "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)",
>-@@ -3918,7 +3918,7 @@ dependencies = [
>- "checksum x11 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "db27c597c187da52194a4b8232e7d869503911aab9ff726fefb76d7a830f78ed"
>- "checksum x11-clipboard 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "731230b8edcbb9d99247105e4c9ec0a538594d50ad68d2afa8662195f9db2973"
>- "checksum x11-dl 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "326c500cdc166fd7c70dd8c8a829cd5c0ce7be5a5d98c25817de2b9bdc67faf8"
>--"checksum xcb 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "63e3a849b73e4e1905e4f4d48f1750429bc86ea9f473632ab382a6f69ecb6b33"
>-+"checksum xcb 0.7.7 (registry+https://github.com/rust-lang/crates.io-index)" = "7cede38417fcdf2f0a9d8abf1cea1c1b066320a8a316e9583a0d717c334fafb2"
>- "checksum xdg 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a66b7c2281ebde13cf4391d70d4c7e5946c3c25e72a7b859ca8f677dcd0b0c61"
>- "checksum xi-unicode 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "12ea8eda4b1eb72f02d148402e23832d56a33f55d8c1b2d5bcdde91d79d47cb1"
>- "checksum xml-rs 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7ec6c39eaa68382c8e31e35239402c0a9489d4141a8ceb0c716099a0b515b562"
>-diff --git servo/components/devtools/lib.rs servo/components/devtools/lib.rs
>-index d5a2764a7102..6a25696eaed7 100644
>---- servo/components/devtools/lib.rs
>-+++ servo/components/devtools/lib.rs
>-@@ -306,7 +306,7 @@ fn run_server(sender: Sender<DevtoolsControlMsg>,
>-                 columnNumber: console_message.columnNumber,
>-             },
>-         };
>--        for mut stream in &mut *console_actor.streams.borrow_mut() {
>-+        for stream in &mut *console_actor.streams.borrow_mut() {
>-             stream.write_json_packet(&msg);
>-         }
>-     }
>-diff --git servo/components/layout/animation.rs servo/components/layout/animation.rs
>-index e4a2782c1271..ebbba82fcc6a 100644
>---- servo/components/layout/animation.rs
>-+++ servo/components/layout/animation.rs
>-@@ -39,7 +39,7 @@ pub fn update_animation_state(constellation_chan: &IpcSender<ConstellationMsg>,
>-             // run.
>-             if let Some(ref mut animations) = running_animations.get_mut(node) {
>-                 // TODO: This being linear is probably not optimal.
>--                for mut anim in animations.iter_mut() {
>-+                for anim in animations.iter_mut() {
>-                     if let Animation::Keyframes(_, ref anim_name, ref mut anim_state) = *anim {
>-                         if *name == *anim_name {
>-                             debug!("update_animation_state: Found other animation {}", name);
>-diff --git servo/components/layout/construct.rs servo/components/layout/construct.rs
>-index c863219941e4..7ef391b42183 100644
>---- servo/components/layout/construct.rs
>-+++ servo/components/layout/construct.rs
>-@@ -1921,7 +1921,7 @@ impl Legalizer {
>-     /// true for anonymous block children of flex flows.
>-     fn try_to_add_child(&mut self, context: &SharedStyleContext, parent: &mut FlowRef, child: &mut FlowRef)
>-                         -> bool {
>--        let mut parent = self.stack.last_mut().unwrap_or(parent);
>-+        let parent = self.stack.last_mut().unwrap_or(parent);
>-         let (parent_class, child_class) = (parent.class(), child.class());
>-         match (parent_class, child_class) {
>-             (FlowClass::TableWrapper, FlowClass::Table) |
>-@@ -1962,7 +1962,7 @@ impl Legalizer {
>-                     } else {
>-                         IS_BLOCK_FLEX_ITEM
>-                     };
>--                    let mut block = FlowRef::deref_mut(&mut block_wrapper).as_mut_block();
>-+                    let block = FlowRef::deref_mut(&mut block_wrapper).as_mut_block();
>-                     block.base.flags.insert(MARGINS_CANNOT_COLLAPSE);
>-                     block.fragment.flags.insert(flag);
>-                 }
>-@@ -1979,7 +1979,7 @@ impl Legalizer {
>-                     } else {
>-                         IS_BLOCK_FLEX_ITEM
>-                     };
>--                    let mut block = FlowRef::deref_mut(child).as_mut_block();
>-+                    let block = FlowRef::deref_mut(child).as_mut_block();
>-                     block.base.flags.insert(MARGINS_CANNOT_COLLAPSE);
>-                     block.fragment.flags.insert(flag);
>-                 }
>-diff --git servo/components/layout/display_list_builder.rs servo/components/layout/display_list_builder.rs
>-index f8b26899b57d..783574afd2a3 100644
>---- servo/components/layout/display_list_builder.rs
>-+++ servo/components/layout/display_list_builder.rs
>-@@ -2718,7 +2718,7 @@ impl InlineFlowDisplayListBuilding for InlineFlow {
>-         self.base.scroll_root_id = Some(state.current_scroll_root_id);
>-         self.base.clip = state.clip_stack.last().cloned().unwrap_or_else(max_rect);
>- 
>--        for mut fragment in self.fragments.fragments.iter_mut() {
>-+        for fragment in self.fragments.fragments.iter_mut() {
>-             let previous_containing_block_scroll_root_id = state.containing_block_scroll_root_id;
>-             if establishes_containing_block_for_absolute(fragment.style.get_box().position) {
>-                 state.containing_block_scroll_root_id = state.current_scroll_root_id;
>-diff --git servo/components/layout/flex.rs servo/components/layout/flex.rs
>-index 353c939f58b9..d79580f8cd0d 100644
>---- servo/components/layout/flex.rs
>-+++ servo/components/layout/flex.rs
>-@@ -415,7 +415,7 @@ impl FlexFlow {
>- 
>-         let items = &mut self.items[start..];
>-         let mut children = self.block_flow.base.children.random_access_mut();
>--        for mut item in items {
>-+        for item in items {
>-             let kid = children.get(item.index);
>-             item.init_sizes(kid, container_size, self.main_mode);
>-             let outer_main_size = item.outer_main_size(kid, self.main_mode);
>-@@ -607,7 +607,7 @@ impl FlexFlow {
>- 
>-             let mut children = self.block_flow.base.children.random_access_mut();
>-             for item in items.iter_mut() {
>--                let mut block = children.get(item.index).as_mut_block();
>-+                let block = children.get(item.index).as_mut_block();
>- 
>-                 block.base.block_container_writing_mode = container_mode;
>-                 block.base.block_container_inline_size = inline_size;
>-@@ -659,7 +659,7 @@ impl FlexFlow {
>- 
>-         let mut children = self.block_flow.base.children.random_access_mut();
>-         for item in &mut self.items {
>--            let mut base = flow::mut_base(children.get(item.index));
>-+            let base = flow::mut_base(children.get(item.index));
>-             if !self.main_reverse {
>-                 base.position.start.b = cur_b;
>-                 cur_b = cur_b + base.position.size.block;
>-diff --git servo/components/layout/inline.rs servo/components/layout/inline.rs
>-index d5813d9bea22..10e091c3c66d 100644
>---- servo/components/layout/inline.rs
>-+++ servo/components/layout/inline.rs
>-@@ -435,7 +435,7 @@ impl LineBreaker {
>-             return
>-         }
>-         let last_fragment_index = self.pending_line.range.end() - FragmentIndex(1);
>--        let mut fragment = &mut self.new_fragments[last_fragment_index.get() as usize];
>-+        let fragment = &mut self.new_fragments[last_fragment_index.get() as usize];
>- 
>-         let old_fragment_inline_size = fragment.border_box.size.inline;
>- 
>-@@ -1047,7 +1047,7 @@ impl InlineFlow {
>-         let space_per_expansion_opportunity = slack_inline_size / expansion_opportunities as i32;
>-         for fragment_index in line.range.each_index() {
>-             let fragment = fragments.get_mut(fragment_index.to_usize());
>--            let mut scanned_text_fragment_info = match fragment.specific {
>-+            let scanned_text_fragment_info = match fragment.specific {
>-                 SpecificFragmentInfo::ScannedText(ref mut info) if !info.range.is_empty() => info,
>-                 _ => continue
>-             };
>-diff --git servo/components/layout/sequential.rs servo/components/layout/sequential.rs
>-index f6f8ce429e4f..4986ebb6c852 100644
>---- servo/components/layout/sequential.rs
>-+++ servo/components/layout/sequential.rs
>-@@ -133,7 +133,7 @@ pub fn store_overflow(layout_context: &LayoutContext, flow: &mut Flow) {
>-         return;
>-     }
>- 
>--    for mut kid in flow::mut_base(flow).child_iter_mut() {
>-+    for kid in flow::mut_base(flow).child_iter_mut() {
>-         store_overflow(layout_context, kid);
>-     }
>- 
>-diff --git servo/components/layout/table_cell.rs servo/components/layout/table_cell.rs
>-index 7ef02e28db65..fd807989b463 100644
>---- servo/components/layout/table_cell.rs
>-+++ servo/components/layout/table_cell.rs
>-@@ -136,7 +136,7 @@ impl TableCellFlow {
>-         }
>- 
>-         for kid in flow::mut_base(self).children.iter_mut() {
>--            let mut kid_base = flow::mut_base(kid);
>-+            let kid_base = flow::mut_base(kid);
>-             if !kid_base.flags.contains(IS_ABSOLUTELY_POSITIONED) {
>-                 kid_base.position.start.b += offset
>-             }
>-diff --git servo/components/layout/text.rs servo/components/layout/text.rs
>-index 6e1c7b2a43a1..9a207a2bb84e 100644
>---- servo/components/layout/text.rs
>-+++ servo/components/layout/text.rs
>-@@ -460,7 +460,7 @@ fn split_first_fragment_at_newline_if_necessary(fragments: &mut LinkedList<Fragm
>-     }
>- 
>-     let new_fragment = {
>--        let mut first_fragment = fragments.front_mut().unwrap();
>-+        let first_fragment = fragments.front_mut().unwrap();
>-         let string_before;
>-         let selection_before;
>-         {
>-diff --git servo/components/net/cookie_storage.rs servo/components/net/cookie_storage.rs
>-index f255f57b56d2..b3147ef4dd32 100644
>---- servo/components/net/cookie_storage.rs
>-+++ servo/components/net/cookie_storage.rs
>-@@ -103,7 +103,7 @@ impl CookieStorage {
>- 
>-         // Step 12
>-         let domain = reg_host(&cookie.cookie.domain().as_ref().unwrap_or(&""));
>--        let mut cookies = self.cookies_map.entry(domain).or_insert(vec![]);
>-+        let cookies = self.cookies_map.entry(domain).or_insert(vec![]);
>- 
>-         if cookies.len() == self.max_per_host {
>-             let old_len = cookies.len();
>-diff --git servo/components/profile/heartbeats.rs servo/components/profile/heartbeats.rs
>-index 4661dad61836..0d474fe3a111 100644
>---- servo/components/profile/heartbeats.rs
>-+++ servo/components/profile/heartbeats.rs
>-@@ -33,7 +33,7 @@ pub fn cleanup() {
>-         )
>-     );
>-     if let Some(mut hbs) = hbs_opt_box {
>--        for (_, mut v) in hbs.iter_mut() {
>-+        for (_, v) in hbs.iter_mut() {
>-             // log any remaining heartbeat records before dropping
>-             log_heartbeat_records(v);
>-         }
>-@@ -65,7 +65,7 @@ pub fn maybe_heartbeat(category: &ProfilerCategory,
>-                 if !(*hbs_ptr).contains_key(category) {
>-                     maybe_create_heartbeat(&mut (*hbs_ptr), category.clone());
>-                 }
>--                if let Some(mut h) = (*hbs_ptr).get_mut(category) {
>-+                if let Some(h) = (*hbs_ptr).get_mut(category) {
>-                     (*h).heartbeat(0, 1, start_time, end_time, start_energy, end_energy);
>-                 }
>-             }
>-diff --git servo/components/script/dom/bindings/js.rs servo/components/script/dom/bindings/js.rs
>-index 975ddeda13b0..abfd9f47eff1 100644
>---- servo/components/script/dom/bindings/js.rs
>-+++ servo/components/script/dom/bindings/js.rs
>-@@ -469,7 +469,7 @@ impl RootCollection {
>-     /// Start tracking a stack-based root
>-     unsafe fn root(&self, untracked_reflector: *const Reflector) {
>-         debug_assert!(thread_state::get().is_script());
>--        let mut roots = &mut *self.roots.get();
>-+        let roots = &mut *self.roots.get();
>-         roots.push(untracked_reflector);
>-         assert!(!(*untracked_reflector).get_jsobject().is_null())
>-     }
>-@@ -479,7 +479,7 @@ impl RootCollection {
>-         assert!(!tracked_reflector.is_null());
>-         assert!(!(*tracked_reflector).get_jsobject().is_null());
>-         debug_assert!(thread_state::get().is_script());
>--        let mut roots = &mut *self.roots.get();
>-+        let roots = &mut *self.roots.get();
>-         match roots.iter().rposition(|r| *r == tracked_reflector) {
>-             Some(idx) => {
>-                 roots.remove(idx);
>-diff --git servo/components/script/dom/cssstyledeclaration.rs servo/components/script/dom/cssstyledeclaration.rs
>-index 0732c9af9e45..ddf085b34913 100644
>---- servo/components/script/dom/cssstyledeclaration.rs
>-+++ servo/components/script/dom/cssstyledeclaration.rs
>-@@ -238,7 +238,7 @@ impl CSSStyleDeclaration {
>-             return Err(Error::NoModificationAllowed);
>-         }
>- 
>--        self.owner.mutate_associated_block(|ref mut pdb, mut changed| {
>-+        self.owner.mutate_associated_block(|pdb, changed| {
>-             if value.is_empty() {
>-                 // Step 3
>-                 *changed = pdb.remove_property(&id);
>-@@ -360,7 +360,7 @@ impl CSSStyleDeclarationMethods for CSSStyleDeclaration {
>-             _ => return Ok(()),
>-         };
>- 
>--        self.owner.mutate_associated_block(|ref mut pdb, mut changed| {
>-+        self.owner.mutate_associated_block(|pdb, changed| {
>-             // Step 5 & 6
>-             *changed = pdb.set_importance(&id, importance);
>-         });
>-@@ -388,7 +388,7 @@ impl CSSStyleDeclarationMethods for CSSStyleDeclaration {
>-         };
>- 
>-         let mut string = String::new();
>--        self.owner.mutate_associated_block(|mut pdb, mut changed| {
>-+        self.owner.mutate_associated_block(|pdb, changed| {
>-             pdb.property_value_to_css(&id, &mut string).unwrap();
>-             *changed = pdb.remove_property(&id);
>-         });
>-@@ -438,7 +438,7 @@ impl CSSStyleDeclarationMethods for CSSStyleDeclaration {
>-         }
>- 
>-         let quirks_mode = window.Document().quirks_mode();
>--        self.owner.mutate_associated_block(|mut pdb, mut _changed| {
>-+        self.owner.mutate_associated_block(|pdb, _changed| {
>-             // Step 3
>-             *pdb = parse_style_attribute(&value,
>-                                          &self.owner.base_url(),
>-diff --git servo/components/script/dom/cssstylerule.rs servo/components/script/dom/cssstylerule.rs
>-index ea121ef900a9..12e9cdcc8694 100644
>---- servo/components/script/dom/cssstylerule.rs
>-+++ servo/components/script/dom/cssstylerule.rs
>-@@ -99,7 +99,7 @@ impl CSSStyleRuleMethods for CSSStyleRule {
>-         if let Ok(mut s) = SelectorList::parse(&parser, &mut css_parser) {
>-             // This mirrors what we do in CSSStyleOwner::mutate_associated_block.
>-             let mut guard = self.cssrule.shared_lock().write();
>--            let mut stylerule = self.stylerule.write_with(&mut guard);
>-+            let stylerule = self.stylerule.write_with(&mut guard);
>-             mem::swap(&mut stylerule.selectors, &mut s);
>-             // It seems like we will want to avoid having to invalidate all
>-             // stylesheets eventually!
>-diff --git servo/components/script/dom/document.rs servo/components/script/dom/document.rs
>-index 90ea06fbe7b4..71bb02eaa364 100644
>---- servo/components/script/dom/document.rs
>-+++ servo/components/script/dom/document.rs
>-@@ -633,7 +633,7 @@ impl Document {
>-         // reset_form_owner_for_listeners -> reset_form_owner -> GetElementById
>-         {
>-             let mut id_map = self.id_map.borrow_mut();
>--            let mut elements = id_map.entry(id.clone()).or_insert(Vec::new());
>-+            let elements = id_map.entry(id.clone()).or_insert(Vec::new());
>-             elements.insert_pre_order(element, root.r().upcast::<Node>());
>-         }
>-         self.reset_form_owner_for_listeners(&id);
>-@@ -642,7 +642,7 @@ impl Document {
>-     pub fn register_form_id_listener<T: ?Sized + FormControl>(&self, id: DOMString, listener: &T) {
>-         let mut map = self.form_id_listener_map.borrow_mut();
>-         let listener = listener.to_element();
>--        let mut set = map.entry(Atom::from(id)).or_insert(HashSet::new());
>-+        let set = map.entry(Atom::from(id)).or_insert(HashSet::new());
>-         set.insert(JS::from_ref(listener));
>-     }
>- 
>-@@ -1572,7 +1572,7 @@ impl Document {
>-     /// https://html.spec.whatwg.org/multipage/#dom-window-cancelanimationframe
>-     pub fn cancel_animation_frame(&self, ident: u32) {
>-         let mut list = self.animation_frame_list.borrow_mut();
>--        if let Some(mut pair) = list.iter_mut().find(|pair| pair.0 == ident) {
>-+        if let Some(pair) = list.iter_mut().find(|pair| pair.0 == ident) {
>-             pair.1 = None;
>-         }
>-     }
>-@@ -2399,7 +2399,7 @@ impl Document {
>-         if entry.snapshot.is_none() {
>-             entry.snapshot = Some(Snapshot::new(el.html_element_in_html_document()));
>-         }
>--        let mut snapshot = entry.snapshot.as_mut().unwrap();
>-+        let snapshot = entry.snapshot.as_mut().unwrap();
>-         if snapshot.state.is_none() {
>-             snapshot.state = Some(el.state());
>-         }
>-@@ -2426,7 +2426,7 @@ impl Document {
>-             entry.hint.insert(RESTYLE_SELF);
>-         }
>- 
>--        let mut snapshot = entry.snapshot.as_mut().unwrap();
>-+        let snapshot = entry.snapshot.as_mut().unwrap();
>-         if attr.local_name() == &local_name!("id") {
>-             snapshot.id_changed = true;
>-         } else if attr.local_name() == &local_name!("class") {
>-@@ -4028,7 +4028,7 @@ impl PendingInOrderScriptVec {
>- 
>-     fn loaded(&self, element: &HTMLScriptElement, result: ScriptResult) {
>-         let mut scripts = self.scripts.borrow_mut();
>--        let mut entry = scripts.iter_mut().find(|entry| &*entry.element == element).unwrap();
>-+        let entry = scripts.iter_mut().find(|entry| &*entry.element == element).unwrap();
>-         entry.loaded(result);
>-     }
>- 
>-diff --git servo/components/script/dom/medialist.rs servo/components/script/dom/medialist.rs
>-index 0064d0445095..ae20f5aa0422 100644
>---- servo/components/script/dom/medialist.rs
>-+++ servo/components/script/dom/medialist.rs
>-@@ -63,7 +63,7 @@ impl MediaListMethods for MediaList {
>-     // https://drafts.csswg.org/cssom/#dom-medialist-mediatext
>-     fn SetMediaText(&self, value: DOMString) {
>-         let mut guard = self.shared_lock().write();
>--        let mut media_queries = self.media_queries.write_with(&mut guard);
>-+        let media_queries = self.media_queries.write_with(&mut guard);
>-         // Step 2
>-         if value.is_empty() {
>-             // Step 1
>-@@ -154,7 +154,7 @@ impl MediaListMethods for MediaList {
>-         // Step 3
>-         let m_serialized = m.unwrap().to_css_string();
>-         let mut guard = self.shared_lock().write();
>--        let mut media_list = self.media_queries.write_with(&mut guard);
>-+        let media_list = self.media_queries.write_with(&mut guard);
>-         let new_vec = media_list.media_queries.drain(..)
>-                                 .filter(|q| m_serialized != q.to_css_string())
>-                                 .collect();
>-diff --git servo/components/script/dom/range.rs servo/components/script/dom/range.rs
>-index fa849a0fc1a2..1e65caedc9dd 100644
>---- servo/components/script/dom/range.rs
>-+++ servo/components/script/dom/range.rs
>-@@ -1049,7 +1049,7 @@ impl WeakRangeVec {
>-         let offset = context.index();
>-         let parent = context.parent;
>-         unsafe {
>--            let mut ranges = &mut *self.cell.get();
>-+            let ranges = &mut *self.cell.get();
>- 
>-             ranges.update(|entry| {
>-                 let range = entry.root().unwrap();
>-@@ -1076,7 +1076,7 @@ impl WeakRangeVec {
>-         }
>- 
>-         unsafe {
>--            let mut ranges = &mut *self.cell.get();
>-+            let ranges = &mut *self.cell.get();
>- 
>-             ranges.update(|entry| {
>-                 let range = entry.root().unwrap();
>-diff --git servo/components/script/dom/servoparser/async_html.rs servo/components/script/dom/servoparser/async_html.rs
>-index 59411fda1c73..70d2008f49f6 100644
>---- servo/components/script/dom/servoparser/async_html.rs
>-+++ servo/components/script/dom/servoparser/async_html.rs
>-@@ -568,7 +568,7 @@ impl TreeSink for Sink {
>-         }
>-         let node = self.new_parse_node();
>-         {
>--            let mut data = self.get_parse_node_data_mut(&target.id);
>-+            let data = self.get_parse_node_data_mut(&target.id);
>-             data.contents = Some(node.clone());
>-         }
>-         self.send_op(ParseOperation::GetTemplateContents { target: target.id, contents: node.id });
>-@@ -596,7 +596,7 @@ impl TreeSink for Sink {
>-         let mut node = self.new_parse_node();
>-         node.qual_name = Some(name.clone());
>-         {
>--            let mut node_data = self.get_parse_node_data_mut(&node.id);
>-+            let node_data = self.get_parse_node_data_mut(&node.id);
>-             node_data.is_integration_point = html_attrs.iter()
>-             .any(|attr| {
>-                 let attr_value = &String::from(attr.value.clone());
>-diff --git servo/components/script/dom/url.rs servo/components/script/dom/url.rs
>-index a02a735638fc..41de4dcc0c72 100644
>---- servo/components/script/dom/url.rs
>-+++ servo/components/script/dom/url.rs
>-@@ -96,8 +96,8 @@ impl URL {
>- 
>-     // https://w3c.github.io/FileAPI/#dfn-createObjectURL
>-     pub fn CreateObjectURL(global: &GlobalScope, blob: &Blob) -> DOMString {
>--        /// XXX: Second field is an unicode-serialized Origin, it is a temporary workaround
>--        ///      and should not be trusted. See issue https://github.com/servo/servo/issues/11722
>-+        // XXX: Second field is an unicode-serialized Origin, it is a temporary workaround
>-+        //      and should not be trusted. See issue https://github.com/servo/servo/issues/11722
>-         let origin = get_blob_origin(&global.get_url());
>- 
>-         let id = blob.get_blob_url_id();
>-diff --git servo/components/script/dom/vrdisplay.rs servo/components/script/dom/vrdisplay.rs
>-index 3f73a577fad7..54f06fb928f2 100644
>---- servo/components/script/dom/vrdisplay.rs
>-+++ servo/components/script/dom/vrdisplay.rs
>-@@ -268,7 +268,7 @@ impl VRDisplayMethods for VRDisplay {
>-     fn CancelAnimationFrame(&self, handle: u32) {
>-         if self.presenting.get() {
>-             let mut list = self.raf_callback_list.borrow_mut();
>--            if let Some(mut pair) = list.iter_mut().find(|pair| pair.0 == handle) {
>-+            if let Some(pair) = list.iter_mut().find(|pair| pair.0 == handle) {
>-                 pair.1 = None;
>-             }
>-         } else {
>-diff --git servo/components/script/dom/webglrenderingcontext.rs servo/components/script/dom/webglrenderingcontext.rs
>-index 73d4ddba1b90..62c92b42785c 100644
>---- servo/components/script/dom/webglrenderingcontext.rs
>-+++ servo/components/script/dom/webglrenderingcontext.rs
>-@@ -2434,7 +2434,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext {
>-         }
>- 
>-         typedarray!(in(cx) let mut pixels_data: ArrayBufferView = pixels);
>--        let (array_type, mut data) = match { pixels_data.as_mut() } {
>-+        let (array_type, data) = match { pixels_data.as_mut() } {
>-             Ok(data) => (data.get_array_type(), data.as_mut_slice()),
>-             Err(_) => return Err(Error::Type("Not an ArrayBufferView".to_owned())),
>-         };
>-diff --git servo/components/script/dom/xmlhttprequest.rs servo/components/script/dom/xmlhttprequest.rs
>-index 6ed2dda1851f..e6652d79d706 100644
>---- servo/components/script/dom/xmlhttprequest.rs
>-+++ servo/components/script/dom/xmlhttprequest.rs
>-@@ -627,7 +627,7 @@ impl XMLHttpRequestMethods for XMLHttpRequest {
>- 
>-                 if !content_type_set {
>-                     let ct = request.headers.get_mut::<ContentType>();
>--                    if let Some(mut ct) = ct {
>-+                    if let Some(ct) = ct {
>-                         if let Some(encoding) = encoding {
>-                             for param in &mut (ct.0).2 {
>-                                 if param.0 == MimeAttr::Charset {
>-diff --git servo/components/script/lib.rs servo/components/script/lib.rs
>-index e1a1ab592cb7..5824d6f2e490 100644
>---- servo/components/script/lib.rs
>-+++ servo/components/script/lib.rs
>-@@ -9,7 +9,6 @@
>- #![feature(mpsc_select)]
>- #![feature(nonzero)]
>- #![feature(on_unimplemented)]
>--#![feature(option_entry)]
>- #![feature(plugin)]
>- #![feature(proc_macro)]
>- #![feature(stmt_expr_attributes)]
>-diff --git servo/components/script_plugins/unrooted_must_root.rs servo/components/script_plugins/unrooted_must_root.rs
>-index 5dbd2b1a3bdd..f3f5e60ab62a 100644
>---- servo/components/script_plugins/unrooted_must_root.rs
>-+++ servo/components/script_plugins/unrooted_must_root.rs
>-@@ -182,7 +182,7 @@ impl<'a, 'b, 'tcx> visit::Visitor<'tcx> for FnDefVisitor<'a, 'b, 'tcx> {
>-         }
>- 
>-         match expr.node {
>--            /// Trait casts from #[must_root] types are not allowed
>-+            // Trait casts from #[must_root] types are not allowed
>-             hir::ExprCast(ref subexpr, _) => require_rooted(cx, self.in_new_function, &*subexpr),
>-             // This catches assignments... the main point of this would be to catch mutable
>-             // references to `JS<T>`.
>-@@ -206,13 +206,21 @@ impl<'a, 'b, 'tcx> visit::Visitor<'tcx> for FnDefVisitor<'a, 'b, 'tcx> {
>-     fn visit_pat(&mut self, pat: &'tcx hir::Pat) {
>-         let cx = self.cx;
>- 
>--        if let hir::PatKind::Binding(hir::BindingMode::BindByValue(_), _, _, _) = pat.node {
>--            let ty = cx.tables.pat_ty(pat);
>--            if is_unrooted_ty(cx, ty, self.in_new_function) {
>--                cx.span_lint(UNROOTED_MUST_ROOT,
>--                            pat.span,
>--                            &format!("Expression of type {:?} must be rooted", ty))
>-+        // We want to detect pattern bindings that move a value onto the stack.
>-+        // When "default binding modes" https://github.com/rust-lang/rust/issues/42640
>-+        // are implemented, the `Unannotated` case could cause false-positives.
>-+        // These should be fixable by adding an explicit `ref`.
>-+        match pat.node {
>-+            hir::PatKind::Binding(hir::BindingAnnotation::Unannotated, _, _, _) |
>-+            hir::PatKind::Binding(hir::BindingAnnotation::Mutable, _, _, _) => {
>-+                let ty = cx.tables.pat_ty(pat);
>-+                if is_unrooted_ty(cx, ty, self.in_new_function) {
>-+                    cx.span_lint(UNROOTED_MUST_ROOT,
>-+                                pat.span,
>-+                                &format!("Expression of type {:?} must be rooted", ty))
>-+                }
>-             }
>-+            _ => {}
>-         }
>- 
>-         visit::walk_pat(self, pat);
>-diff --git servo/components/selectors/matching.rs servo/components/selectors/matching.rs
>-index 7bd9814d26fb..8f6b2fa6aa54 100644
>---- servo/components/selectors/matching.rs
>-+++ servo/components/selectors/matching.rs
>-@@ -458,7 +458,7 @@ where
>- /// Matches a complex selector.
>- pub fn matches_complex_selector<E, F>(mut iter: SelectorIter<E::Impl>,
>-                                       element: &E,
>--                                      mut context: &mut LocalMatchingContext<E::Impl>,
>-+                                      context: &mut LocalMatchingContext<E::Impl>,
>-                                       flags_setter: &mut F)
>-                                       -> bool
>-     where E: Element,
>-diff --git servo/components/selectors/parser.rs servo/components/selectors/parser.rs
>-index 490399ce38ce..6b2c1f2b4e86 100644
>---- servo/components/selectors/parser.rs
>-+++ servo/components/selectors/parser.rs
>-@@ -1464,7 +1464,7 @@ fn parse_negation<'i, 't, P, E, Impl>(parser: &P,
>- fn parse_compound_selector<'i, 't, P, E, Impl>(
>-     parser: &P,
>-     input: &mut CssParser<'i, 't>,
>--    mut builder: &mut SelectorBuilder<Impl>)
>-+    builder: &mut SelectorBuilder<Impl>)
>-     -> Result<bool, ParseError<'i, SelectorParseError<'i, E>>>
>-     where P: Parser<'i, Impl=Impl, Error=E>, Impl: SelectorImpl
>- {
>-diff --git servo/components/style/invalidation/element/invalidator.rs servo/components/style/invalidation/element/invalidator.rs
>-index 848c5cd13dc8..b8510ba3169b 100644
>---- servo/components/style/invalidation/element/invalidator.rs
>-+++ servo/components/style/invalidation/element/invalidator.rs
>-@@ -154,7 +154,7 @@ impl<'a, 'b: 'a, E> TreeStyleInvalidator<'a, 'b, E>
>-             trace!(" > visitedness change, force subtree restyle");
>-             // We can't just return here because there may also be attribute
>-             // changes as well that imply additional hints.
>--            let mut data = self.data.as_mut().unwrap();
>-+            let data = self.data.as_mut().unwrap();
>-             data.restyle.hint.insert(RestyleHint::restyle_subtree());
>-         }
>- 
>-diff --git servo/components/style/matching.rs servo/components/style/matching.rs
>-index b62bc54bf768..f58d7cd123e6 100644
>---- servo/components/style/matching.rs
>-+++ servo/components/style/matching.rs
>-@@ -440,7 +440,7 @@ pub trait MatchMethods : TElement {
>-     fn finish_restyle(
>-         &self,
>-         context: &mut StyleContext<Self>,
>--        mut data: &mut ElementData,
>-+        data: &mut ElementData,
>-         mut new_styles: ElementStyles,
>-         important_rules_changed: bool,
>-     ) -> ChildCascadeRequirement {
>-diff --git servo/components/style/properties/properties.mako.rs servo/components/style/properties/properties.mako.rs
>-index d98e173db5ba..81ff00fb6d5e 100644
>---- servo/components/style/properties/properties.mako.rs
>-+++ servo/components/style/properties/properties.mako.rs
>-@@ -3364,7 +3364,7 @@ pub fn modify_border_style_for_inline_sides(style: &mut Arc<ComputedValues>,
>-                 return;
>-             }
>-         }
>--        let mut style = Arc::make_mut(style);
>-+        let style = Arc::make_mut(style);
>-         let border = Arc::make_mut(&mut style.border);
>-         match side {
>-             PhysicalSide::Left => {
>-diff --git servo/components/style/style_adjuster.rs servo/components/style/style_adjuster.rs
>-index 366641ebe0bc..6e51fa74072a 100644
>---- servo/components/style/style_adjuster.rs
>-+++ servo/components/style/style_adjuster.rs
>-@@ -269,7 +269,7 @@ impl<'a, 'b: 'a> StyleAdjuster<'a, 'b> {
>- 
>-         if overflow_x != original_overflow_x ||
>-            overflow_y != original_overflow_y {
>--            let mut box_style = self.style.mutate_box();
>-+            let box_style = self.style.mutate_box();
>-             box_style.set_overflow_x(overflow_x);
>-             box_style.set_overflow_y(overflow_y);
>-         }
>-diff --git servo/components/style/style_resolver.rs servo/components/style/style_resolver.rs
>-index cf512c4fbdd2..3fc1d57cc8f7 100644
>---- servo/components/style/style_resolver.rs
>-+++ servo/components/style/style_resolver.rs
>-@@ -247,7 +247,7 @@ where
>-                         Some(&*primary_style.style)
>-                     };
>- 
>--                for (i, mut inputs) in pseudo_array.iter_mut().enumerate() {
>-+                for (i, inputs) in pseudo_array.iter_mut().enumerate() {
>-                     if let Some(inputs) = inputs.take() {
>-                         let pseudo = PseudoElement::from_eager_index(i);
>-                         pseudo_styles.set(
>-diff --git servo/components/style/stylesheets/rule_list.rs servo/components/style/stylesheets/rule_list.rs
>-index 82e78015400d..14b3dc5e7696 100644
>---- servo/components/style/stylesheets/rule_list.rs
>-+++ servo/components/style/stylesheets/rule_list.rs
>-@@ -150,7 +150,7 @@ impl CssRulesHelpers for RawOffsetArc<Locked<CssRules>> {
>- 
>-         {
>-             let mut write_guard = lock.write();
>--            let mut rules = self.write_with(&mut write_guard);
>-+            let rules = self.write_with(&mut write_guard);
>-             // Step 5
>-             // Computes the maximum allowed parser state at a given index.
>-             let rev_state = rules.0.get(index).map_or(State::Body, CssRule::rule_state);
>-diff --git servo/components/style/stylesheets/rule_parser.rs servo/components/style/stylesheets/rule_parser.rs
>-index 007d7e11026e..f0d224e498a7 100644
>---- servo/components/style/stylesheets/rule_parser.rs
>-+++ servo/components/style/stylesheets/rule_parser.rs
>-@@ -209,7 +209,7 @@ impl<'a, 'i> AtRuleParser<'i> for TopLevelRuleParser<'a> {
>-                 let id = register_namespace(&url)
>-                     .map_err(|()| StyleParseError::UnspecifiedError)?;
>- 
>--                let mut namespaces = self.namespaces.as_mut().unwrap();
>-+                let namespaces = self.namespaces.as_mut().unwrap();
>- 
>-                 let opt_prefix = if let Ok(prefix) = prefix_result {
>-                     let prefix = Prefix::from(prefix.as_ref());
>-diff --git servo/components/style/stylesheets/rules_iterator.rs servo/components/style/stylesheets/rules_iterator.rs
>-index 95a3ab8b3885..65e1b637ae52 100644
>---- servo/components/style/stylesheets/rules_iterator.rs
>-+++ servo/components/style/stylesheets/rules_iterator.rs
>-@@ -70,7 +70,7 @@ impl<'a, 'b, C> Iterator for RulesIterator<'a, 'b, C>
>- 
>-             let rule;
>-             let sub_iter = {
>--                let mut nested_iter = self.stack.last_mut().unwrap();
>-+                let nested_iter = self.stack.last_mut().unwrap();
>-                 rule = match nested_iter.next() {
>-                     Some(r) => r,
>-                     None => {
>-diff --git servo/components/webdriver_server/lib.rs servo/components/webdriver_server/lib.rs
>-index bd2f667f9892..28a4885f0d41 100644
>---- servo/components/webdriver_server/lib.rs
>-+++ servo/components/webdriver_server/lib.rs
>-@@ -702,7 +702,7 @@ impl Handler {
>-     fn handle_set_timeouts(&mut self,
>-                            parameters: &TimeoutsParameters)
>-                            -> WebDriverResult<WebDriverResponse> {
>--        let mut session = self.session
>-+        let session = self.session
>-             .as_mut()
>-             .ok_or(WebDriverError::new(ErrorStatus::SessionNotCreated, ""))?;
>- 
>-diff --git servo/rust-commit-hash servo/rust-commit-hash
>-index d4f08fe97644..a08d23cd1a71 100644
>---- servo/rust-commit-hash
>-+++ servo/rust-commit-hash
>-@@ -1 +1 @@
>--599be0d18f4c6ddf36366d2a5a2ca6dc65886896
>-+13d94d5fa8129a34f5c77a1bcd76983f5aed2434
>-diff --git servo/tests/unit/style/stylist.rs servo/tests/unit/style/stylist.rs
>-index da9a9478957a..52067b501788 100644
>---- servo/tests/unit/style/stylist.rs
>-+++ servo/tests/unit/style/stylist.rs
>-@@ -51,19 +51,6 @@ fn get_mock_rules(css_selectors: &[&str]) -> (Vec<Vec<Rule>>, SharedRwLock) {
>-     }).collect(), shared_lock)
>- }
>- 
>--fn get_mock_map(selectors: &[&str]) -> (SelectorMap<Rule>, SharedRwLock) {
>--    let mut map = SelectorMap::<Rule>::new();
>--    let (selector_rules, shared_lock) = get_mock_rules(selectors);
>--
>--    for rules in selector_rules.into_iter() {
>--        for rule in rules.into_iter() {
>--            map.insert(rule, QuirksMode::NoQuirks)
>--        }
>--    }
>--
>--    (map, shared_lock)
>--}
>--
>- fn parse_selectors(selectors: &[&str]) -> Vec<Selector<SelectorImpl>> {
>-     selectors.iter()
>-              .map(|x| SelectorParser::parse_author_origin_no_namespace(x).unwrap().0
>diff --git a/www/firefox/files/patch-servo18126 b/www/firefox/files/patch-servo18126
>deleted file mode 100644
>index ec5e77ad94e0..000000000000
>--- a/www/firefox/files/patch-servo18126
>+++ /dev/null
>@@ -1,232 +0,0 @@
>-commit f0acf27d189d
>-Author: Simon Sapin <simon.sapin@exyr.org>
>-Date:   Thu Aug 17 11:05:32 2017 -0500
>-
>-    servo: Merge #18126 - geckolib: Fix some warnings (treated as error) new in Rust Nigthly (from servo:glow-fox); r=emilio
>-    
>-    Source-Repo: https://github.com/servo/servo
>-    Source-Revision: cc86ca2bcdec5e89ee5279085ea38db63ef41af9
>-    
>-    --HG--
>-    extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
>-    extra : subtree_revision : 0586dbc81f1411c89821605a6dae4ebd0af8f0d5
>----
>- servo/components/style/gecko/conversions.rs            |  2 +-
>- servo/components/style/gecko/wrapper.rs                |  2 +-
>- .../style/gecko_bindings/sugar/ns_t_array.rs           |  4 ++--
>- servo/components/style/properties/gecko.mako.rs        | 18 +++++++++---------
>- servo/components/style/style_adjuster.rs               |  4 ++--
>- servo/ports/geckolib/glue.rs                           | 12 ++++++------
>- 6 files changed, 21 insertions(+), 21 deletions(-)
>-
>-diff --git servo/components/style/gecko/conversions.rs servo/components/style/gecko/conversions.rs
>-index 8f3fb6bf2d0f..51015997c5c1 100644
>---- servo/components/style/gecko/conversions.rs
>-+++ servo/components/style/gecko/conversions.rs
>-@@ -348,7 +348,7 @@ impl nsStyleImage {
>-             // NB: stops are guaranteed to be none in the gecko side by
>-             // default.
>- 
>--            let mut gecko_stop = unsafe {
>-+            let gecko_stop = unsafe {
>-                 &mut (*gecko_gradient).mStops[index]
>-             };
>-             let mut coord = nsStyleCoord::null();
>-diff --git servo/components/style/gecko/wrapper.rs servo/components/style/gecko/wrapper.rs
>-index 034dd94590e2..c402ddaf15bd 100644
>---- servo/components/style/gecko/wrapper.rs
>-+++ servo/components/style/gecko/wrapper.rs
>-@@ -424,7 +424,7 @@ impl<'lb> GeckoXBLBinding<'lb> {
>-         }
>-     }
>- 
>--    fn each_xbl_stylist<F>(self, mut f: &mut F)
>-+    fn each_xbl_stylist<F>(self, f: &mut F)
>-     where
>-         F: FnMut(&Stylist),
>-     {
>-diff --git servo/components/style/gecko_bindings/sugar/ns_t_array.rs servo/components/style/gecko_bindings/sugar/ns_t_array.rs
>-index 6bc389702f54..068e10ddea1b 100644
>---- servo/components/style/gecko_bindings/sugar/ns_t_array.rs
>-+++ servo/components/style/gecko_bindings/sugar/ns_t_array.rs
>-@@ -90,7 +90,7 @@ impl<T> nsTArray<T> {
>-         // this can leak
>-         debug_assert!(len >= self.len() as u32);
>-         self.ensure_capacity(len as usize);
>--        let mut header = self.header_mut();
>-+        let header = self.header_mut();
>-         header.mLength = len;
>-     }
>- 
>-@@ -99,7 +99,7 @@ impl<T> nsTArray<T> {
>-     /// This will not leak since it only works on POD types (and thus doesn't assert)
>-     pub unsafe fn set_len_pod(&mut self, len: u32) where T: Copy {
>-         self.ensure_capacity(len as usize);
>--        let mut header = unsafe { self.header_mut() };
>-+        let header = unsafe { self.header_mut() };
>-         header.mLength = len;
>-     }
>- }
>-diff --git servo/components/style/properties/gecko.mako.rs servo/components/style/properties/gecko.mako.rs
>-index 9a2ab2135fc5..bc41ef139af5 100644
>---- servo/components/style/properties/gecko.mako.rs
>-+++ servo/components/style/properties/gecko.mako.rs
>-@@ -4136,14 +4136,14 @@ fn static_assert() {
>-                     fn init_shadow(filter: &mut nsStyleFilter) -> &mut nsCSSShadowArray {
>-                         unsafe {
>-                             let ref mut union = filter.__bindgen_anon_1;
>--                            let mut shadow_array: &mut *mut nsCSSShadowArray = union.mDropShadow.as_mut();
>-+                            let shadow_array: &mut *mut nsCSSShadowArray = union.mDropShadow.as_mut();
>-                             *shadow_array = Gecko_NewCSSShadowArray(1);
>- 
>-                             &mut **shadow_array
>-                         }
>-                     }
>- 
>--                    let mut gecko_shadow = init_shadow(gecko_filter);
>-+                    let gecko_shadow = init_shadow(gecko_filter);
>-                     gecko_shadow.mArray[0].set_from_simple_shadow(shadow);
>-                 },
>-                 Url(ref url) => {
>-@@ -4665,14 +4665,14 @@ fn static_assert() {
>-                     unsafe {
>-                         // We have to be very careful to avoid a copy here!
>-                         let ref mut union = ${ident}.__bindgen_anon_1;
>--                        let mut shape: &mut *mut StyleBasicShape = union.mBasicShape.as_mut();
>-+                        let shape: &mut *mut StyleBasicShape = union.mBasicShape.as_mut();
>-                         *shape = Gecko_NewBasicShape(ty);
>-                         &mut **shape
>-                     }
>-                 }
>-                 match servo_shape {
>-                     BasicShape::Inset(inset) => {
>--                        let mut shape = init_shape(${ident}, StyleBasicShapeType::Inset);
>-+                        let shape = init_shape(${ident}, StyleBasicShapeType::Inset);
>-                         unsafe { shape.mCoordinates.set_len(4) };
>- 
>-                         // set_len() can't call constructors, so the coordinates
>-@@ -4694,7 +4694,7 @@ fn static_assert() {
>-                         set_corners_from_radius(inset.round, &mut shape.mRadius);
>-                     }
>-                     BasicShape::Circle(circ) => {
>--                        let mut shape = init_shape(${ident}, StyleBasicShapeType::Circle);
>-+                        let shape = init_shape(${ident}, StyleBasicShapeType::Circle);
>-                         unsafe { shape.mCoordinates.set_len(1) };
>-                         shape.mCoordinates[0].leaky_set_null();
>-                         circ.radius.to_gecko_style_coord(&mut shape.mCoordinates[0]);
>-@@ -4702,7 +4702,7 @@ fn static_assert() {
>-                         shape.mPosition = circ.position.into();
>-                     }
>-                     BasicShape::Ellipse(el) => {
>--                        let mut shape = init_shape(${ident}, StyleBasicShapeType::Ellipse);
>-+                        let shape = init_shape(${ident}, StyleBasicShapeType::Ellipse);
>-                         unsafe { shape.mCoordinates.set_len(2) };
>-                         shape.mCoordinates[0].leaky_set_null();
>-                         el.semiaxis_x.to_gecko_style_coord(&mut shape.mCoordinates[0]);
>-@@ -4712,7 +4712,7 @@ fn static_assert() {
>-                         shape.mPosition = el.position.into();
>-                     }
>-                     BasicShape::Polygon(poly) => {
>--                        let mut shape = init_shape(${ident}, StyleBasicShapeType::Polygon);
>-+                        let shape = init_shape(${ident}, StyleBasicShapeType::Polygon);
>-                         unsafe {
>-                             shape.mCoordinates.set_len(poly.coordinates.len() as u32 * 2);
>-                         }
>-@@ -4797,7 +4797,7 @@ clip-path
>-             bindings::Gecko_nsStyleSVG_SetDashArrayLength(&mut self.gecko, v.len() as u32);
>-         }
>- 
>--        for (mut gecko, servo) in self.gecko.mStrokeDasharray.iter_mut().zip(v) {
>-+        for (gecko, servo) in self.gecko.mStrokeDasharray.iter_mut().zip(v) {
>-             match servo {
>-                 Either::First(number) => gecko.set_value(CoordDataValue::Factor(number)),
>-                 Either::Second(lop) => gecko.set(lop),
>-@@ -4885,7 +4885,7 @@ clip-path
>-         }
>- 
>-         self.gecko.mContextPropsBits = 0;
>--        for (mut gecko, servo) in self.gecko.mContextProps.iter_mut().zip(v) {
>-+        for (gecko, servo) in self.gecko.mContextProps.iter_mut().zip(v) {
>-             if servo.0 == atom!("fill") {
>-                 self.gecko.mContextPropsBits |= structs::NS_STYLE_CONTEXT_PROPERTY_FILL as u8;
>-             } else if servo.0 == atom!("stroke") {
>-diff --git servo/components/style/style_adjuster.rs servo/components/style/style_adjuster.rs
>-index 03b15916b237..366641ebe0bc 100644
>---- servo/components/style/style_adjuster.rs
>-+++ servo/components/style/style_adjuster.rs
>-@@ -167,7 +167,7 @@ impl<'a, 'b: 'a> StyleAdjuster<'a, 'b> {
>-         // When 'contain: paint', update overflow from 'visible' to 'clip'.
>-         if self.style.get_box().clone_contain().contains(contain::PAINT) {
>-             if self.style.get_box().clone_overflow_x() == overflow::visible {
>--                let mut box_style = self.style.mutate_box();
>-+                let box_style = self.style.mutate_box();
>-                 box_style.set_overflow_x(overflow::_moz_hidden_unscrollable);
>-                 box_style.set_overflow_y(overflow::_moz_hidden_unscrollable);
>-             }
>-@@ -182,7 +182,7 @@ impl<'a, 'b: 'a> StyleAdjuster<'a, 'b> {
>-         use properties::longhands::font_style::computed_value::T as font_style;
>-         use properties::longhands::font_weight::computed_value::T as font_weight;
>-         if self.style.get_font().clone__moz_math_variant() != moz_math_variant::none {
>--            let mut font_style = self.style.mutate_font();
>-+            let font_style = self.style.mutate_font();
>-             // Sadly we don't have a nice name for the computed value
>-             // of "font-weight: normal".
>-             font_style.set_font_weight(font_weight::normal());
>-diff --git servo/ports/geckolib/glue.rs servo/ports/geckolib/glue.rs
>-index 977728286fc3..fa09bee29553 100644
>---- servo/ports/geckolib/glue.rs
>-+++ servo/ports/geckolib/glue.rs
>-@@ -815,7 +815,7 @@ pub extern "C" fn Servo_StyleSet_AppendStyleSheet(
>- ) {
>-     let global_style_data = &*GLOBAL_STYLE_DATA;
>-     let mut data = PerDocumentStyleData::from_ffi(raw_data).borrow_mut();
>--    let mut data = &mut *data;
>-+    let data = &mut *data;
>-     let guard = global_style_data.shared_lock.read();
>-     data.stylesheets.append_stylesheet(
>-         &data.stylist,
>-@@ -867,7 +867,7 @@ pub extern "C" fn Servo_StyleSet_PrependStyleSheet(
>- ) {
>-     let global_style_data = &*GLOBAL_STYLE_DATA;
>-     let mut data = PerDocumentStyleData::from_ffi(raw_data).borrow_mut();
>--    let mut data = &mut *data;
>-+    let data = &mut *data;
>-     let guard = global_style_data.shared_lock.read();
>-     data.stylesheets.prepend_stylesheet(
>-         &data.stylist,
>-@@ -885,7 +885,7 @@ pub extern "C" fn Servo_StyleSet_InsertStyleSheetBefore(
>- ) {
>-     let global_style_data = &*GLOBAL_STYLE_DATA;
>-     let mut data = PerDocumentStyleData::from_ffi(raw_data).borrow_mut();
>--    let mut data = &mut *data;
>-+    let data = &mut *data;
>-     let guard = global_style_data.shared_lock.read();
>-     data.stylesheets.insert_stylesheet_before(
>-         &data.stylist,
>-@@ -903,7 +903,7 @@ pub extern "C" fn Servo_StyleSet_RemoveStyleSheet(
>- ) {
>-     let global_style_data = &*GLOBAL_STYLE_DATA;
>-     let mut data = PerDocumentStyleData::from_ffi(raw_data).borrow_mut();
>--    let mut data = &mut *data;
>-+    let data = &mut *data;
>-     let guard = global_style_data.shared_lock.read();
>-     data.stylesheets.remove_stylesheet(
>-         &data.stylist,
>-@@ -1274,7 +1274,7 @@ pub extern "C" fn Servo_StyleRule_GetSpecificityAtIndex(
>-     specificity: *mut u64
>- ) {
>-     read_locked_arc(rule, |rule: &StyleRule| {
>--        let mut specificity =  unsafe { specificity.as_mut().unwrap() };
>-+        let specificity =  unsafe { specificity.as_mut().unwrap() };
>-         let index = index as usize;
>-         if index >= rule.selectors.0.len() {
>-             *specificity = 0;
>-@@ -2775,7 +2775,7 @@ pub extern "C" fn Servo_NoteExplicitHints(element: RawGeckoElementBorrowed,
>- pub extern "C" fn Servo_TakeChangeHint(element: RawGeckoElementBorrowed,
>-                                        was_restyled: *mut bool) -> nsChangeHint
>- {
>--    let mut was_restyled =  unsafe { was_restyled.as_mut().unwrap() };
>-+    let was_restyled =  unsafe { was_restyled.as_mut().unwrap() };
>-     let element = GeckoElement(element);
>- 
>-     let damage = match element.mutate_data() {

Actions: View | Diff

Attachments on bug 222693: 186805 | 186872 | 186941 | 187066 | 187135 | 187228 | 187315 | 187320 | 187407 | 187456 | 187510 | 187598 | 187676 | 187784 | 187810 | 187898 | 187925 | 187967