Commit Graph

39805 Commits

Author SHA1 Message Date
Michael Layzell
981693a30f Bug 1320179 - Part 2: Add the nserror rust crate and generate NS_ERROR codes, r=froydnj
MozReview-Commit-ID: FFU6WfEqev
2017-04-06 18:37:25 -04:00
Wes Kocher
7da1f4c235 Merge m-c to inbound a=merge 2017-04-06 15:30:43 -07:00
Wes Kocher
1f91b9d155 Backed out 4 changesets (bug 1320179) for causing merge conflicts a=backout
Backed out changeset b8aa677f7452 (bug 1320179)
Backed out changeset 9e2f77570128 (bug 1320179)
Backed out changeset 470d8143b350 (bug 1320179)
Backed out changeset ea4f1b3cc7b1 (bug 1320179)
2017-04-06 15:29:24 -07:00
Doug Thayer
06dfd98d7d Bug 893505 - Simplify the application update UI. r=Gijs, r=enndeakin, r=rstrong, data-r=bsmedberg
There are quite a few changes in here. At a high level, all we're trying to do is to replace the old update popup with a less intrusive and more modern doorhanger (set of doorhangers) for various update success and failure conditions.
2017-04-06 15:09:16 -07:00
Wes Kocher
0c3144c6f6 Merge inbound to central, a=merge 2017-04-06 15:01:34 -07:00
Michael Layzell
c33097aeaa Bug 1320179 - Part 4: MOZ_OBJDIR->MOZ_TOPOBJDIR and update m-c-changes.patch for protobuf changes, r=fitzgen
MozReview-Commit-ID: EPhkF350sGY
2017-04-06 17:37:13 -04:00
Michael Layzell
c21cba1385 Bug 1320179 - Part 3: Define LOGLEVEL_0 unconditionally in protobuf on windows, r=fitzgen
This brings the workaround for the GOOGLE_LOG(ERROR) problem when ERROR is
defined as `0` by wingdi.h in line with our workaround in the chromium sandbox
code. (http://searchfox.org/mozilla-central/rev/381a7b8f8a78b481336cfa384cb0a5536e217e4a/security/sandbox/chromium/base/logging.h#334-346)

The other patches on this bug triggered a build problem where in some situations
ERROR would be undefined when the LogLevel enum is being defined, while ERROR
was defined at a callsite. By unconditionally defining ERROR on windows and
including the LOGLEVEL_0 enum variant, we can avoid this issue and fix the
associated build bustage.

MozReview-Commit-ID: 3XFHf1FqHBr
2017-04-06 17:22:11 -04:00
Michael Layzell
df411f4313 Bug 1320179 - Part 2: Add the nserror rust crate and generate NS_ERROR codes, r=froydnj
MozReview-Commit-ID: FFU6WfEqev
2017-04-06 17:22:08 -04:00
Carsten "Tomcat" Book
7408344f87 Merge mozilla-central to mozilla-inbound 2017-04-06 13:10:09 +02:00
Carsten "Tomcat" Book
207b516e89 merge mozilla-inbound to mozilla-central a=merge 2017-04-06 12:50:50 +02:00
Phil Ringnalda
ae74044b98 Merge m-c to m-i 2017-04-05 21:35:03 -07:00
Phil Ringnalda
4c78879252 Backed out 2 changesets (bug 1329294) for Win8 debug bustage in test_refresh_firefox.py TestFirefoxRefresh.testReset, a=merged-around-permaorange
Backed out changeset 08e2719fe7be (bug 1329294)
Backed out changeset 3b1bbf6392f4 (bug 1329294)
2017-04-05 21:32:08 -07:00
Wes Kocher
3d900a5d7e Merge inbound to central, a=merge 2017-04-05 14:16:37 -07:00
Wes Kocher
d71fef4f33 Merge autoland to central, a=merge 2017-04-05 13:20:39 -07:00
Bob Owen
064f4db5bc Bug 1329294 Part 1: Ensure Content Temp Dir is created before use. r=bsmedberg 2017-04-05 16:34:35 +01:00
Kartikaya Gupta
52441baad4 Bug 1323612 - Remove unused dependency in moz.configure rule. r=bustage
MozReview-Commit-ID: C5dSQoal3G1
2017-04-05 11:12:53 -04:00
Sotaro Ikeda
f6906ddf6f Bug 1323612 (Part 1) - Enable WebRender build on Android. r=froydnj
MozReview-Commit-ID: AVpgLoXJYVQ
2017-04-05 10:11:46 -04:00
Kartikaya Gupta
c32c70abe2 Merge m-c to graphics
MozReview-Commit-ID: JgUpOHlFfrP
2017-04-05 09:41:01 -04:00
Carsten "Tomcat" Book
7a670cdd01 merge mozilla-inbound to mozilla-central a=merge 2017-04-05 14:33:35 +02:00
Panos Astithas
87c97997a4 Fix some duplicate keys in histogram definitions (bug 1353666). r=gfritzsche
MozReview-Commit-ID: KsadndIc7AW

--HG--
extra : rebase_source : 651d81ab530dc578887336e688bcc882a7a4de46
2017-04-05 12:29:26 +03:00
Kartikaya Gupta
8335081baa Merge m-c to graphics
MozReview-Commit-ID: DenuOx3ztpy
2017-04-04 22:47:56 -04:00
Wes Kocher
bceaacd2b8 Merge inbound to central, a=merge 2017-04-04 11:25:13 -07:00
Chris AtLee
b7af545070 Bug 1351071: Get rid of pre-generated startup cache r=glandium
MozReview-Commit-ID: BcWcqEKwGBv

--HG--
extra : rebase_source : 4bd21805a89359a5a2ed7ffd2ee2b76cf1e9e634
2017-04-04 09:26:25 -04:00
Kartikaya Gupta
7ef76c0e9d Bug 1351480 - Update webrender to 7463ae5908ca1d4065763a8753af5d72a6f78b85. r=jrmuizel
In addition to updating gfx/webrender and gfx/webrender_traits, as well as the
Cargo.toml/Cargo.lock files and third-party rust dependencies, this updates
webrender_bindings for the following API changes:
- Update call to update_image for change in 086f912ea86d053d95e5f4eec00cae0d82ee5dba
- Update request_blob_image for new parameter added in 086f912ea86d053d95e5f4eec00cae0d82ee5dba.
- set_root_display_list got renamed to set_display_list, so update call sites.
2017-04-04 22:46:17 -04:00
Paolo Amadini
bc9668cdff Bug 1346716 - Remove the entry for "mimeTypes.rdf" in the directory service. r=mak
This improves performance because we won't try to fix the permissions of the file every time the nsIHandlerService implementation wants to open it, and makes it easier to access the file path from xpcshell tests.

MozReview-Commit-ID: DZmLa92qUnZ

--HG--
extra : source : bd0fdce03cc7442079e96318d3a9b519a4d403a9
2017-03-30 15:51:18 +01:00
Carl Corcoran
08fc406af4 Bug 1322554: Interpose kernel32!BaseThreadInitThunk to add verification of thread start addresses; r=dmajor
MozReview-Commit-ID: CvqZ3gXJyvo
2017-03-29 17:07:37 +02:00
Sebastian Hengst
948595ff2f merge mozilla-central to mozilla-inbound. r=merge a=merge 2017-04-01 13:12:04 +02:00
Sebastian Hengst
65f9bb8041 merge mozilla-inbound to mozilla-central. r=merge a=merge
MozReview-Commit-ID: 5E7o1qELKmN
2017-04-01 13:09:55 +02:00
Sebastian Hengst
0cb6e36e75 Backed out changeset 1b4e77a9d11d (bug 1350522) for leaking in browser_ext_incognito_popup.js. r=backout 2017-04-01 12:39:05 +02:00
Sebastian Hengst
6709885298 Backed out changeset a3ed5ad1bc33 (bug 1350522) 2017-04-01 12:38:28 +02:00
Sebastian Hengst
b16bea09f2 Backed out changeset 8f8891e51936 (bug 1350522) 2017-04-01 12:38:14 +02:00
Sebastian Hengst
f8b77a93c4 Backed out changeset 650808cfe044 (bug 1350522) 2017-04-01 12:38:09 +02:00
Sebastian Hengst
68eccd6f65 Backed out changeset 069dbaa8300e (bug 1350522) 2017-04-01 12:38:05 +02:00
Wes Kocher
3a0357deec Merge m-c to inbound a=merge 2017-03-31 17:53:52 -07:00
Wes Kocher
483fea00ef Merge inbound to central, a=merge 2017-03-31 17:48:18 -07:00
Mike de Boer
481e18fdf5 Bug 1319821 - Themes should allow for multiple background images in the toolbar. r=jaws,mattw
This patch also changes the 'headerURL' and 'theme_frame' properties to be of type
ExtensionURL, instead of strings. This improves validation robustness.
Alignment and tiling properties for the additional background images can be
specified in the newly introduced 'properties' section of the manifest.

MozReview-Commit-ID: BzvS3eHmDCY

--HG--
extra : rebase_source : 03560c0441bd2a6643c20a3f1fff8b905eca59ad
2017-03-31 14:48:44 +02:00
Carsten "Tomcat" Book
095969b8ee merge mozilla-inbound to mozilla-central a=merge 2017-03-31 14:45:33 +02:00
Dão Gottwald
6de398fc4f Bug 1350873 - Remove border and background fallback styling from spinbuttons.css. r=Nihanth 2017-03-31 09:04:31 +02:00
Iris Hsiao
a4e80da339 Backed out changeset 40eb77a98bcf (bug 1300152) 2017-03-31 13:47:37 +08:00
Iris Hsiao
4241e9748a Backed out changeset 23c5ecf4d92e (bug 1275780) for xpcshell perma-failing in Win8 2017-03-31 13:47:33 +08:00
Ryan VanderMeulen
05037eec1a Merge m-c to inbound. a=merge 2017-03-30 15:21:27 -04:00
Ryan VanderMeulen
615c542a03 Merge inbound to m-c. a=merge
CLOSED TREE
2017-03-30 15:20:22 -04:00
Sebastian Hengst
f7bdfd47a4 Backed out changeset 23de710cae6f (bug 1322554) for breaking at least Windows 8 x64 builds (likely all Windows builds). r=backout on a CLOSED TREE 2017-03-30 18:47:15 +02:00
Carsten "Tomcat" Book
74e36e1adb Merge mozilla-central to autoland on a CLOSED TREE
--HG--
extra : amend_source : 5026c19958cdc458c0f0887582fd00b8038fe93e
2017-03-30 16:48:10 +02:00
Sebastian Hengst
cb6b27aed8 Backed out changeset ffbf6849c41f (bug 1019483) 2017-03-31 10:07:50 +02:00
Ted Mielczarek
2c431cb961 bug 1275780 - capture Rust panic message in crash reports. r=froydnj
MozReview-Commit-ID: IUlYqPEtkgg

--HG--
extra : rebase_source : c328db9b979eb2ff1f469b6ebc4a63e7ac337c63
2017-03-27 14:40:22 -04:00
Ted Mielczarek
5f9adc61f1 bug 1300152 - Add nsIDebug2::rustPanic to allow triggering Rust panic for testing. r=froydnj
For testing purposes it will be useful to be able to trigger crashes in Rust
code. Being able to trigger a panic seems like a good place to start. This
will make it easier to validate improvements in crash reporting.

MozReview-Commit-ID: Bh5rBieLLWW

--HG--
rename : toolkit/crashreporter/test/unit/test_crash_moz_crash.js => toolkit/crashreporter/test/unit/test_crash_rust_panic.js
extra : rebase_source : ba9f626ca2d2852f966e93401b8f8f7543615310
extra : source : 8c9117de1e7f40af42b7cbce25bc3780c032fe45
2017-03-31 12:08:57 -04:00
Ted Mielczarek
68002ffc75 bug 1275780 - capture Rust panic message in crash reports. r=froydnj
MozReview-Commit-ID: IUlYqPEtkgg

--HG--
extra : rebase_source : 4ff228f90fe9114720f7f7a91df77a6899806a89
2017-03-27 14:40:22 -04:00
Servo VCS Sync
21716c4d5b No bug - Revendor rust dependencies 2017-04-05 09:37:48 +00:00
Kris Maglione
b9441f12eb Bug 1350522: Part 7 - Merge pageAction/browserAction/sidebarAction/commands helper classes into API instances. r=aswan
MozReview-Commit-ID: 6aRQ1uybAmg

--HG--
extra : rebase_source : a5976a2e8fe71849f2b0ff5044dfc242c993eeac
2017-03-26 18:42:59 -07:00