Commit Graph

539238 Commits

Author SHA1 Message Date
Mike Hommey
7fd2c94e79 Bug 1368932 - Move the replace_malloc_init_funcs function around. r=njn
--HG--
extra : rebase_source : 4e3b3bbd18a37a3ee01d6ec30449249be5481b77
2017-05-31 13:47:11 +09:00
Mike Hommey
565f74102e Bug 1368932 - Fill the replace-malloc malloc_table_t with the real allocator as a fallback. r=njn
Until now, the malloc implementation functions would call the
replace-malloc functions if they exist, and fallback to the real
allocator in no such function exists. Instead of doing this, we now
fill the empty slots in the malloc_table_t with the real allocator
functions.

--HG--
extra : rebase_source : b54634f23188906939e4dc01fc5a3007de0f3f2c
2017-05-30 15:57:28 +09:00
Mike Hommey
1a6ac2f8fb Bug 1368932 - Use a malloc_table_t for most replace-malloc function pointers, on all platforms. r=njn
We make replace_malloc_init_funcs called on all platforms and fill out a
malloc_table_t for the replace-malloc functions with what comes from
dlsym/GetProcAddress on Android/Windows, and from the dynamically linked
weak symbols replace_* on other platforms.

replace_malloc.h contains definitions of *_impl_t types for each of the
functions in the malloc_table_t, which is redundant with the
replace_*_impl_t types we were creating, so we remove those typedefs,
except for the two functions (init and get_bridge) that don't have such
a typedef. Those functions don't appear in malloc_table_t.

--HG--
extra : rebase_source : 3705a99ee07f63dbaa66973eef19ddab224e0911
2017-05-30 15:57:28 +09:00
Mike Hommey
409495f283 Bug 1368932 - Refactor such that there is only one definition of replace_malloc_init_funcs. r=njn
We want, in a subsequent patch, to have replace_malloc_init_funcs be
called on all platforms (including those relying on the replace-malloc
library being loaded already) and perform more initialization.

To prepare for that, we move the non-platform-specific pieces out.

--HG--
extra : rebase_source : 239ed363ee168bf4f8a96e0a1ca52981cb941b71
2017-05-30 15:57:28 +09:00
Mike Hommey
37b66db19d Bug 1368932 - Generate all the _impl functions with macros in replace-malloc. r=njn
All the _impl functions in replace-malloc.c are largely identical. This
replaces all of them with macro expansions.

--HG--
extra : rebase_source : 67a1809b0b0fc4645ea5041154fa3a6dcb6cce6b
2017-05-25 16:47:57 +09:00
Mike Hommey
e4fddc104f Bug 1368932 - Add argument names to malloc implementation declarations in replace-malloc. r=njn
This transforms the declarations from e.g.:
    void *realloc(void *, size_t);
into:
    void *realloc(void *arg1, size_t arg2);

--HG--
extra : rebase_source : 627eb833a98d11f044c776f9d29715ccad31174d
2017-05-25 16:04:46 +09:00
Mike Hommey
c1becb4a54 Bug 1368932 - Allow MOZ_PASTE_PREFIX_AND_ARG_COUNT to work with 0 arguments. r=froydnj
At the same time, remove the MOZ_STATIC_ASSERT_VALID_ARG_COUNT, which
doesn't actually work for more than 50 arguments(*), and which is now not
useful to detect 0 arguments.

(*) the build fails, but not directly thanks to the static_assert it
expands to.

--HG--
extra : rebase_source : 8f0fe7b352c89b5a3ec87f42ef5464c370c362ef
2017-05-25 15:47:21 +09:00
Mike Hommey
2357f45d41 Bug 1368932 - Don't rely on the default MALLOC_DECL_VOID for malloc function declarations in replace-malloc. r=njn
In practice, this induces no change in what the expanded code looks
like.

--HG--
extra : rebase_source : 0df6a5dd3ca5161c0969c814e4222eeb51f9f9a2
2017-05-25 15:58:56 +09:00
Mike Hommey
7cd6d8b45d Bug 1368932 - Factor out function declarations for malloc implementation. r=njn
--HG--
extra : rebase_source : a8df78c7ade473eb5d7c71228f0939cce4554f57
2017-05-25 15:54:05 +09:00
Mike Hommey
16215c85f1 Bug 1368932 - Remove void argument from declarations in malloc_decls.h. r=njn
This makes no significant difference in practice in the macro
expansions, but will help down the line.

--HG--
extra : rebase_source : 6d61c1f28c558321478d7e5f26390d27ae8ae3ac
2017-05-25 13:56:40 +09:00
Servo VCS Sync
95a49c60f4 No bug - Revendor rust dependencies 2017-06-01 06:58:58 +00:00
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
Xidorn Quan
cba525c8ae servo: Merge #17118 - Remove unicode-bidi/with_serde feature from style deps (from upsuper:unicode-bidi-serde); r=heycam
It seems removing this feature from here would unbust stylo build on Gecko side, and style crate doesn't need it anyway, and for Servo, other crates would bring this feature back, so it shouldn't break Servo either.

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

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 656f6a3562d94f5909c98c2b0f7729254117926b
2017-05-31 19:28:12 -07:00
Josh Matthews
6c29c8bee1 servo: Merge #17111 - Remove cssparser dependency from msg (from servo:jdm-patch-1); r=mbrubeck
This removes a bunch of unnecessary rebuilds when modifying rust-cssparser.

Source-Repo: https://github.com/servo/servo
Source-Revision: 04d84a26247b04457f21ac017e956b4709556545

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : e1286b669f83774d6c708e89e50410d575fb4ba3
2017-05-31 18:06:28 -07:00
Chris Pearce
29bb4271d4 Bug 1368583 - Adjust MediaEMENoCodecsDeprecatedWarning string to make it clearer. r=flod
MozReview-Commit-ID: Gm6CtEq2LVC

--HG--
extra : rebase_source : c9818b52926cb9d2eb47905c333e79eb96dd518a
2017-06-01 08:12:24 +12:00
Phil Ringnalda
d2f197d1b9 Merge m-c to a CLOSED TREE autoland
MozReview-Commit-ID: AOUyvYh643g
2017-05-31 23:40:53 -07:00
Aki Sasaki
4b0eee350e Bug 1369250 - set VIRTUALENV_NO_DOWNLOAD so virtualenv versions >=14 will know to not download new packages, and older versions won't object to not knowing about the commandline --no-download, a=philor CLOSED TREE 2017-05-31 22:47:08 -07:00
Aki Sasaki
ef19521c81 bug 1369250 - avoid hitting the network with virtualenv 15.1.0. a=philor CLOSED TREE
MozReview-Commit-ID: 9Pyh3wapEvc
2017-05-31 21:04:18 -07:00
Ehsan Akhgari
fb6d29cdc3 Backout bug 1368286 because of event processing regressions with nested event loops on OSX a=RyanVM
Landing on a CLOSED TREE
2017-05-31 22:47:47 -04:00
Ryan VanderMeulen
925f8e7dd2 Bug 1369214 - Fix ESLint doublequote failures in test_getProcess.html on a CLOSED TREE. 2017-05-31 21:48:59 -04:00
Xidorn Quan
3a024a13a5 Bug 1341102 - Vendor only pre-1.0 version of serde on a CLOSED TREE.
MozReview-Commit-ID: 2UB7KxmgSYI

--HG--
rename : third_party/rust/serde-0.9.9/src/bytes.rs => third_party/rust/serde/src/bytes.rs
rename : third_party/rust/serde-0.9.9/src/de/content.rs => third_party/rust/serde/src/de/content.rs
rename : third_party/rust/serde-0.9.9/src/de/private.rs => third_party/rust/serde/src/de/private.rs
rename : third_party/rust/serde-0.9.9/src/error.rs => third_party/rust/serde/src/error.rs
rename : third_party/rust/serde-0.9.9/src/iter.rs => third_party/rust/serde/src/iter.rs
rename : third_party/rust/serde-0.9.9/src/ser/content.rs => third_party/rust/serde/src/ser/content.rs
rename : third_party/rust/serde-0.9.9/src/ser/private.rs => third_party/rust/serde/src/ser/private.rs
rename : third_party/rust/serde-0.9.9/src/utils.rs => third_party/rust/serde/src/utils.rs
extra : rebase_source : 26aee8c2b25fa2e61dc1cb84f709408a73c7c16a
2017-06-01 11:25:35 +10:00
Ryan VanderMeulen
b2f44e5181 Merge inbound to m-c. a=merge 2017-05-31 20:25:52 -04:00
Aneesh Agrawal
3915c8b568 servo: Merge #17115 - Disable macbrew updater (from aneeshusa:temporarily-disable-macbrew-updater); r=emilio
<!-- 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: -->
- [ ] `./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 _____

<!-- 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: 1aa3eec66bf88f58b547a4ac71c353e774ecc790

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : c263ab59c07e33f1137b78c836e89f20924d7702
2017-05-31 17:00:15 -07:00
Andrew McCreight
ffd5350678 Bug 1369214 - test_getProcess.html should explicitly require Services in its process script. r=ochameau
MozReview-Commit-ID: BIjsqgIedxD

--HG--
extra : rebase_source : 764ab09860de0f30efef2545fc29b704c1a870f2
2017-05-31 16:09:06 -07:00
Ryan VanderMeulen
242f4b304d Merge m-c to autoland. a=merge
CLOSED TREE
2017-05-31 20:50:21 -04:00
Xidorn Quan
18d00c2891 Bug 1341102 - Update vendored clap to get more consistent bitflags on a CLOSED TREE.
MozReview-Commit-ID: 3Km7H7yEh39
2017-06-01 09:52:00 +10:00
Xidorn Quan
208110c249 Bug 1341102 - Revendor rust dependencies again after several manual update on a CLOSED TREE.
MozReview-Commit-ID: JMCJVitYYnz
2017-06-01 09:35:32 +10:00
Xidorn Quan
57b78a2dbd Bug 1341102 - Revendor rust dependencies on a CLOSED TREE.
MozReview-Commit-ID: 6MPTaW3uQN

--HG--
extra : amend_source : 2424a2ce2527129ad92526b548a96fb3564cbda5
2017-06-01 09:12:44 +10:00
Ryan VanderMeulen
de8387b1ec Backed out changeset 6a894530a99b (bug 1355764) for Win7 browser_roundedWindow_newWindow.js failures on a CLOSED TREE. 2017-05-31 18:05:10 -04:00
Ryan VanderMeulen
f805581511 Backed out changeset 4b82f58570e4 (bug 1368208) for 508816-1.xul failures on a CLOSED TREE. 2017-05-31 17:39:30 -04:00
Sebastian Hengst
07bad56b33 Backed out changeset afc25136f9ae (bug 1363505) for frequently failing own test browser_tabclose_grow_reflows.js and browser_roundedWindow_newWindow.js. r=backout on a CLOSED TREE 2017-05-31 23:00:50 +02:00
Sebastian Hengst
ff36251454 Backed out changeset b6447762b05a (bug 1363505) 2017-05-31 22:59:49 +02:00
Sebastian Hengst
c0ee2afc07 Backed out changeset b0c79c15c6ff (bug 1363505) 2017-05-31 22:59:44 +02:00
Sebastian Hengst
9768267be1 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
Sebastian Hengst
a9f8675d96 Backed out changeset c2d00a8b897b (bug 1368560) 2017-05-31 22:52:14 +02:00
Fernando Jimenez Moreno
e85ff5cb1b Bug 1365674 - stylo: Simulate compute value failure for dom/animation mochitests. r=hiro
MozReview-Commit-ID: 8flMLuW2vZP

--HG--
extra : rebase_source : 572ddece88644de63930468f532c31d37167f017
2017-05-30 10:24:08 +02:00
Servo VCS Sync
4769a3ac14 No bug - Revendor rust dependencies 2017-05-31 19:46:31 +00:00
Gregory Szorc
cf1ffbce1d Bug 1369156 - Remove accidentally committed Cargo.toml.orig; r=me
This is due to a bug in Servo VCS Sync.

MozReview-Commit-ID: 8xAl0DKwATt

--HG--
extra : rebase_source : 1019d56f880f69ef1ab9a8f5517c3f653a0d9595
2017-05-31 12:44:33 -07:00
Dão Gottwald
2f2e121480 Bug 1368208 - Don't flush layout to determine whether scrollbox scroll buttons should be enabled/disabled. r=mconley
MozReview-Commit-ID: 1LG3GDBFArv

--HG--
extra : rebase_source : a8edf7c3d32d72f39f983f7f9f64c3d31a786031
2017-05-31 21:34:41 +02:00
Chris H-C
5659dfb700 bug 1367110 - Collect Telemetry for different TelemetrySend failures r=bsmedberg,Dexter data-r=bsmedberg
Expires in 61 for now until we can show its usefulness.

MozReview-Commit-ID: IpfEnmnuKgr

--HG--
extra : rebase_source : b5b45cda2f90aee6a52fccc073d4c4ff5e381c5e
2017-05-24 10:14:41 -04:00
Johann Hofmann
e8499275d3 Bug 1367089 - Remove automation clue window attribute in mozscreenshots. r=MattN
MozReview-Commit-ID: 6SvAsI1oKFM

--HG--
extra : rebase_source : 31be6a380395646db66e2a13b96f9065fe3f2729
2017-05-24 15:14:37 +02:00
Mike Conley
84d63bfc89 Bug 1367596 - Don't show blank for tabs that haven't presented if they've loaded a non-blank page and are not busy. r=billm"
MozReview-Commit-ID: 3HFG2uzlQRe

--HG--
extra : rebase_source : e08340aa015c2f5ef6b340184ee037afa6d12744
2017-05-29 02:21:26 -04:00
Chris H-C
b92d148caa Bug 1367110 - Expose XHRMT's ErrorCode to chrome JS. r=baku
This is presently only relevant for XHRMT, so XHRWorker will just report that
everything's a-ok for now.

As noted inline, the permanence of this measure is to be evaluated in
Firefox 60 in bug 1368540.

MozReview-Commit-ID: 6gkTyZO388g

--HG--
extra : rebase_source : d85ec4181c9bd935f8e419d8d450fd17eb5e1837
2017-05-24 08:52:15 -04:00
Chris H-C
83e4d76955 Bug 1367110 - Make XHRMainThread's mErrorLoad more descriptive. r=baku
There are at least four ways XHRMT can error on load.

Let's be specific about it.

MozReview-Commit-ID: EOml2fcd1XD

--HG--
extra : rebase_source : 7f484f04e2dd6f219911408e7af152f85d4776a9
2017-05-24 08:44:38 -04:00
Sebastian Hengst
fd03aa5bc8 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
Sebastian Hengst
9b2d60a711 Backed out changeset 852ffb5b89bf (bug 1358223) 2017-05-31 21:33:33 +02:00
Valentin Gosu
7570e7cd65 Bug 1356097 - Update description for HTTP_SUB* and HTTP_PAGE* probes r=mcmanus
MozReview-Commit-ID: 2lGlLamFERD

--HG--
extra : rebase_source : badc81c50ff3ef2f45e2555c64528ad5be1e781d
2017-05-29 22:16:11 +02:00
Valentin Gosu
7b6dbd12fb Bug 1356097 - Improve correctness of HTTP_PAGE_* telemetry r=mcmanus
When the last request is removed from the load group, we report telemetry for the default load request. This was done without checking if the request was successful, which may cause us to report telemetry for failed requests as well.
Also, the NullHttpChannel had its timingEnabled attribute set to true, which could lead us to report invalid telemetry

MozReview-Commit-ID: 5w7rd2V17Xd

--HG--
extra : rebase_source : 60785ebc38da8880aa6ded668fed8af81c3d60e9
2017-05-29 22:15:37 +02:00
Valentin Gosu
a1c45c3558 Bug 1368549 - Remove MOZ_WIDGET_GONK from netwerk/* r=mcmanus
MozReview-Commit-ID: J2njLbNwlco

--HG--
extra : rebase_source : ccb35cb5845024c1bf7b448ebcec451bab264e8b
2017-05-29 22:09:04 +02:00
Fernando Jiménez Moreno
496ad5dd9e servo: Merge #17093 - Stylo - Bug 1365674: Simulate compute value failure for tests (from ferjm:bug1365674.simulate.compute.value.failure); r=hiikezoe
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors

https://bugzilla.mozilla.org/show_bug.cgi?id=1365674

Source-Repo: https://github.com/servo/servo
Source-Revision: 71eb672923365095c45cbd15ee0746eae3908cb6

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : a49f3946d100f3988281242c50faa2d37589da46
2017-05-31 12:03:50 -05:00