searching for reviewer(upstream)
4b84f663a807b7fb7429691f254b566e314e0bfe: Bug 1549646 - Cherry-pick EXT_blend_func_extended into ANGLE. r=upstream
Jeff Gilbert <jgilbert@mozilla.com> - Mon, 06 May 2019 19:00:17 -0700 - rev 531658
Push 11265 by ffxbld-merge at Mon, 13 May 2019 10:53:39 +0000
Bug 1549646 - Cherry-pick EXT_blend_func_extended into ANGLE. r=upstream
7aff94b0bba6bbc8abeb98c8d8a20173ba496003: Bug 1489279 - Update ANGLE to mozilla/angle/firefox-64, chromium/3538. - r=upstream
Jeff Gilbert <jgilbert@mozilla.com> - Tue, 18 Sep 2018 17:10:14 -0700 - rev 493104
Push 9984 by ffxbld-merge at Mon, 15 Oct 2018 21:07:35 +0000
Bug 1489279 - Update ANGLE to mozilla/angle/firefox-64, chromium/3538. - r=upstream
187f53033554684b8f5cb00a548262d7fc46ed22: Bug 1251375 - Cross compilation fixup. r=upstream
Jacek Caban <jacek@codeweavers.com> - Tue, 29 Mar 2016 15:05:23 +0200 - rev 328736
Push 6048 by kmoir@mozilla.com at Mon, 06 Jun 2016 19:02:08 +0000
Bug 1251375 - Cross compilation fixup. r=upstream
7c9cb47874cea6a4d7a4dee61f186b5bde98f909: Bug 1246756 - Cross compilation fixup. r=upstream
Jacek Caban <jacek@codeweavers.com> - Thu, 17 Mar 2016 10:40:07 +0100 - rev 327075
Push 6048 by kmoir@mozilla.com at Mon, 06 Jun 2016 19:02:08 +0000
Bug 1246756 - Cross compilation fixup. r=upstream
ac6a89c954775a83b347fcd220f314ad49df500e: Bug 1225280 - mingw fixup. r=upstream
Jacek Caban <jacek@codeweavers.com> - Thu, 03 Dec 2015 11:38:24 +0100 - rev 309588
Push 5513 by raliiev@mozilla.com at Mon, 25 Jan 2016 13:55:34 +0000
Bug 1225280 - mingw fixup. r=upstream
d05292b218197993bb235001d3fb60fda3e7afb6: Bug 1117026 - Cherry-pick commit a10742c of upstream skia code; r=upstream
Ehsan Akhgari <ehsan@mozilla.com> - Fri, 02 Jan 2015 00:10:19 -0500 - rev 247662
Push 4489 by raliiev@mozilla.com at Mon, 23 Feb 2015 15:17:55 +0000
Bug 1117026 - Cherry-pick commit a10742c of upstream skia code; r=upstream
0db8f08e7998dfeecb8014e1607c87370c17fe92: Bug 1111786 - Cherry-pick the skia 6f90475632b0ff8e9e83916ee6373d3c26cc9284 commit; r=upstream
Ehsan Akhgari <ehsan@mozilla.com> - Mon, 15 Dec 2014 16:17:59 -0500 - rev 245592
Push 4489 by raliiev@mozilla.com at Mon, 23 Feb 2015 15:17:55 +0000
Bug 1111786 - Cherry-pick the skia 6f90475632b0ff8e9e83916ee6373d3c26cc9284 commit; r=upstream Rewrite NaN checks in terms of SkScalarIsNaN() We are trying to replace Skia's NaN checker with our own in Mozilla, so it would be nice to have to patch a single place by making sure these NaN checks used SkScalarIsNaN().
445c76a9813edbf59eb2029216bfdab62ec8c302: Bug 1067404 - Do not expect a copysign function to be defined in <cmath> with clang-cl; r=upstream
Ehsan Akhgari <ehsan@mozilla.com> - Mon, 15 Sep 2014 11:03:14 -0400 - rev 228561
Push 4187 by bhearsum@mozilla.com at Fri, 28 Nov 2014 15:29:12 +0000
Bug 1067404 - Do not expect a copysign function to be defined in <cmath> with clang-cl; r=upstream clang-cl defines __cplusplus to 201103L, but it uses the runtime library provided by MSVC, so the copysign function will not be available there. Review URL: https://codereview.chromium.org/526813002
3fe58eba40c1ed9d2d0edcf3f3ed710b6502ea56: Bug 1034930 - Improve the const correctness of BinaryOutputStream::writeBytes; r=upstream
Ehsan Akhgari <ehsan@mozilla.com> - Thu, 04 Sep 2014 16:17:19 -0400 - rev 226882
Push 4187 by bhearsum@mozilla.com at Fri, 28 Nov 2014 15:29:12 +0000
Bug 1034930 - Improve the const correctness of BinaryOutputStream::writeBytes; r=upstream
ce39df5dccdb5f0a1398761df6ca15e2ab65ef60: Bug 996108 - Use even rounding for better results when converting from scalar to fdot6 r=upstream
Jeff Muizelaar <jmuizelaar@mozilla.com> - Tue, 02 Sep 2014 12:15:27 -0400 - rev 226508
Push 4187 by bhearsum@mozilla.com at Fri, 28 Nov 2014 15:29:12 +0000
Bug 996108 - Use even rounding for better results when converting from scalar to fdot6 r=upstream
54d7e61b891314c729acc408cd4822bacf29ab68: Bug 1053492 - [Skia] Use heap allocation for buffers that will end up with the 3D API r=mattwoodrow,upstream
George Wright <george@mozilla.com> - Wed, 13 Aug 2014 23:14:31 -0400 - rev 221027
Push 3979 by raliiev@mozilla.com at Mon, 13 Oct 2014 16:35:44 +0000
Bug 1053492 - [Skia] Use heap allocation for buffers that will end up with the 3D API r=mattwoodrow,upstream
91b4b7c8cdfef15c74b1ee5c02b857dfa890b9a9: [PATCH 13/15] Bug 1017113 - Ensure SkDebugf is exported from Skia r=upstream
George Wright <george@mozilla.com> - Thu, 31 Jul 2014 18:52:22 -0400 - rev 220770
Push 3979 by raliiev@mozilla.com at Mon, 13 Oct 2014 16:35:44 +0000
[PATCH 13/15] Bug 1017113 - Ensure SkDebugf is exported from Skia r=upstream
3a3820a17f0b9668ce73b9542e32459d2f2e6045: [PATCH 12/15] Bug 1017113 - Explicitly typedef GetUserDefaultLocaleName as WINVER may not be high enough when compiling to allow visibility of the function prototype in windows.h r=upstream
George Wright <george@mozilla.com> - Tue, 29 Jul 2014 15:19:53 -0400 - rev 220769
Push 3979 by raliiev@mozilla.com at Mon, 13 Oct 2014 16:35:44 +0000
[PATCH 12/15] Bug 1017113 - Explicitly typedef GetUserDefaultLocaleName as WINVER may not be high enough when compiling to allow visibility of the function prototype in windows.h r=upstream
883cd6be06d294600562435ebea87d2804bca957: [PATCH 08/15] Bug 1017113 - Update Skia to 2014-07-28 r=upstream
George Wright <george@mozilla.com> - Mon, 28 Jul 2014 15:06:12 -0400 - rev 220765
Push 3979 by raliiev@mozilla.com at Mon, 13 Oct 2014 16:35:44 +0000
[PATCH 08/15] Bug 1017113 - Update Skia to 2014-07-28 r=upstream
72a70862ee28461fbfcda067f508862d9e22d0f3: b=1010371; Update ANGLE; r=upstream
Vladimir Vukicevic <vladimir@pobox.com> - Fri, 04 Jul 2014 11:49:25 -0400 - rev 213228
Push 3857 by raliiev@mozilla.com at Tue, 02 Sep 2014 16:39:23 +0000
b=1010371; Update ANGLE; r=upstream
dfba3a2480bc41639c0c4e8ef0f90e9925661b18: [PATCH 1/6] Bug 985217 - Update Skia to r13827 r=upstream
George Wright <george@mozilla.com> - Mon, 17 Mar 2014 07:34:32 -0400 - rev 193135
Push 3624 by asasaki@mozilla.com at Mon, 09 Jun 2014 21:49:01 +0000
[PATCH 1/6] Bug 985217 - Update Skia to r13827 r=upstream
c752ec797e82965c5a4257c95d710db7897ee1ee: Bug 716766 - Only set USE_ANDROID_NDK_CPU_FEATURES if it's not already been explicitly set r=upstream,snorp
George Wright <george@mozilla.com> - Fri, 07 Mar 2014 17:01:17 -0500 - rev 192480
Push 3624 by asasaki@mozilla.com at Mon, 09 Jun 2014 21:49:01 +0000
Bug 716766 - Only set USE_ANDROID_NDK_CPU_FEATURES if it's not already been explicitly set r=upstream,snorp
25031a8b8b7756e3aa13f1a20afc0c7b4f8be3e3: Bug 716766 - Only set USE_ANDROID_NDK_CPU_FEATURES if it's not already been explicitly set r=upstream,snorp
George Wright <george@mozilla.com> - Fri, 07 Mar 2014 17:01:17 -0500 - rev 190897
Push 3503 by raliiev@mozilla.com at Mon, 28 Apr 2014 18:51:11 +0000
Bug 716766 - Only set USE_ANDROID_NDK_CPU_FEATURES if it's not already been explicitly set r=upstream,snorp
5498f482b7ff8899f358dcb0ab467fa3c31bf29f: Bug 910754 - [Skia] Defer deletion of our shader objects until after linking the program r=upstream(bsalomon)
George Wright <george@mozilla.com> - Thu, 13 Feb 2014 01:19:51 -0500 - rev 186621
Push 3503 by raliiev@mozilla.com at Mon, 28 Apr 2014 18:51:11 +0000
Bug 910754 - [Skia] Defer deletion of our shader objects until after linking the program r=upstream(bsalomon)
f6c2efda0788c04fab6d0315095b564b98b73ac7: Bug 910754 - Update Skia to r13424 r=upstream
George Wright <gw@gwright.org.uk> - Tue, 10 Dec 2013 13:57:22 -0500 - rev 186614
Push 3503 by raliiev@mozilla.com at Mon, 28 Apr 2014 18:51:11 +0000
Bug 910754 - Update Skia to r13424 r=upstream
ae20e11c6a681611f767c121d42d8dcae375bf46: Bug 910754 - [Skia] Defer deletion of our shader objects until after linking the program r=upstream(bsalomon)
George Wright <george@mozilla.com> - Thu, 13 Feb 2014 01:19:51 -0500 - rev 186607
Push 3503 by raliiev@mozilla.com at Mon, 28 Apr 2014 18:51:11 +0000
Bug 910754 - [Skia] Defer deletion of our shader objects until after linking the program r=upstream(bsalomon)
3f5e3a855a3d1afe36142b581637498bb5aeba39: Bug 910754 - Update Skia to r13424 r=upstream
George Wright <gw@gwright.org.uk> - Tue, 10 Dec 2013 13:57:22 -0500 - rev 186600
Push 3503 by raliiev@mozilla.com at Mon, 28 Apr 2014 18:51:11 +0000
Bug 910754 - Update Skia to r13424 r=upstream
356866ae2f6885933451a92aae838af00d659679: Bug 883478 - Update ANGLE to pull from 13-08-02. r=upstream,bjacob,bas
Jeff Gilbert <jgilbert@mozilla.com> - Fri, 06 Sep 2013 17:24:36 -0700 - rev 158949
Push 2961 by lsblakk@mozilla.com at Mon, 28 Oct 2013 21:59:28 +0000
Bug 883478 - Update ANGLE to pull from 13-08-02. r=upstream,bjacob,bas
502d77755cf0ebba1d1e3becdb532d4e97f48df4: Bug 807492 Part 3 - Backport chunk of upstream gtest r629 to fix <tuple> detection on BSDs with old libstdc++, not breaking it on MacOSX r=upstream
Landry Breuil <landry@openbsd.org> - Thu, 13 Jun 2013 08:41:49 +0200 - rev 146415
Push 2697 by bbajaj@mozilla.com at Mon, 05 Aug 2013 18:49:53 +0000
Bug 807492 Part 3 - Backport chunk of upstream gtest r629 to fix <tuple> detection on BSDs with old libstdc++, not breaking it on MacOSX r=upstream
e0d9902b2bbfe9829cdd888b58f6fa7d4e0e1507: bug 848880 - Update to Breakpad SVN r1128. r=upstream
Ted Mielczarek <ted@mielczarek.org> - Thu, 07 Mar 2013 13:50:42 -0500 - rev 134538
Push 2452 by lsblakk@mozilla.com at Mon, 13 May 2013 16:59:38 +0000
bug 848880 - Update to Breakpad SVN r1128. r=upstream
ae8113482b550efb2984f3cfd5beabbe84163a5c: bug 848084 - Update to Breakpad r1119. r=upstream
Ted Mielczarek <ted@mielczarek.org> - Tue, 05 Mar 2013 09:03:39 -0500 - rev 134343
Push 2452 by lsblakk@mozilla.com at Mon, 13 May 2013 16:59:38 +0000
bug 848084 - Update to Breakpad r1119. r=upstream
17710a36638ac337c7cc45e0d5c42cea5f0d3f9d: bug 839126 - Update Breakpad to SVN r1112. r=upstream. Also fix a local patch that hadn't applied properly.
Ted Mielczarek <ted.mielczarek@gmail.com> - Thu, 07 Feb 2013 12:56:27 -0500 - rev 131084
Push 2323 by bbajaj@mozilla.com at Mon, 01 Apr 2013 19:47:02 +0000
bug 839126 - Update Breakpad to SVN r1112. r=upstream. Also fix a local patch that hadn't applied properly.
cd02e40945d646631060324b0d6aa64d3cfd6066: bug 839126 - Update Breakpad to SVN r1112. r=upstream. Also fix a local patch that hadn't applied properly.
Ted Mielczarek <ted.mielczarek@gmail.com> - Thu, 07 Feb 2013 12:56:27 -0500 - rev 131055
Push 2323 by bbajaj@mozilla.com at Mon, 01 Apr 2013 19:47:02 +0000
bug 839126 - Update Breakpad to SVN r1112. r=upstream. Also fix a local patch that hadn't applied properly.
b8f1cd485c5853c3aeda7f7d854e7e723a53c377: bug 835456 - Update Breakpad to SVN r1106. r=upstream
Ted Mielczarek <ted@mielczarek.org> - Mon, 28 Jan 2013 14:12:12 -0500 - rev 129965
Push 2323 by bbajaj@mozilla.com at Mon, 01 Apr 2013 19:47:02 +0000
bug 835456 - Update Breakpad to SVN r1106. r=upstream
8732e019a26d810b6d013f4087d7b287a8cf8012: bug 778364 - Update Breakpad to r1064. r=upstream
Ted Mielczarek <ted.mielczarek@gmail.com> - Mon, 08 Oct 2012 10:16:09 -0400 - rev 117616
Push 1997 by akeybl@mozilla.com at Mon, 07 Jan 2013 21:25:26 +0000
bug 778364 - Update Breakpad to r1064. r=upstream
ebdb7c83b7899d247921063e19140337d4be4c54: Bug 787653 - Updated ANGLE to r1267 r=upstream
Jacek Caban <jacek@codeweavers.com> - Fri, 07 Sep 2012 11:12:54 +0200 - rev 110857
Push 1708 by akeybl@mozilla.com at Mon, 19 Nov 2012 21:10:21 +0000
Bug 787653 - Updated ANGLE to r1267 r=upstream
a4a0f1412b9d65b01f44f16e82f40c42975fedf4: bug 761907 - use sys_fstat64 on Android and gonk. r=upstream
Ted Mielczarek <ted.mielczarek@gmail.com> - Mon, 16 Jul 2012 14:11:11 -0400 - rev 105166
Push 1490 by akeybl@mozilla.com at Mon, 08 Oct 2012 18:29:50 +0000
bug 761907 - use sys_fstat64 on Android and gonk. r=upstream
b9923c05eafd4f8a3182ff7c9498b364e56f3933: bug 763621 - Fix a Breakpad issue, patch from upstream r792. r=upstream
Ted Mielczarek <ted.mielczarek@gmail.com> - Wed, 18 Jul 2012 15:11:51 -0400 - rev 105165
Push 1490 by akeybl@mozilla.com at Mon, 08 Oct 2012 18:29:50 +0000
bug 763621 - Fix a Breakpad issue, patch from upstream r792. r=upstream
4b14245b6996440d9e2775f77f70a451c0a4e06b: bug 763621 - Fix a Breakpad issue, patch from upstream r792. r=upstream a=lsblakk
Ted Mielczarek <ted.mielczarek@gmail.com> - Wed, 18 Jul 2012 15:11:51 -0400 - rev 104490
Push 1316 by akeybl@mozilla.com at Mon, 27 Aug 2012 22:37:00 +0000
bug 763621 - Fix a Breakpad issue, patch from upstream r792. r=upstream a=lsblakk
d15738db65a4a7648d2a30ce6a98daf9d462a9b3: bug 763621 - Fix a Breakpad issue, patch from upstream r792. r=upstream a=lsblakk
Ted Mielczarek <ted.mielczarek@gmail.com> - Wed, 18 Jul 2012 15:11:51 -0400 - rev 100527
Push 1291 by emorley@mozilla.com at Wed, 15 Aug 2012 12:38:43 +0000
bug 763621 - Fix a Breakpad issue, patch from upstream r792. r=upstream a=lsblakk
241b44d55176dd28e2fdcce816452613fb7388de: Bug 751643 - ensure that strings produced by ANGLE's getVariableInfo function are null-terminated - r=bz,upstream
Benoit Jacob <bjacob@mozilla.com> - Sun, 06 May 2012 22:20:03 -0400 - rev 97387
Push 1116 by lsblakk@mozilla.com at Mon, 16 Jul 2012 19:38:18 +0000
Bug 751643 - ensure that strings produced by ANGLE's getVariableInfo function are null-terminated - r=bz,upstream Checked in upstream ANGLE as r1070.
104b56122486b7161e7520898cffb2c9d067f7f1: Bug 751643 - ensure that strings produced by ANGLE's getVariableInfo function are null-terminated - r=bz,upstream, a=akeybl
Benoit Jacob <bjacob@mozilla.com> - Sun, 06 May 2012 22:20:03 -0400 - rev 95729
Push 886 by lsblakk@mozilla.com at Mon, 04 Jun 2012 19:57:52 +0000
Bug 751643 - ensure that strings produced by ANGLE's getVariableInfo function are null-terminated - r=bz,upstream, a=akeybl Checked in upstream ANGLE as r1070.
0540130b5f2fb6cff7696d7189b8f385be4aa34e: Bug 751643 - ensure that strings produced by ANGLE's getVariableInfo function are null-terminated - r=bz,upstream, a=akeybl
Benoit Jacob <bjacob@mozilla.com> - Sun, 06 May 2012 22:20:03 -0400 - rev 92200
Push 836 by bjacob@mozilla.com at Sun, 13 May 2012 12:51:43 +0000
Bug 751643 - ensure that strings produced by ANGLE's getVariableInfo function are null-terminated - r=bz,upstream, a=akeybl Checked in upstream ANGLE as r1070.
66d6a27e3581df835d8121e553b255b00ea8209b: Bug 682506 - Upgrade ANGLE to r740 - r=upstream
Benoit Jacob <bjacob@mozilla.com> - Tue, 30 Aug 2011 18:50:05 -0400 - rev 77281
Push 340 by clegnitto@mozilla.com at Tue, 08 Nov 2011 22:56:33 +0000
Bug 682506 - Upgrade ANGLE to r740 - r=upstream I need this now especially as it gets us the shader modification mechanisms to work around Mac GL crashes, see bug 665578 The relevant ANGLE revisions are 734, 738, and 740 fixes a bug in 738. This also allows us to reset our set of cherrypicked ANGLE revisions which was starting to be very big.
d1228b8cedc6330a9af1ed54ebf0919c1f251e7c: Bug 681400 - import ANGLE r739 - r=upstream
Benoit Jacob <bjacob@mozilla.com> - Wed, 24 Aug 2011 11:32:17 -0400 - rev 76856
Push 340 by clegnitto@mozilla.com at Tue, 08 Nov 2011 22:56:33 +0000
Bug 681400 - import ANGLE r739 - r=upstream
7a92e6b3093ff71524aa9b3f165aafc9cc00aa08: Bug 673075 - import ANGLE r711 - r=upstream
Benoit Jacob <bjacob@mozilla.com> - Mon, 15 Aug 2011 15:54:25 -0400 - rev 76074
Push 235 by bzbarsky@mozilla.com at Tue, 27 Sep 2011 17:13:04 +0000
Bug 673075 - import ANGLE r711 - r=upstream This lets ANGLE reject shaders that have recursive functions.
ddf7263c56d7f77bdfd0ed3747052f269d007edf: Bug 676918 - import ANGLE r719 - r=upstream
Benoit Jacob <bjacob@mozilla.com> - Mon, 15 Aug 2011 15:53:46 -0400 - rev 76073
Push 235 by bzbarsky@mozilla.com at Tue, 27 Sep 2011 17:13:04 +0000
Bug 676918 - import ANGLE r719 - r=upstream This fixes a crash in glReadPixels in some unusual circumstances like after locking and unlocking the screen.
d6301744afa92dd3efbbbea7ae2856a682c380a2: Bug 675634 - import ANGLE r712 - r=upstream
Benoit Jacob <bjacob@mozilla.com> - Tue, 02 Aug 2011 18:06:25 -0400 - rev 74463
Push 235 by bzbarsky@mozilla.com at Tue, 27 Sep 2011 17:13:04 +0000
Bug 675634 - import ANGLE r712 - r=upstream
85b0cc81a189e7459097e670db25d10f236189e8: Bug 646825 - import ANGLE r702 - r=upstream
Benoit Jacob <bjacob@mozilla.com> - Tue, 26 Jul 2011 11:53:47 -0400 - rev 74100
Push 235 by bzbarsky@mozilla.com at Tue, 27 Sep 2011 17:13:04 +0000
Bug 646825 - import ANGLE r702 - r=upstream
e442db72f342fe28916dd9d4ad029779c2b01e93: Bug 675634 - import ANGLE r712 - r=upstream, a=clegnitto
Benoit Jacob <bjacob@mozilla.com> - Tue, 02 Aug 2011 18:06:25 -0400 - rev 72974
Push 159 by eakhgari@mozilla.com at Tue, 16 Aug 2011 17:53:11 +0000
Bug 675634 - import ANGLE r712 - r=upstream, a=clegnitto
46cd7e3ccedd945ffa0b4ef5ea440a599333e01e: Bug 646825 - import ANGLE r702 - r=upstream, a=clegnitto
Benoit Jacob <bjacob@mozilla.com> - Tue, 26 Jul 2011 11:53:47 -0400 - rev 72964
Push 159 by eakhgari@mozilla.com at Tue, 16 Aug 2011 17:53:11 +0000
Bug 646825 - import ANGLE r702 - r=upstream, a=clegnitto
51e18435b793dc3ee54965fcf2c7688409b1e52f: Bug 665934 - fix bug: arev was meant instead of amap - r=upstream
Benoit Jacob <bjacob@mozilla.com> - Mon, 27 Jun 2011 13:27:04 -0400 - rev 72348
Push 159 by eakhgari@mozilla.com at Tue, 16 Aug 2011 17:53:11 +0000
Bug 665934 - fix bug: arev was meant instead of amap - r=upstream This patch has been taken in ANGLE upstream as r699.
99e2010c484ca50f14cafb73fd341be4367a2952: Bug 675634 - import ANGLE r712 - r=upstream, a=clegnitto
Benoit Jacob <bjacob@mozilla.com> - Tue, 02 Aug 2011 18:06:25 -0400 - rev 70592
Push 141 by bjacob@mozilla.com at Tue, 02 Aug 2011 22:11:00 +0000
Bug 675634 - import ANGLE r712 - r=upstream, a=clegnitto
4621648305dc76b2bc94fac80e5b6a10b55906a8: Bug 646825 - import ANGLE r702 - r=upstream, a=clegnitto
Benoit Jacob <bjacob@mozilla.com> - Tue, 26 Jul 2011 11:53:47 -0400 - rev 70572
Push 129 by bjacob@mozilla.com at Wed, 27 Jul 2011 21:32:07 +0000
Bug 646825 - import ANGLE r702 - r=upstream, a=clegnitto
9eabe65eb25aef05fb328b470f07a8b7d45eb1c3: Bug 665934 - fix bug: arev was meant instead of amap - r=upstream, a=jpr
Benoit Jacob <bjacob@mozilla.com> - Mon, 27 Jun 2011 13:27:04 -0400 - rev 70475
Push 76 by bzbarsky@mozilla.com at Tue, 05 Jul 2011 17:00:57 +0000
Bug 665934 - fix bug: arev was meant instead of amap - r=upstream, a=jpr This patch has been taken in ANGLE upstream as r699.