Read-only Git mirror of the Mercurial gecko repositories at https://hg.mozilla.org. How to contribute: https://firefox-source-docs.mozilla.org/contributing/contribution_quickref.html
Перейти к файлу
Nicholas Nethercote 880f0bb7ba servo: Merge #18549 - Fix a panic in Stylo memory reporting (from nnethercote:fix-enclosing-crash); r=heycam
`MallocSizeOfOps::enclosing_size_of_op` is an `Option<>` type, and the panic in
question is caused by not providing a value in a case where it's needed for
measuring a HashSet.

HashMaps and HashSets are common enough that it makes sense to make
`enclosing_size_of_op` non-optional, which this patch does.

<!-- Please describe your changes on the following line: -->

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [X] These changes do not require tests because tests are on the Gecko side.

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: bb998dbdf31920d5ddc2a91d6bdfe8a880e11604

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 18ff3083b36733a2a212f094f249b46872b4ec61
2017-09-17 23:19:54 -05:00
.cargo
.vscode Bug 1377937 - Fix VSCode tasks on Windows (NPOTB, DONTBUILD). r=gps 2017-07-03 21:55:07 +03:00
accessible Bug 1383501: Modify a11y::IsHandlerRegistered to include check of path to handler binary; r=eeejay 2017-09-14 13:05:26 -06:00
browser Bug 1387846 change print button command to print instead of print preview on all platforms r=Gijs 2017-09-17 17:23:00 -04:00
build Bug 1400128 - Link thumb library of libc++ when using MOZ_THUMB=1 and NDK r11c. r=froydnj 2017-09-15 13:40:43 +09:00
caps Bug 1363200 - JSAPI for realms: Move mIsContentXBLScope to the CompartmentPrivate. r=mrbkap 2017-07-12 15:00:47 -05:00
chrome Backed out changeset 05fc8d2d7ca9 (bug 863246) for failing various reftests, e.g. parser/htmlparser/tests/reftest/bug535530-2.html. r=backout on a CLOSED TREE 2017-08-25 16:44:40 +02:00
config Backed out changesets 98e46ead3522 and 52e6fce3e6f6 (bug 1399870) for Windows test failures; a=backout 2017-09-15 15:52:03 -07:00
db Bug 1369361 - Backport SQLite fix removing rand_s() in an attempt to avoid Lenovo DLL crashes. r=mak 2017-09-12 12:58:59 -07:00
devtools Merge inbound to m-c. a=merge 2017-09-15 14:20:02 -04:00
docshell Backed out 7 changesets (bug 1364364) for causing bug 1399182. 2017-09-12 13:21:17 -04:00
dom Bug 1400537 - P2. Pass video framerate to decoder. r=gerald 2017-09-17 18:06:47 +02:00
editor merge mozilla-inbound to mozilla-central. r=merge a=merge 2017-09-11 23:58:31 +02:00
embedding Bug 1356569 - Remove notifyObservers' last parameter when it is falsy, r=jaws. 2017-04-14 21:51:39 +02:00
extensions Bug 1359624 - Disable nsAuthSambaNTLM module on OSX. r=mayhemer 2017-09-11 02:16:00 -04:00
gfx Backed out changeset 7d0893f1b6ce (bug 1389021) for leaking in mda2 on Linux x64 asan (bug 1374856). r=backout a=backout 2017-09-17 14:26:25 +02:00
gradle/wrapper
hal Bug 1389598 - Part 4: Remove remaining gonk refs. r=froydnj 2017-08-11 17:45:18 -07:00
image Bug 1399079 - Fix StreamingLexer::Clone assert to handle SourceBuffer insertion failures. r=tnikkel 2017-09-13 07:26:04 -04:00
intl Bug 1387937 - Part 2. Add patch file. r=jfkthame 2017-09-15 19:07:06 +09:00
ipc Backed out changeset d9bc6c96c492 (bug 1399877) for build bustage a=backout 2017-09-15 14:53:20 -07:00
js merge mozilla-inbound to mozilla-central. r=merge a=merge 2017-09-16 11:35:02 +02:00
layout Bug 1400411 - stop mocking most of DrawTarget. r=jrmuizel 2017-09-16 10:42:11 -04:00
media Bug 1399905 - Update cubeb from upstream to 09a90a7. r=padenot 2017-09-14 18:35:15 +03:00
memory Backed out changeset 0e349b74bfc6 (bug 1399921) for failure to thrive on Mac 2017-09-14 20:36:41 -07:00
mfbt Merge inbound to central, a=merge 2017-09-14 00:03:28 -07:00
mobile Backout revision e95f8bd7b519 and 84091f931dff (bug 1385227) for breaking Beta release automation. 2017-09-16 11:04:13 +02:00
modules Bug 1400602 - Update Freetype to version 2.8.1. r=jfkthame 2017-09-17 07:36:44 -04:00
mozglue Backed out changesets 98e46ead3522 and 52e6fce3e6f6 (bug 1399870) for Windows test failures; a=backout 2017-09-15 15:52:03 -07:00
netwerk merge mozilla-inbound to mozilla-central. r=merge a=merge 2017-09-14 23:58:56 +02:00
nsprpub Bug 1393854, NSPR_4_17_BETA1 2017-08-25 19:01:51 +02:00
other-licenses Bug 1369255 - Part 1: Add a prompt in the stub installer for running profile cleanup. r=rstrong 2017-07-12 10:29:38 -07:00
parser Bug 1398401 - Add preference check for custom element setup. r=smaug 2017-09-12 00:40:00 -04:00
probes Bug 1344878 - add BUG_COMPONENT to probes/* files. r=Ms2ger 2017-03-24 09:50:48 -04:00
python merge autoland to mozilla-central. r=merge a=merge 2017-09-13 13:32:44 +02:00
rdf Bug 1396682 - Remove exposure of nsIAtom to script in rdf/. r=pike. 2017-09-05 09:33:54 +10:00
security No bug, Automated HPKP preload list update from host bld-linux64-spot-302 - a=hpkp-update 2017-09-17 10:41:04 -07:00
services Bug 1400075 - Cleanup async handling for tab engine in TPS. r=markh 2017-09-14 16:59:11 -07:00
servo servo: Merge #18549 - Fix a panic in Stylo memory reporting (from nnethercote:fix-enclosing-crash); r=heycam 2017-09-17 23:19:54 -05:00
startupcache Bug 1386825 - Part 4: Remove remaining instances of MOZ_B2G. r=froydnj 2017-08-08 14:41:09 -07:00
storage Merge autoland to m-c. a=merge 2017-08-24 20:20:08 -04:00
taskcluster Bug 1395697 - Add scripts to handle MAR recompression in release automation r=catlee 2017-09-16 08:38:34 -04:00
testing Bug 1396848 - Iterating a Header object returns sorted and combined values, r=qdot 2017-09-17 11:18:20 +02:00
third_party merge mozilla-inbound to mozilla-central. r=merge a=merge 2017-09-15 11:05:11 +02:00
toolkit Merge inbound to m-c. a=merge 2017-09-16 23:13:36 -04:00
tools Backout revision e95f8bd7b519 and 84091f931dff (bug 1385227) for breaking Beta release automation. 2017-09-16 11:04:13 +02:00
uriloader Bug 1391186 - Thunderbird loses setting as default email client when "mailto" triggered by Firefox 56/57 (OS X 10.11). r=spohl 2017-08-28 14:28:07 -07:00
view Bug 1398196, flush layout before hittesting when handling mousedown/up, r=ehsan 2017-09-14 23:26:24 +03:00
widget Backout f89ae3c450ce (bug 1324892) for busting Thunderbird. r=me 2017-09-16 00:09:31 -04:00
xpcom Bug 1399825 - Include nsXULAppAPI.h in nsThreadManager.cpp. r=Ms2ger 2017-09-14 12:51:41 +01:00
xpfe Bug 1390428 (part 9) - Remove nsXPIDLCString. r=erahm. 2017-08-17 15:29:03 +10:00
.clang-format Bug 1399359 - Enable clang-format option SplitEmptyFunction to have empty constructor correctly placed r=andi,jya 2017-09-13 08:39:43 +02:00
.clang-format-ignore No bug - Remove an non-breaking space r=me DONTBUILD 2017-09-01 11:41:39 +02:00
.clang-tidy
.cron.yml bug 1349227 - 2 nightlies per day on m-c. r=catlee DONTBUILD 2017-08-29 16:01:14 -07:00
.eslintignore Bug 1399449 - Convert devtools/client/responsivedesign/responsivedesign.jsm to a commonjs module. r=jryans 2017-09-13 14:33:58 +02:00
.eslintrc.js Bug 1359011 - Make the mozilla/recommended eslint configuration the default for the whole tree. r=mossop 2017-04-25 20:12:21 +01:00
.flake8 Bug 1395126 - Support cascading configuration for flake8, r=bc 2017-08-29 17:32:31 -04:00
.gdbinit
.gdbinit_python Bug 1346025 - Move vendored python modules from /python to /third_party/python, r=ted 2017-05-25 11:48:03 -04:00
.gitignore Bug 1382304: hg/gitignore captures/ dir. r=nalexander 2017-07-19 11:08:06 -07:00
.hgignore Bug 1387265 - Expand talos tp6 to macosx; r=jmaher 2017-08-15 15:30:23 -04:00
.hgtags No bug - Tagging mozilla-central 8e818b5e9b6bef0fc1a5c527ecf30b0d56a02f14 with FIREFOX_BETA_57_BASE a=release DONTBUILD CLOSED TREE 2017-09-15 18:44:36 +02:00
.inferconfig Bug 1357629 - Add httpclientandroidlib to .inferconfig ignore list r=nalexander,njpark 2017-04-18 20:05:25 -07:00
.lldbinit Bug 1346025 - Move vendored python modules from /python to /third_party/python, r=ted 2017-05-25 11:48:03 -04:00
.taskcluster.yml Backed out 2 changesets (bug 1342392) for bustage a=backout 2017-09-11 17:35:09 -07:00
.yamllint Bug 1392795 - [yamllint] Group paths to lint by their closest config and run each config group separately, r=dustin 2017-08-23 11:28:28 -04:00
.ycm_extra_conf.py
AUTHORS Bug 1111333 - Enable double-tap-drag to zoom. r=kats 2017-05-23 19:53:06 +02:00
CLOBBER Bug 1399970 - Add Photon polish, PureComponents and bug fixes to Activity Stream. r=dmose 2017-09-14 15:08:05 -07:00
GNUmakefile
LEGAL
LICENSE
Makefile.in Backed out 4 changesets (bug 1259832) for apparently scheduling nightlies on every push/platform a=backout 2017-08-16 17:26:08 -07:00
README.txt Bug 1349108 - Update links in README.txt to HTTPS r=RyanVM 2017-03-21 00:11:02 -04:00
aclocal.m4 Bug 1363992 - Remove jemalloc 4. r=njn 2017-05-11 13:23:07 +09:00
build.gradle Bug 1255227 - Part 1: Stop using deprecated android-sdk-manager Gradle plugin. r=sebastian 2017-07-18 09:46:09 -07:00
client.mk Bug 1386739 - Only pass --output-sync=line to make in automation. r=gps 2017-08-15 12:30:28 -07:00
client.py
configure.in
configure.py
gradle.properties
gradlew
mach
moz.build Bug 1392390 - Create a reftest selftest harness, r=jmaher 2017-09-11 16:08:01 -04:00
moz.configure Backed out changeset d9bc6c96c492 (bug 1399877) for build bustage a=backout 2017-09-15 14:53:20 -07:00
mozilla-config.h.in Bug 1371266 - libpng should be built with -std=c89. r=glennrp 2017-06-08 06:29:03 -07:00
npm-shrinkwrap.json Bug 1395879 - Remove espree/escope etc from the direct dependencies of eslint-plugin-mozilla since they are really peerDependencies supplied by the existing eslint peer. r=mossop 2017-09-01 11:27:33 +01:00
old-configure.in Merge m-c to autoland, a=merge CLOSED TREE 2017-09-11 15:21:36 -07:00
package.json Bug 1380956 - List only the directly required dependencies for ESLint in the top-level package.json. r=ahal 2017-07-14 12:21:54 +01:00
settings.gradle Backed out 2 changesets (bug 1355625) for causing bustage a=backout 2017-06-22 12:05:56 -07:00
test.mozbuild

README.txt

An explanation of the Mozilla Source Code Directory Structure and links to
project pages with documentation can be found at:

    https://developer.mozilla.org/en/Mozilla_Source_Code_Directory_Structure

For information on how to build Mozilla from the source code, see:

    https://developer.mozilla.org/en/docs/Build_Documentation

To have your bug fix / feature added to Mozilla, you should create a patch and
submit it to Bugzilla (https://bugzilla.mozilla.org). Instructions are at:

    https://developer.mozilla.org/en/docs/Creating_a_patch
    https://developer.mozilla.org/en/docs/Getting_your_patch_in_the_tree

If you have a question about developing Mozilla, and can't find the solution
on https://developer.mozilla.org, you can try asking your question in a
mozilla.* Usenet group, or on IRC at irc.mozilla.org. [The Mozilla news groups
are accessible on Google Groups, or news.mozilla.org with a NNTP reader.]

You can download nightly development builds from the Mozilla FTP server.
Keep in mind that nightly builds, which are used by Mozilla developers for
testing, may be buggy. Firefox nightlies, for example, can be found at:

    https://archive.mozilla.org/pub/firefox/nightly/latest-mozilla-central/
            - or -
    https://nightly.mozilla.org/