675913ddbb5571ffbd6a2dd44e82ad3579917d0b: merge fx-team to mozilla-central a=merge
Carsten "Tomcat" Book <cbook@mozilla.com> - Thu, 30 Oct 2014 14:49:31 +0100 - rev 213100
Push 9662 by cbook@mozilla.com at Thu, 30 Oct 2014 14:16:59 +0000
merge fx-team to mozilla-central a=merge
1aa1b23d799e5cf08b21bd8b08f78716d35d89f6: merge mozilla-inbound to mozilla-central a=merge
Carsten "Tomcat" Book <cbook@mozilla.com> - Thu, 30 Oct 2014 14:45:37 +0100 - rev 213099
Push 9662 by cbook@mozilla.com at Thu, 30 Oct 2014 14:16:59 +0000
merge mozilla-inbound to mozilla-central a=merge
b991ca238a3538e152dbcd7317b2c5f178b61555: Bug 1090494, part 4 - Add AppendRectToPath() and MakePathForRect() helpers to Moz2D's PathHelpers.h. r=mattwoodrow
Jonathan Watt <jwatt@jwatt.org> - Thu, 30 Oct 2014 09:34:10 +0000 - rev 213098
Push 9662 by cbook@mozilla.com at Thu, 30 Oct 2014 14:16:59 +0000
Bug 1090494, part 4 - Add AppendRectToPath() and MakePathForRect() helpers to Moz2D's PathHelpers.h. r=mattwoodrow
b17a0c6392b2cc39e3369cde47f08a1530b61c7e: Bug 1090494, part 3 - Remove the old unused variants of AppendRoundedRectToPath and MakePathForRoundedRect. r=mattwoodrow
Jonathan Watt <jwatt@jwatt.org> - Thu, 30 Oct 2014 09:34:10 +0000 - rev 213097
Push 9662 by cbook@mozilla.com at Thu, 30 Oct 2014 14:16:59 +0000
Bug 1090494, part 3 - Remove the old unused variants of AppendRoundedRectToPath and MakePathForRoundedRect. r=mattwoodrow
71cf4fde05c6bc27ca61d541d7419e9bf27e6789: Bug 1090494, part 2 - Convert the consumers of AppendRoundedRectToPath and MakePathForRoundedRect to use the new RectCornerRadii API. r=mattwoodrow
Jonathan Watt <jwatt@jwatt.org> - Thu, 30 Oct 2014 09:34:10 +0000 - rev 213096
Push 9662 by cbook@mozilla.com at Thu, 30 Oct 2014 14:16:59 +0000
Bug 1090494, part 2 - Convert the consumers of AppendRoundedRectToPath and MakePathForRoundedRect to use the new RectCornerRadii API. r=mattwoodrow
8fff7a04f3221954330139121bb9b3a7513724a6: Bug 1090494, part 1 - Add a RectCornerRadii struct to Moz2D's PathHelpers.h and add variants of AppendRoundedRectToPath and MakePathForRoundedRect that use it. r=mattwoodrow
Jonathan Watt <jwatt@jwatt.org> - Thu, 30 Oct 2014 09:34:09 +0000 - rev 213095
Push 9662 by cbook@mozilla.com at Thu, 30 Oct 2014 14:16:59 +0000
Bug 1090494, part 1 - Add a RectCornerRadii struct to Moz2D's PathHelpers.h and add variants of AppendRoundedRectToPath and MakePathForRoundedRect that use it. r=mattwoodrow
32a7f74c5c10f0c53ca47b4a73fe4d61fbcafd04: Bug 1091471 - update Clobber for Bug 1091118 Android Build problems
Carsten "Tomcat" Book <cbook@mozilla.com> - Thu, 30 Oct 2014 10:23:32 +0100 - rev 213094
Push 9662 by cbook@mozilla.com at Thu, 30 Oct 2014 14:16:59 +0000
Bug 1091471 - update Clobber for Bug 1091118 Android Build problems
272af6fe4c647c31f199a83207ff13701b03aff8: Bug 1090983 - Invoke UpdateReadyState() after invoking SetState(). r=cpearce
Bobby Holley <bobbyholley@gmail.com> - Thu, 30 Oct 2014 09:16:02 +0100 - rev 213093
Push 9662 by cbook@mozilla.com at Thu, 30 Oct 2014 14:16:59 +0000
Bug 1090983 - Invoke UpdateReadyState() after invoking SetState(). r=cpearce Otherwise, UpdateReadyState() will think that nothing has changed.
76d469458524188311300a9091314438b128761d: Backed out changeset 1aa71eb718f7 (bug 1090627) for b2g Reftest - 8 test failures
Carsten "Tomcat" Book <cbook@mozilla.com> - Thu, 30 Oct 2014 08:43:28 +0100 - rev 213092
Push 9662 by cbook@mozilla.com at Thu, 30 Oct 2014 14:16:59 +0000
Backed out changeset 1aa71eb718f7 (bug 1090627) for b2g Reftest - 8 test failures
cb7e5e9925302dfcb2fd79129ac0083e59ea5873: Fixup for bug 1077148: SmokeDMD needs mozglue linkage. r=me
Mike Hommey <mh+mozilla@glandium.org> - Thu, 30 Oct 2014 16:33:30 +0900 - rev 213091
Push 9662 by cbook@mozilla.com at Thu, 30 Oct 2014 14:16:59 +0000
Fixup for bug 1077148: SmokeDMD needs mozglue linkage. r=me
0fe6218eec33e10ebffdaf9ad89b1f021c1b29d6: Bug 1091118 part 2 - Do not use the top-level cache file for freetype2 subconfigure. r=gps
Mike Hommey <mh+mozilla@glandium.org> - Thu, 30 Oct 2014 14:35:01 +0900 - rev 213090
Push 9662 by cbook@mozilla.com at Thu, 30 Oct 2014 14:16:59 +0000
Bug 1091118 part 2 - Do not use the top-level cache file for freetype2 subconfigure. r=gps We modify the environment before running freetype2 configure. When it uses the same cache file, it stores knowledge about that environment in the cache file. The cache file is then reused to configure in js/src, with yet again a different environment, which makes subconfigure.py clear the cache because of the differences. The configure in js/src is however invoked with the same environment as the main configure was invoked with (mostly), so without freetype2 on the way, reusing the cache for it works as expected. In fact, it works better with the cache because of things coming from mozconfig that are not exported. With freetype2 on the way, as mentioned above, the cache is cleared. Without the cache, js/src/configure does new detections with a possibly different environment, and stores that in the cache. Until the next build, which then uses that different cache for the top-level configure. This results in subtle differences in the HOST_CC/HOST_CXX variables on android builds because those variables are not exported from mozconfig, depending on PATH, what the builder was building before, and if the build is a clobber. Avoiding the freetype2 subconfigure writing its environment variables change to the top-level cache makes the cache never invalidate for js/src.
ed34888e6a483e813ca31f6ec412bef87892fc5b: Bug 1091118 part 1 - Remove $topsrcdir/gcc/bin from PATH on android builds. r=gps
Mike Hommey <mh+mozilla@glandium.org> - Thu, 30 Oct 2014 14:34:54 +0900 - rev 213089
Push 9662 by cbook@mozilla.com at Thu, 30 Oct 2014 14:16:59 +0000
Bug 1091118 part 1 - Remove $topsrcdir/gcc/bin from PATH on android builds. r=gps $topsrcdir/gcc/bin was mistakenly added in bug 971841, but is not provided by anything the tooltool manifest for android builds pulls. It however is a path that /may/ exist in the source tree when the slave ran a linux build before. When it does exist, the meaning of non-path-prefixed commands change, influencing what particular compiler is used in some cases.
1aa71eb718f7534a5ee8d8657a91c09c1f6225bd: Bug 1090627 - Disable some failing reftests for e10s (r=mattwoodrow)
Bill McCloskey <wmccloskey@mozilla.com> - Wed, 29 Oct 2014 15:18:12 -0700 - rev 213088
Push 9662 by cbook@mozilla.com at Thu, 30 Oct 2014 14:16:59 +0000
Bug 1090627 - Disable some failing reftests for e10s (r=mattwoodrow)
1c24de5c098e4a999d00a0800eac59d3da14b2e6: Add missing recurse.mk change from bug 1077148 part 1 after a bad merge. r=gps
Mike Hommey <mh+mozilla@glandium.org> - Thu, 30 Oct 2014 13:51:01 +0900 - rev 213087
Push 9662 by cbook@mozilla.com at Thu, 30 Oct 2014 14:16:59 +0000
Add missing recurse.mk change from bug 1077148 part 1 after a bad merge. r=gps
55d15b285436576e1c5979f753e433c50fd9db3a: Bug 1077148 part 4 - Add and use new moz.build templates for Gecko programs and libraries. r=gps
Mike Hommey <mh+mozilla@glandium.org> - Thu, 30 Oct 2014 13:06:12 +0900 - rev 213086
Push 9662 by cbook@mozilla.com at Thu, 30 Oct 2014 14:16:59 +0000
Bug 1077148 part 4 - Add and use new moz.build templates for Gecko programs and libraries. r=gps There are, sadly, many combinations of linkage in use throughout the tree. The main differentiator, though, is between program/libraries related to Gecko or not. Kind of. Some need mozglue, some don't. Some need dependent linkage, some standalone. Anyways, these new templates remove the need to manually define the right dependencies against xpcomglue, nspr, mozalloc and mozglue in most cases. Places that build programs and were resetting MOZ_GLUE_PROGRAM_LDFLAGS or that build libraries and were resetting MOZ_GLUE_LDFLAGS can now just not use those Gecko-specific templates.
0a59d60cf8ad1dc911ae16be55b767cec0044ee4: Bug 1077148 part 3 - Do not link PrimitiveTest, SimpleTypeLib, TestAUSHelper, TestAUSReadStrings and screentopng against mozglue on Linux. r=gps
Mike Hommey <mh+mozilla@glandium.org> - Thu, 30 Oct 2014 13:06:04 +0900 - rev 213085
Push 9662 by cbook@mozilla.com at Thu, 30 Oct 2014 14:16:59 +0000
Bug 1077148 part 3 - Do not link PrimitiveTest, SimpleTypeLib, TestAUSHelper, TestAUSReadStrings and screentopng against mozglue on Linux. r=gps There is no reason these should be linked to mozglue on Linux only. This makes the intent clearer for the related changes in part 4.
a7b5bb9e867a583d01513acb8ca4431cc9acb3d1: Bug 1077148 part 2 - Remove hack to avoid sqlite being linked against mozglue on mac. r=gps
Mike Hommey <mh+mozilla@glandium.org> - Thu, 30 Oct 2014 13:05:56 +0900 - rev 213084
Push 9662 by cbook@mozilla.com at Thu, 30 Oct 2014 14:16:59 +0000
Bug 1077148 part 2 - Remove hack to avoid sqlite being linked against mozglue on mac. r=gps This hack has actually not been actively used since sqlite, nss and nspr are all folded together, because no shared library is actually linked in db/sqlite3/src.
7c2f1416473fc4c03f96299a68ba869de9467b48: Bug 1077148 part 1 - Define mozcrt in moz.build. r=gps
Mike Hommey <mh+mozilla@glandium.org> - Thu, 30 Oct 2014 13:05:50 +0900 - rev 213083
Push 9662 by cbook@mozilla.com at Thu, 30 Oct 2014 14:16:59 +0000
Bug 1077148 part 1 - Define mozcrt in moz.build. r=gps
ac0d7bf37abced5397e34e1f1a5ccc3413c0a115: Bug 1048044 - Use exponential growth when growing an nsTArray. r=froydnj.
Nicholas Nethercote <nnethercote@mozilla.com> - Wed, 29 Oct 2014 20:34:33 -0700 - rev 213082
Push 9662 by cbook@mozilla.com at Thu, 30 Oct 2014 14:16:59 +0000
Bug 1048044 - Use exponential growth when growing an nsTArray. r=froydnj.
b56b9aa70d22803fd0d9f8a68e043dc863c2efe3: Bug 997908 - crash in ReleaseSliceNow(unsigned int, void*) accessing memory at 0x5a5a5a5a5a5a5a5a, test patch. r=nfroyd
Steven Michaud <smichaud@pobox.com> - Wed, 29 Oct 2014 21:50:29 -0500 - rev 213081
Push 9662 by cbook@mozilla.com at Thu, 30 Oct 2014 14:16:59 +0000
Bug 997908 - crash in ReleaseSliceNow(unsigned int, void*) accessing memory at 0x5a5a5a5a5a5a5a5a, test patch. r=nfroyd
(0) -100000 -30000 -10000 -3000 -1000 -300 -100 -50 -20 +20 +50 +100 +300 +1000 +3000 +10000 +30000 +100000 tip