FreeBSD Bugzilla – Attachment 187407 Details for
Bug 222693
www/firefox: update to 57.0
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
beta11
ff57.diff (text/plain), 102.36 KB, created by
Jan Beich
on 2017-10-23 23:04:57 UTC
(
hide
)
Description:
beta11
Filename:
MIME Type:
Creator:
Jan Beich
Created:
2017-10-23 23:04:57 UTC
Size:
102.36 KB
patch
obsolete
>From af37fb8e88b19f7d1cd6390531befc27a421fcd6 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 >Security: f78eac48-c3d1-4666-8de5-63ceea25a578 >MFH: 2017Q4 >--- > Mk/Uses/gecko.mk | 4 +- > www/firefox-i18n/Makefile | 6 +- > www/firefox-i18n/distinfo | 382 +++++------ > www/firefox/Makefile | 13 +- > www/firefox/distinfo | 6 +- > www/firefox/files/patch-bug1386887 | 89 --- > www/firefox/files/patch-bug1386957 | 14 - > 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 ------- > 14 files changed, 216 insertions(+), 1505 deletions(-) > delete mode 100644 www/firefox/files/patch-bug1386887 > delete mode 100644 www/firefox/files/patch-bug1386957 > 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 2bc948a8d220..531c329b96f2 100644 >--- a/www/firefox-i18n/Makefile >+++ b/www/firefox-i18n/Makefile >@@ -2,10 +2,10 @@ > # $FreeBSD$ > > PORTNAME= firefox-i18n >-PORTVERSION= 56.0.1 >+PORTVERSION= 57.0b11 > CATEGORIES= www > MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${DISTVERSION}/linux-i686/xpi \ >- MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build2/linux-i686/xpi >+ MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build1/linux-i686/xpi > PKGNAMEPREFIX= > DISTFILES= ${FIREFOX_I18N_:S/$/.xpi/} > DIST_SUBDIR= xpi/${DISTNAME} >@@ -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 04e78c05658b..49cddf05ca7e 100644 >--- a/www/firefox-i18n/distinfo >+++ b/www/firefox-i18n/distinfo >@@ -1,191 +1,191 @@ >-TIMESTAMP = 1507068922 >-SHA256 (xpi/firefox-i18n-56.0.1/ach.xpi) = 5a0769818c14878be1fc46c040fdd8c856914df481886270cd416389921e9862 >-SIZE (xpi/firefox-i18n-56.0.1/ach.xpi) = 454896 >-SHA256 (xpi/firefox-i18n-56.0.1/af.xpi) = 55ed0d5eeeb5038bc7cdbfaf64e38a5151b21331b6396b1b1bd67039290a1cd5 >-SIZE (xpi/firefox-i18n-56.0.1/af.xpi) = 456214 >-SHA256 (xpi/firefox-i18n-56.0.1/an.xpi) = 6d802d8c8fef1e3900443eee558dd54e2dbf9b5d548e4aaf6aa70efe53216971 >-SIZE (xpi/firefox-i18n-56.0.1/an.xpi) = 475863 >-SHA256 (xpi/firefox-i18n-56.0.1/ar.xpi) = eb07898a24acdbaa317bd7457abb6520e59b9fecd8fe7e66755e3f36b25d6c98 >-SIZE (xpi/firefox-i18n-56.0.1/ar.xpi) = 500712 >-SHA256 (xpi/firefox-i18n-56.0.1/as.xpi) = 3f0087df47d8f6faa492b580d7a3f3cec17ecaa74720c94e68a258171c94fe39 >-SIZE (xpi/firefox-i18n-56.0.1/as.xpi) = 508238 >-SHA256 (xpi/firefox-i18n-56.0.1/ast.xpi) = d5f77499d40153bfbc74713c61f3c6fecdf117a6e5240981a2bf822f974519e6 >-SIZE (xpi/firefox-i18n-56.0.1/ast.xpi) = 469157 >-SHA256 (xpi/firefox-i18n-56.0.1/az.xpi) = 3cf8984a42788b2627146fe64cd2bfca7597640ee1bf9f1ad268cbdce0b2b54c >-SIZE (xpi/firefox-i18n-56.0.1/az.xpi) = 484984 >-SHA256 (xpi/firefox-i18n-56.0.1/be.xpi) = 011d719bf75c77bf2c5cf56f246aaf58067b175151deee9ef9dee9e90b96bc17 >-SIZE (xpi/firefox-i18n-56.0.1/be.xpi) = 531385 >-SHA256 (xpi/firefox-i18n-56.0.1/bg.xpi) = 01070a5c87a1c39b8f39f2f5b7bd143b662526642d90098542f5b6eb17b69c69 >-SIZE (xpi/firefox-i18n-56.0.1/bg.xpi) = 528789 >-SHA256 (xpi/firefox-i18n-56.0.1/bn-BD.xpi) = ac18f71b01726dab12bbe200ba20282d98a5523f9d1dbea35869e3be43b12178 >-SIZE (xpi/firefox-i18n-56.0.1/bn-BD.xpi) = 542772 >-SHA256 (xpi/firefox-i18n-56.0.1/bn-IN.xpi) = 106d600b21c6877a11d028a7b2025c3ed8efa0eb4cf887621d579442138c273a >-SIZE (xpi/firefox-i18n-56.0.1/bn-IN.xpi) = 534450 >-SHA256 (xpi/firefox-i18n-56.0.1/br.xpi) = bc0a7456a118a2e01f408c0968ef8b9ae1c3992f50e5d190677b254881ccf127 >-SIZE (xpi/firefox-i18n-56.0.1/br.xpi) = 464256 >-SHA256 (xpi/firefox-i18n-56.0.1/bs.xpi) = dfce1edaa95d5d537f50b2ec71b41c2258699990ca7ff51f180d3fc7f3b4239d >-SIZE (xpi/firefox-i18n-56.0.1/bs.xpi) = 472256 >-SHA256 (xpi/firefox-i18n-56.0.1/ca.xpi) = d8056cbb6888fb408644fc19829c82b78f9bce429d2bc2d6a43124cb03b7d888 >-SIZE (xpi/firefox-i18n-56.0.1/ca.xpi) = 480364 >-SHA256 (xpi/firefox-i18n-56.0.1/cak.xpi) = dd5f141283676803730ddc2810f7bb645960b345bfe3afa6d38aea2cc6754cdd >-SIZE (xpi/firefox-i18n-56.0.1/cak.xpi) = 489507 >-SHA256 (xpi/firefox-i18n-56.0.1/cs.xpi) = 4c024e4244f2ba82e99435fcb368fa07a4426a49346599cecbfc5e83ba056bb6 >-SIZE (xpi/firefox-i18n-56.0.1/cs.xpi) = 485090 >-SHA256 (xpi/firefox-i18n-56.0.1/cy.xpi) = 57e43f3c40c54127f1485710a72d6dab400389c0736e1b02d5314108f782e10f >-SIZE (xpi/firefox-i18n-56.0.1/cy.xpi) = 466288 >-SHA256 (xpi/firefox-i18n-56.0.1/da.xpi) = 59e1abb36fdb7d47e74fd10d6033b86b9fa68acbfdc05d3da9e67378b7eb3b26 >-SIZE (xpi/firefox-i18n-56.0.1/da.xpi) = 460091 >-SHA256 (xpi/firefox-i18n-56.0.1/de.xpi) = f955f85aca61ffffebfbce54940b20177f272e7ff9c8096e274aef3154bf24ab >-SIZE (xpi/firefox-i18n-56.0.1/de.xpi) = 473856 >-SHA256 (xpi/firefox-i18n-56.0.1/dsb.xpi) = 1d3cb3448d68aa2fbd97d0d7771da47e141008595b78399c87f16615bbc8ef79 >-SIZE (xpi/firefox-i18n-56.0.1/dsb.xpi) = 489897 >-SHA256 (xpi/firefox-i18n-56.0.1/el.xpi) = fa77a8345f7a67a4ed480e6f702d32180fdbc1afc11ad0bad21ec9d6f52db168 >-SIZE (xpi/firefox-i18n-56.0.1/el.xpi) = 554120 >-SHA256 (xpi/firefox-i18n-56.0.1/en-GB.xpi) = 84c43b02c0ac41c4e4b8878ac1c29d620d9924c8fc8d0355591351edf9935349 >-SIZE (xpi/firefox-i18n-56.0.1/en-GB.xpi) = 447375 >-SHA256 (xpi/firefox-i18n-56.0.1/en-US.xpi) = fe1763e1c86d954c6ada561a884df22d10e88cf9c6339281b3750155cc05f425 >-SIZE (xpi/firefox-i18n-56.0.1/en-US.xpi) = 446951 >-SHA256 (xpi/firefox-i18n-56.0.1/en-ZA.xpi) = 6c0ecb3ff1e954d947dbabd80e9cc74969e5b19fec4a970006934f44bc28e619 >-SIZE (xpi/firefox-i18n-56.0.1/en-ZA.xpi) = 445916 >-SHA256 (xpi/firefox-i18n-56.0.1/eo.xpi) = 74ea18f4ac0adf3b4b246a6fbace1a863fa8d4a9c608a21cae7eedb6ea7f8060 >-SIZE (xpi/firefox-i18n-56.0.1/eo.xpi) = 468952 >-SHA256 (xpi/firefox-i18n-56.0.1/es-AR.xpi) = e1575e775c52c6d74148167dcaebd9805201f975871d8073e60854d919f3db9d >-SIZE (xpi/firefox-i18n-56.0.1/es-AR.xpi) = 475449 >-SHA256 (xpi/firefox-i18n-56.0.1/es-CL.xpi) = 8ecbb09d40c99823ff971f319a9012cae609207408e39f207b85e563c35d3c84 >-SIZE (xpi/firefox-i18n-56.0.1/es-CL.xpi) = 479922 >-SHA256 (xpi/firefox-i18n-56.0.1/es-ES.xpi) = b5d4691b663c223ac7e4d62b530fb9a94d1fab67d5c9ecfb6b8982451ab236fb >-SIZE (xpi/firefox-i18n-56.0.1/es-ES.xpi) = 365631 >-SHA256 (xpi/firefox-i18n-56.0.1/es-MX.xpi) = aec75604d1071ef585f1462ca33b9bf2b6c9299d6d49b2ffc01096462c3794c4 >-SIZE (xpi/firefox-i18n-56.0.1/es-MX.xpi) = 482565 >-SHA256 (xpi/firefox-i18n-56.0.1/et.xpi) = a7c7fdf6cdfd44e5f8786d587360d2aa022cde980fc17e67a4caa136197150df >-SIZE (xpi/firefox-i18n-56.0.1/et.xpi) = 462104 >-SHA256 (xpi/firefox-i18n-56.0.1/eu.xpi) = ed48e6df6381b74b6bb9525fc2401a39ccdb99eaf705ee41811eee81db4b13ac >-SIZE (xpi/firefox-i18n-56.0.1/eu.xpi) = 467884 >-SHA256 (xpi/firefox-i18n-56.0.1/fa.xpi) = 61d78db454d888a95c9dc731ffcbb6a6981c9de164a539b6d6d05dd5b52b4fcd >-SIZE (xpi/firefox-i18n-56.0.1/fa.xpi) = 522909 >-SHA256 (xpi/firefox-i18n-56.0.1/ff.xpi) = c50d38ccc0b57b68ab98fefa8537f34f8b594c67139335826e4f17ee0e6773fd >-SIZE (xpi/firefox-i18n-56.0.1/ff.xpi) = 463098 >-SHA256 (xpi/firefox-i18n-56.0.1/fi.xpi) = 278f60e6f3e4b2c52365a172509a4e372aa062409b46c7706002fe69693b51aa >-SIZE (xpi/firefox-i18n-56.0.1/fi.xpi) = 461923 >-SHA256 (xpi/firefox-i18n-56.0.1/fr.xpi) = 303dc412abde1e69f44bf8f24fe7f8951ce42cc27be76c9d17eb44a4b1832bb4 >-SIZE (xpi/firefox-i18n-56.0.1/fr.xpi) = 484562 >-SHA256 (xpi/firefox-i18n-56.0.1/fy-NL.xpi) = 7a420f2f0c65f8fef734c7f5731f4cdb0e2900ea7559e99bb382ab33c5e713f6 >-SIZE (xpi/firefox-i18n-56.0.1/fy-NL.xpi) = 478044 >-SHA256 (xpi/firefox-i18n-56.0.1/ga-IE.xpi) = a2934ac63c494a0b3e0d22f622a2e4b53b96df4bffa8d053517da8299c7173e8 >-SIZE (xpi/firefox-i18n-56.0.1/ga-IE.xpi) = 489379 >-SHA256 (xpi/firefox-i18n-56.0.1/gd.xpi) = b6a97f15d16b7ac69d3b1073d9c11ac6b20436188f3f0978a9115bc04b6ee2df >-SIZE (xpi/firefox-i18n-56.0.1/gd.xpi) = 476927 >-SHA256 (xpi/firefox-i18n-56.0.1/gl.xpi) = 54a990f5b50e065e4c3e13eda4fb2f25107693db14860e8ea0aa2236ef1e0cbe >-SIZE (xpi/firefox-i18n-56.0.1/gl.xpi) = 466468 >-SHA256 (xpi/firefox-i18n-56.0.1/gn.xpi) = edae7658377dc3431149baaafb716bb411deeeb61d935254fc192188fa226f6e >-SIZE (xpi/firefox-i18n-56.0.1/gn.xpi) = 485790 >-SHA256 (xpi/firefox-i18n-56.0.1/gu-IN.xpi) = b175317b939d97ead4166bf61f8eb8381948fba4a006d4463e80d19028c0cedc >-SIZE (xpi/firefox-i18n-56.0.1/gu-IN.xpi) = 513740 >-SHA256 (xpi/firefox-i18n-56.0.1/he.xpi) = 69c49d9f467d426e41d32626ebca768e56c7861e6352c24519d9a0b4ca8c24cf >-SIZE (xpi/firefox-i18n-56.0.1/he.xpi) = 488495 >-SHA256 (xpi/firefox-i18n-56.0.1/hi-IN.xpi) = fd75cea0e56a1bb346f71a902d487c2509f8904899492ee1f958af4e7df2c249 >-SIZE (xpi/firefox-i18n-56.0.1/hi-IN.xpi) = 538303 >-SHA256 (xpi/firefox-i18n-56.0.1/hr.xpi) = 04c0a9baa1ec3e19c14bc17d3d17a47ea53c993f3a81c4b3347e6a96492141bb >-SIZE (xpi/firefox-i18n-56.0.1/hr.xpi) = 475058 >-SHA256 (xpi/firefox-i18n-56.0.1/hsb.xpi) = 77dfa6996b9a0b821066d80508d3fbf68d2335190f5600f5699d012fffd2fbdf >-SIZE (xpi/firefox-i18n-56.0.1/hsb.xpi) = 487599 >-SHA256 (xpi/firefox-i18n-56.0.1/hu.xpi) = 32c183296a65eb0b10ace20c8b35d0a37d10278fabd4b9826ed16bebba4e8936 >-SIZE (xpi/firefox-i18n-56.0.1/hu.xpi) = 490102 >-SHA256 (xpi/firefox-i18n-56.0.1/hy-AM.xpi) = 44e685f7353997fe77176e9f60e90725603f3453857fc18906ba99a7f3241b58 >-SIZE (xpi/firefox-i18n-56.0.1/hy-AM.xpi) = 527712 >-SHA256 (xpi/firefox-i18n-56.0.1/id.xpi) = 67635d7c4cd289813783cb692c56ee4e4ffee71adbb3d9de9f87338203fb8e80 >-SIZE (xpi/firefox-i18n-56.0.1/id.xpi) = 459066 >-SHA256 (xpi/firefox-i18n-56.0.1/is.xpi) = c6087dad575452d8a4000a6e1e3d7fe4152b86fa84add96288b4fa4e50f8d85f >-SIZE (xpi/firefox-i18n-56.0.1/is.xpi) = 467448 >-SHA256 (xpi/firefox-i18n-56.0.1/it.xpi) = 1a78b44d14d7f8d42c16b62539026c6ff1016dd8b249abf6bfd5a7691d840ac1 >-SIZE (xpi/firefox-i18n-56.0.1/it.xpi) = 358695 >-SHA256 (xpi/firefox-i18n-56.0.1/ja.xpi) = 72b665fb904a8c9b6a0d52ad8d00d6e6bab4cc5e4b80ec0fc8aeb4c6eec0767b >-SIZE (xpi/firefox-i18n-56.0.1/ja.xpi) = 527926 >-SHA256 (xpi/firefox-i18n-56.0.1/ka.xpi) = 7db1c1c2a96ea24f5cb431061bc8e35edf4614841b4aba4d94ff772d12956cd7 >-SIZE (xpi/firefox-i18n-56.0.1/ka.xpi) = 509096 >-SHA256 (xpi/firefox-i18n-56.0.1/kab.xpi) = 7fcdfd89576f4bddd306fa086be78829f2d51ea8b8b711c08b38e3eee1ffc61b >-SIZE (xpi/firefox-i18n-56.0.1/kab.xpi) = 477420 >-SHA256 (xpi/firefox-i18n-56.0.1/kk.xpi) = cf68f9ccead4f294b34b65d834fca8958bc2a37c87f99caf3b2b505b9983391d >-SIZE (xpi/firefox-i18n-56.0.1/kk.xpi) = 534932 >-SHA256 (xpi/firefox-i18n-56.0.1/km.xpi) = 5ea6da095c7e6b2926be1344f9b0a5940d9e3c4afc7f069d090554e7ee505a2c >-SIZE (xpi/firefox-i18n-56.0.1/km.xpi) = 549344 >-SHA256 (xpi/firefox-i18n-56.0.1/kn.xpi) = d13f5fab53fe4c4a7c542f764d95312e77e82334b3f23503057acbd404a93403 >-SIZE (xpi/firefox-i18n-56.0.1/kn.xpi) = 545518 >-SHA256 (xpi/firefox-i18n-56.0.1/ko.xpi) = 0325f0fc9944836effe4e8eddc4c5c7ed42e43e09dd7256dfc07c07dbd6391e2 >-SIZE (xpi/firefox-i18n-56.0.1/ko.xpi) = 502895 >-SHA256 (xpi/firefox-i18n-56.0.1/lij.xpi) = 1fc0e47bb89335b6c53439e3b6d4fc0194822865acf7a4056ed779d4a77b0c3b >-SIZE (xpi/firefox-i18n-56.0.1/lij.xpi) = 467275 >-SHA256 (xpi/firefox-i18n-56.0.1/lt.xpi) = fc688802b4746dba520dee4c671d6f326e540aea0608e18c38f0f2eaefacb4e4 >-SIZE (xpi/firefox-i18n-56.0.1/lt.xpi) = 488753 >-SHA256 (xpi/firefox-i18n-56.0.1/lv.xpi) = fba7bdde1975652c41b3bcab2dc469d11be9ef232c2873034de371b1fc76f543 >-SIZE (xpi/firefox-i18n-56.0.1/lv.xpi) = 481628 >-SHA256 (xpi/firefox-i18n-56.0.1/mai.xpi) = 150368f961ab2bf857ed6595515fd3b92620f7d9c15aca7b3e675ce0ea740253 >-SIZE (xpi/firefox-i18n-56.0.1/mai.xpi) = 524702 >-SHA256 (xpi/firefox-i18n-56.0.1/mk.xpi) = 8e430484eb3630f48cf00dd594b4b3cac2e1982fa30edb905137f35b8ab6c961 >-SIZE (xpi/firefox-i18n-56.0.1/mk.xpi) = 507818 >-SHA256 (xpi/firefox-i18n-56.0.1/ml.xpi) = eb87db03918f7ff2eab63cdb9228af635c756add32a182d58ad531489d60405a >-SIZE (xpi/firefox-i18n-56.0.1/ml.xpi) = 547547 >-SHA256 (xpi/firefox-i18n-56.0.1/mr.xpi) = a4d4a5d410b421991b6935624651638679395fc7f82865649d0d2669244ad8cd >-SIZE (xpi/firefox-i18n-56.0.1/mr.xpi) = 536673 >-SHA256 (xpi/firefox-i18n-56.0.1/ms.xpi) = d5d17bef7724b6f4fb0f9a96b779e8840491de65a865d126edfeb66d49198100 >-SIZE (xpi/firefox-i18n-56.0.1/ms.xpi) = 466107 >-SHA256 (xpi/firefox-i18n-56.0.1/my.xpi) = 580979d39ef1bd11960e9a9619b59dddff15b3636071ca9dfea7a215ca744078 >-SIZE (xpi/firefox-i18n-56.0.1/my.xpi) = 536722 >-SHA256 (xpi/firefox-i18n-56.0.1/nb-NO.xpi) = b9a5d83079adb7f4b4bbdad55d88055ca6981849a76db0d027e0dff562118089 >-SIZE (xpi/firefox-i18n-56.0.1/nb-NO.xpi) = 465575 >-SHA256 (xpi/firefox-i18n-56.0.1/nl.xpi) = 165667535c09f079820d14a46fd72191e5fb1def75963c3a47bc80b8dab89fc7 >-SIZE (xpi/firefox-i18n-56.0.1/nl.xpi) = 469053 >-SHA256 (xpi/firefox-i18n-56.0.1/nn-NO.xpi) = ed42b684815c2bce7271afe55f7a06cde02cd399a278c0e54a3dbe840eb0a372 >-SIZE (xpi/firefox-i18n-56.0.1/nn-NO.xpi) = 466208 >-SHA256 (xpi/firefox-i18n-56.0.1/or.xpi) = 306d2554a6f6143d09e37be0714ea7bb170569e09514b2dcb6de3ec44fdd84cd >-SIZE (xpi/firefox-i18n-56.0.1/or.xpi) = 518165 >-SHA256 (xpi/firefox-i18n-56.0.1/pa-IN.xpi) = 029a92c54db643481dcfdbab08016a569622e3d80ff12961dacad3a68faafbbb >-SIZE (xpi/firefox-i18n-56.0.1/pa-IN.xpi) = 509046 >-SHA256 (xpi/firefox-i18n-56.0.1/pl.xpi) = 051ca15a827eb86a49fc899b08d90e447d5f6e3909642835c9c7163cd6aa8688 >-SIZE (xpi/firefox-i18n-56.0.1/pl.xpi) = 377525 >-SHA256 (xpi/firefox-i18n-56.0.1/pt-BR.xpi) = bf68302a604749211cdc2255073d1d755727afdbefa054118c322292c6d369fe >-SIZE (xpi/firefox-i18n-56.0.1/pt-BR.xpi) = 470954 >-SHA256 (xpi/firefox-i18n-56.0.1/pt-PT.xpi) = 156edd762bbeaf980211f91516ac3e7967bdaaab2cfdccf61238fdcf726ef5b2 >-SIZE (xpi/firefox-i18n-56.0.1/pt-PT.xpi) = 472803 >-SHA256 (xpi/firefox-i18n-56.0.1/rm.xpi) = 2f2399082c4e7cff27f1d77fd7bd76acda1e3b61d4f14b87efc7dd2abb317586 >-SIZE (xpi/firefox-i18n-56.0.1/rm.xpi) = 467019 >-SHA256 (xpi/firefox-i18n-56.0.1/ro.xpi) = afa7826fa3d68464960d3129eb64e17df73e8a41b4e8a6f6688e76111d2a941a >-SIZE (xpi/firefox-i18n-56.0.1/ro.xpi) = 470785 >-SHA256 (xpi/firefox-i18n-56.0.1/ru.xpi) = 62201c8e4c4ac140cb5e82fd699059de719f90ba77a41ba396971d65c0ba9e35 >-SIZE (xpi/firefox-i18n-56.0.1/ru.xpi) = 541437 >-SHA256 (xpi/firefox-i18n-56.0.1/si.xpi) = 385612528745dcc87df53770a8d52a573d69e71ea5275a40afd5be0108754bae >-SIZE (xpi/firefox-i18n-56.0.1/si.xpi) = 515921 >-SHA256 (xpi/firefox-i18n-56.0.1/sk.xpi) = 4d1a6cf70a5415a947f630ee41060ebbfea85271ce1dac9f3329fcf8c376115a >-SIZE (xpi/firefox-i18n-56.0.1/sk.xpi) = 495564 >-SHA256 (xpi/firefox-i18n-56.0.1/sl.xpi) = 4c5b93d99e038e86e8461ebfb1bcc4bfb7e52430d385bcb27354826fd7f1af09 >-SIZE (xpi/firefox-i18n-56.0.1/sl.xpi) = 473806 >-SHA256 (xpi/firefox-i18n-56.0.1/son.xpi) = f203ef6d205f6b69c706399a1013e94a4fb4017ffed9cff1c47ccd60eec02f0f >-SIZE (xpi/firefox-i18n-56.0.1/son.xpi) = 464323 >-SHA256 (xpi/firefox-i18n-56.0.1/sq.xpi) = d029c776769e327356304886e17846ec79568a9aeac47f779bd2e0a24229ce4f >-SIZE (xpi/firefox-i18n-56.0.1/sq.xpi) = 479512 >-SHA256 (xpi/firefox-i18n-56.0.1/sr.xpi) = fef5561cb30d850319544df750d717bf6a63f95ba2b981e0d8dd0857a20e0e2d >-SIZE (xpi/firefox-i18n-56.0.1/sr.xpi) = 504486 >-SHA256 (xpi/firefox-i18n-56.0.1/sv-SE.xpi) = a8819d2e17a9388bc2bf9f33219a85350470eb4c12fc3c752f90514198c68033 >-SIZE (xpi/firefox-i18n-56.0.1/sv-SE.xpi) = 473949 >-SHA256 (xpi/firefox-i18n-56.0.1/ta.xpi) = ba97a17431b9626e5f63fce46d7daf50944a95eb36ecd82d1baffacf71981381 >-SIZE (xpi/firefox-i18n-56.0.1/ta.xpi) = 530646 >-SHA256 (xpi/firefox-i18n-56.0.1/te.xpi) = 06a0ef7059b2d272f2cd4817d4b821e12baf0667bcf9226f95154e0f2f1ad4c0 >-SIZE (xpi/firefox-i18n-56.0.1/te.xpi) = 549585 >-SHA256 (xpi/firefox-i18n-56.0.1/th.xpi) = 57a0036f4d34487642e25011208f7bc2f7dec57e2e53003d30eae8eee54fd24b >-SIZE (xpi/firefox-i18n-56.0.1/th.xpi) = 520297 >-SHA256 (xpi/firefox-i18n-56.0.1/tr.xpi) = 1b4f6c67df638d197a4a335e4804c2ace7f4418143fb315f8b1869d0f58427d5 >-SIZE (xpi/firefox-i18n-56.0.1/tr.xpi) = 480550 >-SHA256 (xpi/firefox-i18n-56.0.1/uk.xpi) = e9d58bb00b3c5ab1fd3e733dad500fc5b16f8687a5c734be3005d3224fce6b2b >-SIZE (xpi/firefox-i18n-56.0.1/uk.xpi) = 535436 >-SHA256 (xpi/firefox-i18n-56.0.1/ur.xpi) = 38d1ca95c04dd04755c5bc81428cc023f745b3eecd89a7d25372d5d0d05533be >-SIZE (xpi/firefox-i18n-56.0.1/ur.xpi) = 527354 >-SHA256 (xpi/firefox-i18n-56.0.1/uz.xpi) = d1825e387c642e7138769e4ce93bb87f37c11af485d4f2304946c87cd3d5b561 >-SIZE (xpi/firefox-i18n-56.0.1/uz.xpi) = 475101 >-SHA256 (xpi/firefox-i18n-56.0.1/vi.xpi) = 4cf4623f5444494c004e0e68bb1fa6b7fa19c4312b64ca5853b18f21fbc881c3 >-SIZE (xpi/firefox-i18n-56.0.1/vi.xpi) = 487150 >-SHA256 (xpi/firefox-i18n-56.0.1/xh.xpi) = d1180cc0ed1e5d06ebd13e3349374d72d43d609047f61f1e69b1cc9306aec8be >-SIZE (xpi/firefox-i18n-56.0.1/xh.xpi) = 477838 >-SHA256 (xpi/firefox-i18n-56.0.1/zh-CN.xpi) = b50a88457241bd88e7e18dcd909d216fa37f52017f5d33f4721ec774ec57c845 >-SIZE (xpi/firefox-i18n-56.0.1/zh-CN.xpi) = 498979 >-SHA256 (xpi/firefox-i18n-56.0.1/zh-TW.xpi) = b812f005d3a87a80b228e9e01ff2daecb43fa781793cf73a4178cde54172b368 >-SIZE (xpi/firefox-i18n-56.0.1/zh-TW.xpi) = 497765 >+TIMESTAMP = 1508789743 >+SHA256 (xpi/firefox-i18n-57.0b11/ach.xpi) = a3029614a26c52d5da9e048385c75898aa786c13fc3e28d7a8a6df696fb45d2d >+SIZE (xpi/firefox-i18n-57.0b11/ach.xpi) = 440791 >+SHA256 (xpi/firefox-i18n-57.0b11/af.xpi) = d7c883df3e0b089b6a88cbe968545810ee44b46b899c51a63beca2002ae4278e >+SIZE (xpi/firefox-i18n-57.0b11/af.xpi) = 442206 >+SHA256 (xpi/firefox-i18n-57.0b11/an.xpi) = 862a491353b1170cdfc03056d16d89ba933b05a16494d697640d37809dd7b611 >+SIZE (xpi/firefox-i18n-57.0b11/an.xpi) = 462778 >+SHA256 (xpi/firefox-i18n-57.0b11/ar.xpi) = cd22c677f80ff99b242d23fbac92eee28293322ddb5e7d0562eaa07f4a085a38 >+SIZE (xpi/firefox-i18n-57.0b11/ar.xpi) = 487707 >+SHA256 (xpi/firefox-i18n-57.0b11/as.xpi) = 28a31ba5ac4ca2614a40ee1778ddd52f8149f5af0fc1232f3364a863397a5e2a >+SIZE (xpi/firefox-i18n-57.0b11/as.xpi) = 491075 >+SHA256 (xpi/firefox-i18n-57.0b11/ast.xpi) = 22d57e1401f90656e8e58192d94c838e4466ac71f0749a294c2551c65e4a16cb >+SIZE (xpi/firefox-i18n-57.0b11/ast.xpi) = 455677 >+SHA256 (xpi/firefox-i18n-57.0b11/az.xpi) = 41a576be5f61c904e16eb85ba7ed3b43cb303aa8d92a8c4db501d7031b51dcbc >+SIZE (xpi/firefox-i18n-57.0b11/az.xpi) = 466042 >+SHA256 (xpi/firefox-i18n-57.0b11/be.xpi) = 253b5fa61923f4ef2a5b02e056606bee45d3ccb00d5870cc18c9f6ebab01e8a8 >+SIZE (xpi/firefox-i18n-57.0b11/be.xpi) = 514705 >+SHA256 (xpi/firefox-i18n-57.0b11/bg.xpi) = 25b2dbd29ef7be1873ea9b89eaf363c723469c536ac9951e974d55446dc60d60 >+SIZE (xpi/firefox-i18n-57.0b11/bg.xpi) = 508744 >+SHA256 (xpi/firefox-i18n-57.0b11/bn-BD.xpi) = 545320fd56d71cd9bbdf19cb448337ccc32036f011aed74a738e943662a86df4 >+SIZE (xpi/firefox-i18n-57.0b11/bn-BD.xpi) = 526393 >+SHA256 (xpi/firefox-i18n-57.0b11/bn-IN.xpi) = c96414b7a3b435496b579716ac424183c391641a7fed52a5ee5e5e5cd26dd658 >+SIZE (xpi/firefox-i18n-57.0b11/bn-IN.xpi) = 516175 >+SHA256 (xpi/firefox-i18n-57.0b11/br.xpi) = 0ed02fc603fff04d25cc525ed1405552c2d2c259a545516df623ce2930493b1c >+SIZE (xpi/firefox-i18n-57.0b11/br.xpi) = 451680 >+SHA256 (xpi/firefox-i18n-57.0b11/bs.xpi) = e2437ed1ea83c972c922803e3b4dcbd1a6f460159af0b81692e7e9a3cd92c2b2 >+SIZE (xpi/firefox-i18n-57.0b11/bs.xpi) = 457832 >+SHA256 (xpi/firefox-i18n-57.0b11/ca.xpi) = 72cf63ab33280e455a23953b6f44fd39e05a2a0b0c1b7ec411a58479f5891f5d >+SIZE (xpi/firefox-i18n-57.0b11/ca.xpi) = 466641 >+SHA256 (xpi/firefox-i18n-57.0b11/cak.xpi) = 195551a9f0fd8e684ab5966fa57a8592058663b75637d8a95b7396ab7b438d3c >+SIZE (xpi/firefox-i18n-57.0b11/cak.xpi) = 474622 >+SHA256 (xpi/firefox-i18n-57.0b11/cs.xpi) = 4efd0f70abc0ddccaadde68d9dcfd3c55b7d116b604e656c2ad0d0623ae4c4a4 >+SIZE (xpi/firefox-i18n-57.0b11/cs.xpi) = 468115 >+SHA256 (xpi/firefox-i18n-57.0b11/cy.xpi) = a04158429a870232984b3aabc00da97e92ac49c691f9ceadfe75d6e79cbd230d >+SIZE (xpi/firefox-i18n-57.0b11/cy.xpi) = 454562 >+SHA256 (xpi/firefox-i18n-57.0b11/da.xpi) = 9e14dd19701e9f89e01c90dda1e7a9ee23a93101d2993e483b9a962734a54316 >+SIZE (xpi/firefox-i18n-57.0b11/da.xpi) = 446523 >+SHA256 (xpi/firefox-i18n-57.0b11/de.xpi) = f5a3151789e3cf6a11d0813617111b033aa22dc94f37f4614a5c641910e2e0b9 >+SIZE (xpi/firefox-i18n-57.0b11/de.xpi) = 460812 >+SHA256 (xpi/firefox-i18n-57.0b11/dsb.xpi) = f2901db6838551e82c8e426ad51570668d8c655a405a4739f4003cd3a5eb963a >+SIZE (xpi/firefox-i18n-57.0b11/dsb.xpi) = 478145 >+SHA256 (xpi/firefox-i18n-57.0b11/el.xpi) = 2ed59b99484b487f539e3108a6df6f4c8b13d6facdc545cb025ea621d6b8ec25 >+SIZE (xpi/firefox-i18n-57.0b11/el.xpi) = 534515 >+SHA256 (xpi/firefox-i18n-57.0b11/en-GB.xpi) = df877de1bc899f9c5c7741a06ef222d4fb59bb6a393bf193c1580ff5c57a750f >+SIZE (xpi/firefox-i18n-57.0b11/en-GB.xpi) = 437750 >+SHA256 (xpi/firefox-i18n-57.0b11/en-US.xpi) = 629fd830ad4a5261391aa0a380f4c9e1dc63d2dfb539d9ae3a603b7650573eb5 >+SIZE (xpi/firefox-i18n-57.0b11/en-US.xpi) = 437987 >+SHA256 (xpi/firefox-i18n-57.0b11/en-ZA.xpi) = 712a6476d7aec9001fad6abbf1b762293222b9eb51f184219118dfb0a3499d52 >+SIZE (xpi/firefox-i18n-57.0b11/en-ZA.xpi) = 432019 >+SHA256 (xpi/firefox-i18n-57.0b11/eo.xpi) = f8aef06a869a2a60e46b2b4f1169b20fff7be0ecede69e1ea71e8324007794f8 >+SIZE (xpi/firefox-i18n-57.0b11/eo.xpi) = 452891 >+SHA256 (xpi/firefox-i18n-57.0b11/es-AR.xpi) = b387ca8ae7d8f17480bef5536faf9e0e0407065cdb8b332434fcd686e2401ab9 >+SIZE (xpi/firefox-i18n-57.0b11/es-AR.xpi) = 461721 >+SHA256 (xpi/firefox-i18n-57.0b11/es-CL.xpi) = c8a108779e37dec4137dc8abda99e992341045a99c59095b19a917ff1a3600a4 >+SIZE (xpi/firefox-i18n-57.0b11/es-CL.xpi) = 464422 >+SHA256 (xpi/firefox-i18n-57.0b11/es-ES.xpi) = cab059c1781b8eb87e571531aba3309c7f7c6189158634ca58476e6fbf67b78a >+SIZE (xpi/firefox-i18n-57.0b11/es-ES.xpi) = 353622 >+SHA256 (xpi/firefox-i18n-57.0b11/es-MX.xpi) = faa99f584717465b65c073c81bb565034200846ae45208c6ffd9182dcc497859 >+SIZE (xpi/firefox-i18n-57.0b11/es-MX.xpi) = 466764 >+SHA256 (xpi/firefox-i18n-57.0b11/et.xpi) = e4bf4e11f1b70d369f9560b011682ac53049578a94137288aed8e19ef1508227 >+SIZE (xpi/firefox-i18n-57.0b11/et.xpi) = 447277 >+SHA256 (xpi/firefox-i18n-57.0b11/eu.xpi) = 0425be3c9b63f2ce4fd15570b7fd5fd18fa86d8da0199e8f6fbb44fffa1aad02 >+SIZE (xpi/firefox-i18n-57.0b11/eu.xpi) = 454671 >+SHA256 (xpi/firefox-i18n-57.0b11/fa.xpi) = 9dbd3a7d7838fc5505c0ffd2d18f6efc2dd43587bdd737193a941885105f68b8 >+SIZE (xpi/firefox-i18n-57.0b11/fa.xpi) = 509600 >+SHA256 (xpi/firefox-i18n-57.0b11/ff.xpi) = 4ec6ff04c0ded2a8eb897870f7cb754fcc58baa0ca1e583d99a54ff2b00230aa >+SIZE (xpi/firefox-i18n-57.0b11/ff.xpi) = 449126 >+SHA256 (xpi/firefox-i18n-57.0b11/fi.xpi) = 41f02eb77794acfae05906e00553390bc4f15ca6fb5d509fa5cf8fdf0c7275f4 >+SIZE (xpi/firefox-i18n-57.0b11/fi.xpi) = 445636 >+SHA256 (xpi/firefox-i18n-57.0b11/fr.xpi) = 0d5853862d5a4e34a3f7052d7da8f6a8450ff3d1afa1717c5f6dcbbc2da3b7a0 >+SIZE (xpi/firefox-i18n-57.0b11/fr.xpi) = 471515 >+SHA256 (xpi/firefox-i18n-57.0b11/fy-NL.xpi) = a3b0acd8851642132048fcc720b3ce0fec241143555131175f27a5b298eda76f >+SIZE (xpi/firefox-i18n-57.0b11/fy-NL.xpi) = 464006 >+SHA256 (xpi/firefox-i18n-57.0b11/ga-IE.xpi) = aafd5de5e8ce591d6f23fa1bd2fd6025056b939a16cf4f520d20f86e3d043ab4 >+SIZE (xpi/firefox-i18n-57.0b11/ga-IE.xpi) = 475961 >+SHA256 (xpi/firefox-i18n-57.0b11/gd.xpi) = f8e3755fab10d8982661f41c1275b429d84e818afe4ac3bcb93bb6f82846f6e5 >+SIZE (xpi/firefox-i18n-57.0b11/gd.xpi) = 464011 >+SHA256 (xpi/firefox-i18n-57.0b11/gl.xpi) = f514b654dd925a7656eeff0dd2a736eede08257cbd369e885c8d962e5149c852 >+SIZE (xpi/firefox-i18n-57.0b11/gl.xpi) = 452136 >+SHA256 (xpi/firefox-i18n-57.0b11/gn.xpi) = 13aa972d3efc44a94144954af13dcef51cc26503d907847f3dcfb5dc18080b64 >+SIZE (xpi/firefox-i18n-57.0b11/gn.xpi) = 471955 >+SHA256 (xpi/firefox-i18n-57.0b11/gu-IN.xpi) = 99411e856ce895409b9bf8371ea389319281cab061e1e0e50921d386068e2082 >+SIZE (xpi/firefox-i18n-57.0b11/gu-IN.xpi) = 511247 >+SHA256 (xpi/firefox-i18n-57.0b11/he.xpi) = 2e9a2b413250d6100e31c3875ec942fc5952aa692ed93940e5571007899343a0 >+SIZE (xpi/firefox-i18n-57.0b11/he.xpi) = 471917 >+SHA256 (xpi/firefox-i18n-57.0b11/hi-IN.xpi) = 5c6de34731e14ad592604593ccd815a0b58fb6ce1cb7d1ef544addefabefd490 >+SIZE (xpi/firefox-i18n-57.0b11/hi-IN.xpi) = 521682 >+SHA256 (xpi/firefox-i18n-57.0b11/hr.xpi) = 00d946df46cf846260e72f45288dc368f622bcc64a483acf065c5442ff0e21cd >+SIZE (xpi/firefox-i18n-57.0b11/hr.xpi) = 460721 >+SHA256 (xpi/firefox-i18n-57.0b11/hsb.xpi) = 813af7f30b4b21d3263191a889fc4cda1a67e1d2fefed9fa33d18ad125f8c1af >+SIZE (xpi/firefox-i18n-57.0b11/hsb.xpi) = 475137 >+SHA256 (xpi/firefox-i18n-57.0b11/hu.xpi) = 08156d6649eb6a13b6fbedf5f8dae15b12ee364ae12b27a5185f7b3f4a15d6eb >+SIZE (xpi/firefox-i18n-57.0b11/hu.xpi) = 475303 >+SHA256 (xpi/firefox-i18n-57.0b11/hy-AM.xpi) = b6615791186bdc6ca39ffe6cfba4f9b84231c14baaa40261445fa6f5e4aed1b8 >+SIZE (xpi/firefox-i18n-57.0b11/hy-AM.xpi) = 510399 >+SHA256 (xpi/firefox-i18n-57.0b11/id.xpi) = 9c3f5cd35828ef57eb5c4a5ba60f6ad5a28ddde678002505801218350e255ceb >+SIZE (xpi/firefox-i18n-57.0b11/id.xpi) = 443541 >+SHA256 (xpi/firefox-i18n-57.0b11/is.xpi) = b2594bdbbaec4564dc7543b633363ca991f37346de629fccb833b7d95fc12fec >+SIZE (xpi/firefox-i18n-57.0b11/is.xpi) = 452669 >+SHA256 (xpi/firefox-i18n-57.0b11/it.xpi) = f3987cbdfee8499badbe17558ca8c3f398ed69e9249db3bc335f6f8b8d1403c1 >+SIZE (xpi/firefox-i18n-57.0b11/it.xpi) = 346875 >+SHA256 (xpi/firefox-i18n-57.0b11/ja.xpi) = 7f8c79610ee34075e6aef58ddd596c93fba15e009801e6c0bd5718eef1f19578 >+SIZE (xpi/firefox-i18n-57.0b11/ja.xpi) = 508431 >+SHA256 (xpi/firefox-i18n-57.0b11/ka.xpi) = 2ed42056740589255d1d6bf2504736cd79cd80957ee86e26d608f1ef7f75caaa >+SIZE (xpi/firefox-i18n-57.0b11/ka.xpi) = 490940 >+SHA256 (xpi/firefox-i18n-57.0b11/kab.xpi) = cacd335f41e39a9234485eaf654d3dea00c47c54dc8b4d6cf5af687e8260b857 >+SIZE (xpi/firefox-i18n-57.0b11/kab.xpi) = 461575 >+SHA256 (xpi/firefox-i18n-57.0b11/kk.xpi) = 0ef37f26c013c30cdcb079c5950e7814af9f06f61c414d147a980948d8f55dc0 >+SIZE (xpi/firefox-i18n-57.0b11/kk.xpi) = 517839 >+SHA256 (xpi/firefox-i18n-57.0b11/km.xpi) = 5246f724bf7d6a2b043028f56cfb08f7aa4f8e8f0ccdac819c4c8aa041b805f2 >+SIZE (xpi/firefox-i18n-57.0b11/km.xpi) = 530080 >+SHA256 (xpi/firefox-i18n-57.0b11/kn.xpi) = f1526f31f48602c6b11c9c73b3c6e0c1c68728ff76809d2a598d2c61d9947355 >+SIZE (xpi/firefox-i18n-57.0b11/kn.xpi) = 530793 >+SHA256 (xpi/firefox-i18n-57.0b11/ko.xpi) = 912dcea9e7fb5800138f3bc9224ebd25fbb24383b580f2a9e17f68f8027a70c9 >+SIZE (xpi/firefox-i18n-57.0b11/ko.xpi) = 485888 >+SHA256 (xpi/firefox-i18n-57.0b11/lij.xpi) = 96280b88461e4c30f118cc1c85962ae3ace203d6d5d3dbf84cc97854c133b3c1 >+SIZE (xpi/firefox-i18n-57.0b11/lij.xpi) = 452340 >+SHA256 (xpi/firefox-i18n-57.0b11/lt.xpi) = 6a97705c78e8d278770aef4f76e66b223c7ceab2278202f9eb85e9fcf5ef3369 >+SIZE (xpi/firefox-i18n-57.0b11/lt.xpi) = 473661 >+SHA256 (xpi/firefox-i18n-57.0b11/lv.xpi) = 5b3411dbfd7005f23de68bb05d4ccecd36b3b27caa18c4e4d821f1b3091984f9 >+SIZE (xpi/firefox-i18n-57.0b11/lv.xpi) = 464910 >+SHA256 (xpi/firefox-i18n-57.0b11/mai.xpi) = 6219e7c025fdf3d55e78f7919892490d980f79fe83607fcc19eb41fb7ca008d9 >+SIZE (xpi/firefox-i18n-57.0b11/mai.xpi) = 507395 >+SHA256 (xpi/firefox-i18n-57.0b11/mk.xpi) = 0740d67e9530804add2305f037231620c7fdb03c204588eb663ad9ab62ef5d12 >+SIZE (xpi/firefox-i18n-57.0b11/mk.xpi) = 490729 >+SHA256 (xpi/firefox-i18n-57.0b11/ml.xpi) = bc079f749902e45c6fa0543c6612f471346fa8745c923ad192e58cdc5337aed1 >+SIZE (xpi/firefox-i18n-57.0b11/ml.xpi) = 528049 >+SHA256 (xpi/firefox-i18n-57.0b11/mr.xpi) = 7babf73ace523375cdee981c885280a499b859af09d2393b1230b18fa1224f31 >+SIZE (xpi/firefox-i18n-57.0b11/mr.xpi) = 518645 >+SHA256 (xpi/firefox-i18n-57.0b11/ms.xpi) = 66fcb71ce9117cccac739ad6a2c048128cf0955b30cef387ead15368a6253eb0 >+SIZE (xpi/firefox-i18n-57.0b11/ms.xpi) = 450533 >+SHA256 (xpi/firefox-i18n-57.0b11/my.xpi) = 8b9cbb4bc8e7dec11a30187acf7f74568249324afd7cc9587e8f3e489ccb1088 >+SIZE (xpi/firefox-i18n-57.0b11/my.xpi) = 517703 >+SHA256 (xpi/firefox-i18n-57.0b11/nb-NO.xpi) = ab56bbb8dc8cf147ffd00e2c8d7c59eb62e4c757d0f1d355845f20513ab9f862 >+SIZE (xpi/firefox-i18n-57.0b11/nb-NO.xpi) = 450305 >+SHA256 (xpi/firefox-i18n-57.0b11/nl.xpi) = 72cd020ae95c47b1189d0311f44548c4619c63c6b187067fd3a5b36f98e17d29 >+SIZE (xpi/firefox-i18n-57.0b11/nl.xpi) = 457213 >+SHA256 (xpi/firefox-i18n-57.0b11/nn-NO.xpi) = 0d51ffa8f3eae61c4f45f47be9d7e9a4d941a376b7e4c84aa4075ce409a245c9 >+SIZE (xpi/firefox-i18n-57.0b11/nn-NO.xpi) = 450730 >+SHA256 (xpi/firefox-i18n-57.0b11/or.xpi) = cf835b40936e1f65915af8affb889264a3246c457a4f2406976356af6e82497f >+SIZE (xpi/firefox-i18n-57.0b11/or.xpi) = 500864 >+SHA256 (xpi/firefox-i18n-57.0b11/pa-IN.xpi) = f6d86a42582c443bdcbda753c6b30763955f15f9b46e0c5e88be1374d978a205 >+SIZE (xpi/firefox-i18n-57.0b11/pa-IN.xpi) = 490593 >+SHA256 (xpi/firefox-i18n-57.0b11/pl.xpi) = 68d43869ae1fd47c76d2778d544d954c846de8b56b66314d7c99518e106b0c26 >+SIZE (xpi/firefox-i18n-57.0b11/pl.xpi) = 362594 >+SHA256 (xpi/firefox-i18n-57.0b11/pt-BR.xpi) = 9d118397a5400a010f0f19378c33b880032d7f5cf323ce97283c5cdb0b0d6fbc >+SIZE (xpi/firefox-i18n-57.0b11/pt-BR.xpi) = 455251 >+SHA256 (xpi/firefox-i18n-57.0b11/pt-PT.xpi) = 9e60affb7922027e072a0a6a7054a5f7f0e525276057eaa3a5dfc0f8cfed23ac >+SIZE (xpi/firefox-i18n-57.0b11/pt-PT.xpi) = 458681 >+SHA256 (xpi/firefox-i18n-57.0b11/rm.xpi) = aaa682aa5ded4d9c366e49e915f4bfb33800ec7cdf57196e61e9ae2596a3fdcd >+SIZE (xpi/firefox-i18n-57.0b11/rm.xpi) = 451053 >+SHA256 (xpi/firefox-i18n-57.0b11/ro.xpi) = 3beb60c437552d2f59f9c64e5ade243e537d8b29498282bdabbeb9baa8cb84e0 >+SIZE (xpi/firefox-i18n-57.0b11/ro.xpi) = 455307 >+SHA256 (xpi/firefox-i18n-57.0b11/ru.xpi) = 107b76609e32c81a6343001cfab656791482e0286e75e9aea39cef1239f1ecb4 >+SIZE (xpi/firefox-i18n-57.0b11/ru.xpi) = 525390 >+SHA256 (xpi/firefox-i18n-57.0b11/si.xpi) = 94385e7462a2baf65244192835238ad1ca8c0951b70d44ce696e7536687b99c9 >+SIZE (xpi/firefox-i18n-57.0b11/si.xpi) = 498324 >+SHA256 (xpi/firefox-i18n-57.0b11/sk.xpi) = 580639de005cf7a7d5f469da6b195a5d84f3c747839615d4deb3616d1fa72fcd >+SIZE (xpi/firefox-i18n-57.0b11/sk.xpi) = 479104 >+SHA256 (xpi/firefox-i18n-57.0b11/sl.xpi) = 739ab8cad45cb97518bee2b3ec95292e1df5bf3085964959c8abc3b4ea6e8b11 >+SIZE (xpi/firefox-i18n-57.0b11/sl.xpi) = 457951 >+SHA256 (xpi/firefox-i18n-57.0b11/son.xpi) = 6fa42e977fe73ab7f5ba40dd365e0c7f27b05aeb4653994bfaa5ef589675fca9 >+SIZE (xpi/firefox-i18n-57.0b11/son.xpi) = 450928 >+SHA256 (xpi/firefox-i18n-57.0b11/sq.xpi) = e9c498badc80686e129fde96a219136032591c5e684e9c56bd16a8ab42c2a4a7 >+SIZE (xpi/firefox-i18n-57.0b11/sq.xpi) = 465051 >+SHA256 (xpi/firefox-i18n-57.0b11/sr.xpi) = 1f1a96136b362b6f16a759969209f31722b076719bad6f3ceaecc3efc1c06ba2 >+SIZE (xpi/firefox-i18n-57.0b11/sr.xpi) = 485722 >+SHA256 (xpi/firefox-i18n-57.0b11/sv-SE.xpi) = d75864da687905251d4c32035ff517c2980f4132ad6ca2f39b5da1f4f7bf3356 >+SIZE (xpi/firefox-i18n-57.0b11/sv-SE.xpi) = 458447 >+SHA256 (xpi/firefox-i18n-57.0b11/ta.xpi) = 6733c475f1b07cc2d8a420b1c5cdf185ab4c43270957ec48b9afab208ab205d5 >+SIZE (xpi/firefox-i18n-57.0b11/ta.xpi) = 513225 >+SHA256 (xpi/firefox-i18n-57.0b11/te.xpi) = 77b27d2a0cbb23eb07de9b0350dd1d391598e03eedb41c85cbe8fc91e7c2f6ba >+SIZE (xpi/firefox-i18n-57.0b11/te.xpi) = 530692 >+SHA256 (xpi/firefox-i18n-57.0b11/th.xpi) = 3292f2d9168f6d90cee639f4358ea83ef7594e681f01ffde191d993943f5ca2b >+SIZE (xpi/firefox-i18n-57.0b11/th.xpi) = 501990 >+SHA256 (xpi/firefox-i18n-57.0b11/tr.xpi) = 9048ff16d4c959e314e00271a929d6d3e833d86b72436d091a0f9619bd7bcb2f >+SIZE (xpi/firefox-i18n-57.0b11/tr.xpi) = 464261 >+SHA256 (xpi/firefox-i18n-57.0b11/uk.xpi) = bd9bbf6d74b991a439d453078573374b4d6ef6583f48cfd05c06fbdc96707007 >+SIZE (xpi/firefox-i18n-57.0b11/uk.xpi) = 516746 >+SHA256 (xpi/firefox-i18n-57.0b11/ur.xpi) = 1d60d039f4463280d97b0ce2562a55a0127fd4b14b558f4f585896597274198b >+SIZE (xpi/firefox-i18n-57.0b11/ur.xpi) = 510965 >+SHA256 (xpi/firefox-i18n-57.0b11/uz.xpi) = 9082bc671556d950ad11ac96482c03f658455fe3f985d0e985357f3e342c0461 >+SIZE (xpi/firefox-i18n-57.0b11/uz.xpi) = 461694 >+SHA256 (xpi/firefox-i18n-57.0b11/vi.xpi) = d29df71118ca2688de28641b953d239d0095eac62981f71c9f4dddbbae1e8db6 >+SIZE (xpi/firefox-i18n-57.0b11/vi.xpi) = 471320 >+SHA256 (xpi/firefox-i18n-57.0b11/xh.xpi) = fc747e21dd3e555c5470622abf3d407bad94d40da360f5a4db12a9750f1f651d >+SIZE (xpi/firefox-i18n-57.0b11/xh.xpi) = 464461 >+SHA256 (xpi/firefox-i18n-57.0b11/zh-CN.xpi) = 808519ac8926b4a60d732cc4bcb4124d089bab17368cba9b7aba6add5adb298e >+SIZE (xpi/firefox-i18n-57.0b11/zh-CN.xpi) = 482293 >+SHA256 (xpi/firefox-i18n-57.0b11/zh-TW.xpi) = 515c835c6cce5321d7377c1b415ced2ae50de48b33f8e1e5bae259031343c3d8 >+SIZE (xpi/firefox-i18n-57.0b11/zh-TW.xpi) = 481042 >diff --git a/www/firefox/Makefile b/www/firefox/Makefile >index b3cd8d70106c..e37d47e0dbeb 100644 >--- a/www/firefox/Makefile >+++ b/www/firefox/Makefile >@@ -2,27 +2,26 @@ > # $FreeBSD$ > > PORTNAME= firefox >-DISTVERSION= 56.0.1 >+DISTVERSION= 57.0b11 > DISTVERSIONSUFFIX=.source >-PORTREVISION= 4 > PORTEPOCH= 1 > CATEGORIES= www ipv6 > MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ >- MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source >+ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/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 df9186a028ea..d38064296176 100644 >--- a/www/firefox/distinfo >+++ b/www/firefox/distinfo >@@ -1,3 +1,3 @@ >-TIMESTAMP = 1507068922 >-SHA256 (firefox-56.0.1.source.tar.xz) = ece052c9385ac6ccf58edb213b875f4793014c431f7e40de146bcd2dbcb0a3cb >-SIZE (firefox-56.0.1.source.tar.xz) = 254422768 >+TIMESTAMP = 1508789743 >+SHA256 (firefox-57.0b11.source.tar.xz) = 83408312b8a29c3e31434911ad17591c359dcb30f0f0f3bad8b33a92f2e25e16 >+SIZE (firefox-57.0b11.source.tar.xz) = 249071920 >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-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() {
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
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