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
Go to file
Gregory Terzian 710fb566c0 servo: Merge #17120 - fix double borrowing of image request (from gterzian:fix_double_borrowing_of_image_request); r=jdm
<!-- Please describe your changes on the following line: -->

@jdm I couldn't reproduce the crashes, but looking at the code, I can tell that if we hit the cache inside `fetch_image`, we go straight to `process_image_response`, so we're still in the same scope as that where the borrowing occurs in `prepare_image_request`. When there is no cache hit, `process_image_response` is executed as part of a task...

This should fix the issue, while retaining the original logic.

All tests in `the-img-element` are passing...

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

<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- 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: 6a638876fdf1f7c87d9c17d302864d38b67510cb

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 7253d409d575aaf9aee0cd50a2f52f93d9216da4
2017-05-31 21:47:33 -07:00
.cargo
.vscode Add some task definitions to run mach from VSCode (bug 1323308). r=gps 2017-05-04 18:03:54 +03:00
accessible Backed out changeset 9b6ac0c2211d (bug 1363975) for eslint failures on a CLOSED TREE 2017-05-31 17:02:12 +02:00
addon-sdk Bug 1355994 - Stop flagging DevTools sandboxes with an Addon ID. r=kmag 2017-04-24 11:38:13 +02:00
browser Merge inbound to m-c. a=merge 2017-05-31 20:25:52 -04:00
build Bug 1367040 - Switch to using wptrunner in the tests directory, r=maja_zf 2017-05-31 15:45:46 +01:00
caps Bug 1348362 - Cleanup chrome://global/skin/icons - Remove unused files. r=dao 2017-05-07 19:16:27 +01:00
chrome Merge inbound to m-c. a=merge 2017-05-25 16:34:16 -04:00
config Bug 1368177 - quote {LIB,}CLANG_PATH for cargo; r=rillian 2017-05-28 17:13:30 -04:00
db Bug 1367892 - Upgrade to SQLite 3.19.2. r=mak 2017-05-25 17:03:46 -04:00
devtools Bug 1369214 - Fix ESLint doublequote failures in test_getProcess.html on a CLOSED TREE. 2017-05-31 21:48:59 -04:00
docshell Merge inbound to m-c. a=merge 2017-05-25 16:34:16 -04:00
dom Bug 1368583 - Adjust MediaEMENoCodecsDeprecatedWarning string to make it clearer. r=flod 2017-06-01 08:12:24 +12:00
editor Bug 1368387 - Remove nsIDOMText usages from Editor. r=masayuki 2017-05-29 11:28:21 +09:00
embedding Bug 1356569 - Remove notifyObservers' last parameter when it is falsy, r=jaws. 2017-04-14 21:51:39 +02:00
extensions Bug 1368418 part 3 - Remove nsCategoryImp. r=emk 2017-05-29 16:17:39 +10:00
gfx Merge inbound to m-c. a=merge 2017-05-31 20:25:52 -04:00
gradle/wrapper
hal Bug 1368029 - Remove LRU priority support from ProcessPriorityManager, r=gsvelto 2017-05-26 17:50:17 +02:00
image Bug 1341102 - Update test expectations. 2017-05-30 10:56:51 +10:00
intl Bug 1368418 part 3 - Remove nsCategoryImp. r=emk 2017-05-29 16:17:39 +10:00
ipc Backed out changeset 4e283b54baa6 (bug 1358223) for build bustage on Android at dom/ipc/ContentChild.cpp:21. r=backout 2017-05-31 21:34:13 +02:00
js Backed out changeset 8f6a8013e62c (bug 1367871) for Stack.cpp asserts on a CLOSED TREE. 2017-05-31 12:08:40 -04:00
layout Merge inbound to m-c. a=merge 2017-05-31 20:25:52 -04:00
media Merge inbound to m-c. a=merge 2017-05-31 14:32:55 -04:00
memory Bug 1367695 - Remove leftovers from jemalloc4. r=njn 2017-05-25 16:24:13 +09:00
mfbt Backed out changeset df0ddb9c9bef (bug 1368079) for making DevEdition fail to build 2017-05-30 23:10:48 -07:00
mobile Merge inbound to m-c. a=merge 2017-05-31 20:25:52 -04:00
modules Merge inbound to m-c. a=merge 2017-05-31 20:25:52 -04:00
mozglue Bug 1322554: Interpose kernel32!BaseThreadInitThunk to add verification of thread start addresses; r=aklotz,dmajor 2017-05-24 11:56:40 +02:00
netwerk Merge inbound to m-c. a=merge 2017-05-31 20:25:52 -04:00
nsprpub Bug 1350291, uplift NSPR_4_15_BETA2, r=franziskus 2017-05-10 17:36:58 +02:00
other-licenses Bug 1366763 - Update the installer file icon. r=rstrong 2017-05-30 13:24:38 -07:00
parser Backout changeset 3d64bdd31c15 (bug 1333333) for causing bug 1367067, bug 1367085 and bug 1367330. 2017-05-24 11:35:33 +03:00
probes Bug 1344878 - add BUG_COMPONENT to probes/* files. r=Ms2ger 2017-03-24 09:50:48 -04:00
python Bug 1367852 - Defer file read to reduce peak memory use in mozjar when dumping symbols. r=ted 2017-05-30 12:11:21 -07:00
rdf Bug 1330235 - Remove NS_STDCALL_FUNCPROTO and replace its usage with decltype. r=froydnj 2017-05-09 23:00:37 +10:00
security Backed out changeset 4e283b54baa6 (bug 1358223) for build bustage on Android at dom/ipc/ContentChild.cpp:21. r=backout 2017-05-31 21:34:13 +02:00
services Backed out changeset bf392a1d0c5a (bug 1368560) for failing xpcshell's test_ext_storage_sync.js and test_ext_storage_sync_crypto.js on Linux. r=backout on a CLOSED TREE 2017-05-31 22:53:16 +02:00
servo servo: Merge #17120 - fix double borrowing of image request (from gterzian:fix_double_borrowing_of_image_request); r=jdm 2017-05-31 21:47:33 -07:00
startupcache Bug 1334318 - remove last uses of PR_smprintf; r=froydnj 2017-04-28 10:13:26 -06:00
storage Bug 1359011 - Make the mozilla/recommended eslint configuration the default for the whole tree. r=mossop 2017-04-25 20:12:21 +01:00
taskcluster Bug 1369076 - Run the tier-2 linux64-qr tests on mozilla-central instead of graphics. r=dustin 2017-05-31 11:28:54 -04:00
testing Merge m-c to a CLOSED TREE autoland 2017-05-31 23:40:53 -07:00
third_party Bug 1341102 - Vendor only pre-1.0 version of serde on a CLOSED TREE. 2017-06-01 11:25:35 +10:00
toolkit Bug 1341102 - Vendor only pre-1.0 version of serde on a CLOSED TREE. 2017-06-01 11:25:35 +10:00
tools Backed out changeset ad1034334503 (bug 1347274) for conflict merging m-c to m-i 2017-05-31 14:18:56 +02:00
uriloader Bug 1351146 - P2 - Update test case and usage of nsIRedirectHistoryEntry interface. r=dragana 2017-05-25 19:42:00 +02:00
view Backed out changeset bbb688fe1ba3 (bug 1365614) 2017-05-22 15:45:31 +02:00
widget Merge inbound to m-c. a=merge 2017-05-31 20:25:52 -04:00
xpcom Backout bug 1368286 because of event processing regressions with nested event loops on OSX a=RyanVM 2017-05-31 22:47:47 -04:00
xpfe Backed out changeset a311d7c6ce20 (bug 1363975) 2017-05-31 17:00:08 +02:00
.clang-format Bug 1322321 - Update the clang format file to match more our coding style r=ehsan 2016-12-06 17:43:17 -10:00
.clang-format-ignore Bug 1363992 - Remove jemalloc 4. r=njn 2017-05-11 13:23:07 +09:00
.clang-tidy Bug 1319396 - Update the list of checkers in the .clang-tidy file r=Ehsan 2016-11-22 12:30:19 +01:00
.cron.yml Bug 1368058 - Fix Android and Linux Nightlys - triggered-by was removed in Bug 1351011; r=Callek a=tomcat 2017-05-26 14:43:58 +00:00
.eslintignore Bug 1367780 - Enable eslint on testing/firefox-ui,mozbase,profiles,specialpowers - mechanical updates; r=Standard8 2017-05-30 16:06:29 -06: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 1321956 - Disable flake8 check for 'visually indented line with same indent as next logical line', r=ahal 2016-12-08 09:53:21 -10:00
.gdbinit Bug 1317802 - don't stop for SIGSYS in .gdbinit; r=jld 2016-11-16 01:13:22 -05:00
.gdbinit_python
.gitignore Bug 1367041 - Add |mach wpt| support for Chrome, Edge and Servo, r=AutomatedTester 2017-05-31 15:45:47 +01:00
.hgignore Bug 1367041 - Add |mach wpt| support for Chrome, Edge and Servo, r=AutomatedTester 2017-05-31 15:45:47 +01:00
.hgtags No bug - Tagging mozilla-central 6583496f169cd8a13c531ed16e98e8bf313eda8e with FIREFOX_AURORA_54_BASE a=release DONTBUILD CLOSED TREE 2017-03-06 23:43:32 +01:00
.inferconfig Bug 1357629 - Add httpclientandroidlib to .inferconfig ignore list r=nalexander,njpark 2017-04-18 20:05:25 -07:00
.lldbinit
.taskcluster.yml Bug 591688 - Notify when decision task fails r=dustin,gps 2017-04-12 21:01:46 -07:00
.ycm_extra_conf.py
aclocal.m4 Bug 1363992 - Remove jemalloc 4. r=njn 2017-05-11 13:23:07 +09:00
Android.mk
AUTHORS Bug 1111333 - Enable double-tap-drag to zoom. r=kats 2017-05-23 19:53:06 +02:00
build.gradle Bug 1318823 - Use com.getkeepsafe.dexcount in Gradle builds. r=sebastian 2016-11-18 18:28:58 -08:00
client.mk Bug 1317778 - Emit a depfile with python configure dependencies so Make will know when to re-run configure. r=glandium 2016-12-02 10:05:57 -08:00
client.py
CLOBBER Bug 1361661 - Part 1 - Generate headers with process data from Processes.yaml. r=dexter 2017-05-23 13:43:35 +07:00
configure.in
configure.py Bug 1316140 - Allow use of multiprocessing from config.status on windows. r=mshal 2016-12-21 16:28:28 -08:00
GNUmakefile
gradle.properties
gradlew
LEGAL
LICENSE
mach Bug 1316140 - Allow use of multiprocessing from config.status on windows. r=mshal 2016-12-21 16:28:28 -08:00
Makefile.in Bug 1307301 - Don't attempt to compress compressed files when packing the symbols archive. r=ted 2017-04-27 22:51:19 -07:00
moz.build Bug 1262241 - Move the definition of the js library to a subdirectory. r=mshal 2017-04-04 11:43:14 +09:00
moz.configure Bug 1363811 - Replace all uses of delayed_getattr(a, 'b') with a.b. r=cmanchester+432261 2017-05-19 07:03:40 +09:00
mozilla-config.h.in
npm-shrinkwrap.json Backed out changeset e0f9c56c15f0 (bug 1362947) for linting failures, e.g. at accessible/tests/mochitest/jsat/doc_content_text.html:15. r=backout 2017-05-11 10:15:55 +02:00
old-configure.in Bug 1367892 - Upgrade to SQLite 3.19.2. r=mak 2017-05-25 17:03:46 -04:00
package.json Backed out changeset e0f9c56c15f0 (bug 1362947) for linting failures, e.g. at accessible/tests/mochitest/jsat/doc_content_text.html:15. r=backout 2017-05-11 10:15:55 +02:00
README.txt Bug 1349108 - Update links in README.txt to HTTPS r=RyanVM 2017-03-21 00:11:02 -04:00
settings.gradle
test.mozbuild

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/