Commit Graph

5947 Commits

Author SHA1 Message Date
Ehsan Akhgari
9a7d9f5c82 Backed out 2 changesets (bug 1126301) on a CLOSED TREE because the test was apparently busted on some platforms
Backed out changeset 4aecd46afeb1 (bug 1126301)
Backed out changeset c61a87a20888 (bug 1126301)
2015-01-27 13:44:15 -05:00
Ehsan Akhgari
4cca8242d2 Bug 1126301 follow-up: Fix a signed/unsigned comparison fatal warning, landed on a CLOSED TREE 2015-01-27 12:56:15 -05:00
Daniel Holbert
083d2492c5 Bug 1125632 followup: Mark remaining CollectReports impls in nsMemoryReporterManager.cpp and SystemMemoryReporter.cpp as MOZ_OVERRIDE. 2015-01-27 09:48:54 -08:00
Ehsan Akhgari
d61bc0df78 Bug 1126301 - Move TestUTF.cpp to gtest and enable it; r=froydnj 2015-01-27 12:38:44 -05:00
Ehsan Akhgari
8fa1e0b040 Bug 1126295 - Move TestAtoms.cpp to gtest and enable it; r=froydnj 2015-01-27 09:28:45 -05:00
Nicholas Nethercote
de28f29126 Bug 1124920 - Remove PLDHashTable::Operate(). r=froydnj. 2015-01-22 15:43:18 -08:00
Ehsan Akhgari
9c2d9c76ee Bug 1125138 - Move TestTimeStamp.cpp to gtest and enable it; r=froydnj 2015-01-26 17:08:24 -05:00
Chris Peterson
4a6e98fe77 Bug 1125665 - Fix -Wunused-private-field warning in PLDHashTable and mark xpcom/glue as FAIL_ON_WARNINGS. r=froydnj 2015-01-25 00:25:13 -08:00
Chris Peterson
5942db3a6f Bug 1125693 - Fix -Wformat warning in xpcom/base/nsStackWalk.cpp and mark as FAIL_ON_WARNINGS. r=njn 2015-01-25 13:49:06 -08:00
Ehsan Akhgari
cd25a35594 Bug 1125559 - Move TestThreadPool.cpp to gtest and enable it; r=froydnj 2015-01-26 20:49:22 -05:00
Wes Kocher
cdb6b3adeb Backed out changeset 67496f44f461 (bug 1125138) for checktest failures 2015-01-26 16:14:06 -08:00
Wes Kocher
b893d4dece Backed out changeset 8ae4f78d7e25 (bug 1125559) for checktest orange 2015-01-26 15:18:50 -08:00
Ehsan Akhgari
d6019b0b5d Bug 1125559 - Move TestThreadPool.cpp to gtest and enable it; r=froydnj 2015-01-26 17:10:09 -05:00
Ehsan Akhgari
f97b0b0d4d Bug 1125138 - Move TestTimeStamp.cpp to gtest and enable it; r=froydnj 2015-01-26 17:08:24 -05:00
Xidorn Quan
6fe45e1a01 Bug 1124029 - Suppress different __unaligned qualifiers warnings. r=froydnj 2015-01-27 08:37:38 +11:00
Daniel Holbert
55ef519e1b Bug 1125632: Annotate ResidentUniqueReporter::CollectReports as MOZ_OVERRIDE. r=njn 2015-01-25 15:14:00 -08:00
Masatoshi Kimura
f1b5ace064 Bug 1111290 - Part 3: Remove TypedEnum.h and fold TypedEnumInternal.h into TypedEnumBits.h. r=waldo 2015-01-26 07:22:11 +09:00
Masatoshi Kimura
e4e75cdb99 Bug 1111290 - Part 2: Non-mechanical changes. r=waldo 2015-01-26 07:22:08 +09:00
Jim Mathies
1ca5a27151 Bug 1092525 - Enable e10s for Windows systems that activate accessibility through UIA. r=trev 2015-01-23 15:41:55 -06:00
Tom Schuster
55082c80f4 Bug 1125356 - Use JS_NewPlainObject in the browser. r=bz 2015-01-24 16:38:08 +01:00
Ehsan Akhgari
ec61b4f25e Bug 1125179 - Mark some functions generated by CC macros as override; r=mccr8 2015-01-23 14:27:18 -05:00
Ehsan Akhgari
c171b42c46 Remove TestTArray from the list of disabled XPCOM tests, because it's not disabled, no bug, DONTBUILD 2015-01-23 09:38:42 -05:00
Carsten "Tomcat" Book
bd64f16791 merge mozilla-inbound to mozilla-central a=merge 2015-01-22 14:30:51 +01:00
Geoff Lankow
5f61d9e5c4 Bug 675372 - Allow resource protocol mappings in chrome.manifest files of bootstrapped add-ons; r=Unfocused 2015-01-22 20:00:13 +13:00
Ehsan Akhgari
821fca39c5 Bug 1124048 - Move TestStorageStream.cpp to gtest and enable it; r=froydnj 2015-01-21 11:29:20 -05:00
Ehsan Akhgari
ebf95a51c9 Bug 1124047 - Move TestPriorityQueue.cpp to gtest and enable it; r=froydnj 2015-01-21 11:25:34 -05:00
Ehsan Akhgari
82bb821bec Bug 1124041 - Move TestPipes.cpp to gtest and enable it; r=froydnj 2015-01-21 11:21:10 -05:00
Masatoshi Kimura
858165fd65 Bug 895582 - Get rid of MOZ_ENUM_TYPE. r=waldo 2015-01-21 22:35:19 +09:00
Jim Mathies
59cbaafdf9 Bug 1121970 - Debug output from printf_stderr gets clipped on Windows. r=nfroyd 2015-01-20 08:18:26 -06:00
Ehsan Akhgari
ec2177209a Bug 1123007 - Mark ReadSegmentsClosure as stack class, and its mRealInputStream member as nsCOMPtr; r=froydnj 2015-01-21 22:42:39 -05:00
Ehsan Akhgari
c87c791341 Bug 1123014 - Mark the nsWriteSegmentThunk as stack class, and its mStream member as nsCOMPtr; r=froydnj 2015-01-21 22:42:39 -05:00
Ehsan Akhgari
6007c6bc1a Bug 1123004 - Mark ReadSegmentsState as stack class, and its mThisStream member as nsCOMPtr; r=froydnj 2015-01-21 22:42:38 -05:00
Ehsan Akhgari
28e46d3358 Bug 1124058 - Move TestSynchronization.cpp to gtest and enable it; r=froydnj 2015-01-21 22:42:38 -05:00
Andrew McCreight
0ee1ed1266 Bug 1120495 - Don't assert if FinishAnyCurrentCollection reenters during CleanupPhase. r=smaug 2015-01-21 14:35:54 -08:00
Nicholas Nethercote
dec413ab8f Bug 1123533 - Clarify thread handling in NS_StackWalk() on Windows. r=ehsan.
- The way NS_StackWalk() sets up |targetThread| and |data.walkCallingThread| is
  hard to read.

- The name |shouldBeThreadSafe| is unclear -- for a long time I thought it
  meant "we are thread-safe, so we can print" and I thought it was named
  incorrectly. But now I see it actually means the opposite, i.e. "we need to
  be thread-safe, so we can't print". So |needToBeThreadSafe| would be
  clearer...

- ...but |shouldBeThreadSafe| shouldn't be used anyway, because
  |data.walkCallingThread| is better -- it correctly handles the case where
  |aThread| is the current thread -- and it's what WalkStackMain64() uses.

This patch fixes these problems.
2015-01-19 19:19:55 -08:00
Nicholas Nethercote
e2842aa5dd Bug 1123151 (part 3) - Make PLDHashTable::ops private. r=froydnj.
This required adding a getter and a setter, but they're used sparingly.
2015-01-19 16:34:44 -08:00
Nicholas Nethercote
9a918a72c0 Bug 1123151 (part 2) - Add PLDHashTable::IsInitialized(). r=froydnj.
This encapsulates most of the uses of PLDHashTable::ops.
2015-01-19 16:11:34 -08:00
Nicholas Nethercote
fa52a2c4c9 Bug 1123151 (part 1) - Set PLDHashTable::ops consistently. r=froydnj.
Currently the setting of PLDHashTable::ops is very haphazard.

- PLDHashTable has no constructor, so it's not auto-nulled, so lots of places
  null it themselves.

- In the fallible PLDHashTable::Init() function, if the entry storage
  allocation fails we'll be left with a table that has |ops| set -- indicating
  it's been initialized -- but has null entry storage. I'm not certain this can
  cause problems but it feels unsafe, and some (but not all) callers of Init()
  null it on failure.

- PLDHashTable does not null |ops| in Finish(), so some (but not all) callers
  do this themselves.

This patch makes things simpler.

- It adds a constructor that zeroes |ops|.

- It modifies Init() so that it only sets |ops| once success is ensured.

- It zeroes |ops| in Finish().

- Finally, it removes all the now-unnecessary |ops| nulling done by the users
  of PLDHashTable.
2015-01-19 16:01:24 -08:00
Trevor Saunders
6fea45f1df bug 1122100 - more MOZ_OVERRIDE in xpcomish stuff r=froydnj 2015-01-19 17:41:12 -05:00
Ehsan Akhgari
119b14688c Bug 1123121 - Mark all nsCOMPtr_helper classes as stack class; r=froydnj 2015-01-19 12:39:36 -05:00
Ehsan Akhgari
0bce91f637 Bug 1123009 - Make nsAppDirectoryEnumerator::mProvider an nsCOMPtr; r=froydnj 2015-01-19 12:38:17 -05:00
Ehsan Akhgari
08289bd4ea Bug 1123006 - Mark FileData as stack class, and its data member as nsCOMPtr; r=froydnj 2015-01-19 12:37:48 -05:00
Ehsan Akhgari
172f84065d Bug 1123003 - Clarify the ownership of xptiInterfaceInfo pointers in xptiprivate.h; r=froydnj 2015-01-19 12:37:07 -05:00
Ehsan Akhgari
c52a99844e Bug 1123000 - Mark nsDiscriminatedUnion::mInterfaceValue as owning; r=froydnj 2015-01-19 10:00:33 -05:00
Ehsan Akhgari
e07a95ff50 Bug 1122999 - Mark the fOuter member defined by NS_DECL_AGGREGATED as unsafe; r=froydnj 2015-01-19 10:00:32 -05:00
Ehsan Akhgari
7ee30f8c4e Bug 1122991 - Mark findIndexOfClosure as stack class, and make its targetElement member a void*; r=froydnj 2015-01-19 10:00:32 -05:00
Ehsan Akhgari
926475ec11 Bug 1122990 - Mark nsPropertiesParser as stack class, and make its mProps member a strong ref; r=froydnj 2015-01-19 10:00:31 -05:00
Ehsan Akhgari
fd4e6e3af2 Bug 1123109 - Mark nsStaticAtom::mStringBuffer as non-owning; r=froydnj 2015-01-19 09:05:44 -05:00
Ehsan Akhgari
ea43e27d6e Bug 1123098 - Mark two members of nsCOMPtr_helper classes as non-owning; r=froydnj 2015-01-19 09:04:27 -05:00
Ehsan Akhgari
b5b8995596 Bug 1122996 - Convert nsSupportsArrayEnumerator::mArray into an nsCOMPtr; r=froydnj 2015-01-19 09:03:56 -05:00
Ehsan Akhgari
5cb40897c6 Bug 1122995 - Clarify the lifetime rules applying to the permanent and non-permanent nsIATOM* members in nsAtomTable.cpp; r=froydnj 2015-01-19 09:03:10 -05:00
Ehsan Akhgari
91a5fce82f Bug 1122986 - Mark nsQueryElementAt::mCollection as non-owning; r=froydnj 2015-01-19 09:00:25 -05:00
Ehsan Akhgari
33c16dc39d Bug 1122989 - Remove nsIPersistentProperties::Subclass(); r=froydnj
This method is unused, and more importantly it causes us to store an
unsafe reference in nsPersistentProperties.  It's best to remove it.
2015-01-19 08:59:01 -05:00
Christoph Kerschbaumer
6a281b98c4 Bug 1119006 - Remove files where code is still calling removed NS_OpenURI API (r=mcmanus) 2015-01-14 11:52:57 -08:00
Ehsan Akhgari
b324a67bec Bug 1123110 - Clarify the ownership of several cycle collector members; r=mccr8 2015-01-18 18:43:02 -05:00
Valentin Gosu
945abc4b56 Bug 1121826 - backout cc192030c28f - brackets shouldn't be automatically escaped in the Query r=mcmanus 2015-01-17 16:13:21 +02:00
Cameron McCormack
541e8b4807 Bug 1120047 - Fix glibc version check guards for and importing of __libc_stack_end. r=glandium 2015-01-17 15:02:01 +11:00
Bill McCloskey
60abd81765 Bug 1122303 - nsIProcess::Run needs to handle EINTR on Mac (r=nfroyd) 2015-01-16 09:57:33 -08:00
Michael Pruett
f5ee9d3e09 Bug 1121202 - Add Lookup, Add, and Remove methods to PLDHashTable. r=njn 2015-01-15 18:01:28 -06:00
Michael Pruett
51d5297a9e Bug 1121202 - Remove unused PL_DHashTableOperate function. r=njn 2015-01-15 18:01:07 -06:00
Makoto Kato
4ae533255e Bug 1121829 - Support redirection of kernel32.dll for hooking function. r=dmajor 2015-01-16 23:07:09 +09:00
Nicholas Nethercote
722df8bd3e Bug 1121830 - DMD: add "num" property to blocks in the output. r=mccr8.
The new "num" property lets identical blocks be aggregated in the output. This
patch only uses the "num" property for dead blocks, because that's where the
greatest potential benefit lies, but it could be used for live blocks as well.

On one test case (a complex PDF file) running with --mode=cumulative
--sample-below=1 this patch had the following effects.

- Change in running speed was negligible.

- Compressed output file size dropped from 8.8 to 5.0 MB.

- Compressed output file size dropped from 297 to 50 MB.

- dmd.py runtime (without stack fixing) dropped from 30 to 8 seconds.
2015-01-15 20:38:38 -08:00
Nicholas Nethercote
2a704401e7 Bug 1122337 - Mark DMD directories as FAIL_ON_WARNINGS. r=glandium.
The DEFINES and XPCOM_API changes are needed to get rid of "inconsistent dll
linkage" warnings on Windows builds.
2015-01-15 21:17:18 -08:00
Birunthan Mohanathas
6b6fa7746b Bug 1060696 - Remove nsISupportsObsolete.h. r=froydnj 2015-01-16 07:34:51 +02:00
Birunthan Mohanathas
a2efd69daa Bug 1060696 - Remove NS_INIT_ISUPPORTS. r=froydnj 2015-01-16 07:34:46 +02:00
Birunthan Mohanathas
40a4226a22 Bug 1121451 - Fix 'truncation of constant value' warnings in nsINIParser.cpp. r=froydnj 2015-01-16 07:34:42 +02:00
Trevor Saunders
d4606517a6 bug 1077549 - remove useless gcc version checks r=glandium 2015-01-15 21:30:05 -05:00
Nicholas Nethercote
14f46aac14 Bug 1121304 (part 2, attempt 2) - Remove PLDHashTableOps::{alloc,free}Table. r=froydnj. 2015-01-14 14:35:56 -08:00
Nicholas Nethercote
17b55c0b9e Bug 1121304 (part 1, attempt 2) - Minor type clean-ups for PLDHashTable. r=froydnj. 2015-01-14 14:35:45 -08:00
Boris Zbarsky
8eef128a54 Bug 1107953 part 5. Add tests for promise rejections with content-side DOMExceptions, and fix the promise code so those tests actually pass. r=bholley 2015-01-15 17:39:02 -05:00
Daniel Stenberg
1515334cca Bug 1008091 - send network change events on FxOS and Linux, r=sworkman 2015-01-15 00:22:00 +01:00
Phil Ringnalda
cb85f01b15 Backed out 2 changesets (bug 1121304) for consistent b2g hangs in webgl-color-test.html?frame=1&__&preserve&premult&_____
Backed out changeset 20651ac19549 (bug 1121304)
Backed out changeset 758afec77c95 (bug 1121304)
2015-01-14 22:02:23 -08:00
Nicholas Nethercote
60d7115c86 Bug 1121304 (part 2) - Remove PLDHashTableOps::{alloc,free}Table. r=froydnj. 2015-01-14 14:35:56 -08:00
Nicholas Nethercote
08af04376d Bug 1121304 (part 1) - Minor type clean-ups for PLDHashTable. r=froydnj. 2015-01-14 14:35:45 -08:00
Nicholas Nethercote
c4c1173204 Bug 1120476 (part 4) - Remove PLDHashTableOps::finalize. r=froydnj. 2015-01-13 19:02:35 -08:00
Nicholas Nethercote
7c92773a6f Bug 1120476 (part 3) - Remove PLDHashTable::data. r=froydnj. 2015-01-13 16:42:13 -08:00
Brian Smith
64e6633bea Bug 1119776, Part 7: Avoid defining snprintf when MSVC provides it (other), r=bsmedberg 2015-01-08 22:35:33 -08:00
Ehsan Akhgari
87a2a45002 Bug 1097452 - Use fallible allocation when setting the value of an <input> or <textarea> element; r=jst,froydnj
This patch handles most of the call sites for these allocations except
for a few where I added TODO comments with some information.  Handling
those places may require reworking lots of code, so I prefer to not do
that here.
2015-01-14 17:31:41 -05:00
Wes Kocher
f0933564ba Merge m-c to fx-team a=merge 2015-01-13 17:47:46 -08:00
Brad Lassey
11f4beb187 bug 1096718 - - display time measured spent in each compartment r=billm,mossop 2015-01-13 17:38:05 -08:00
Mats Palmgren
68aa3fcdaa Bug 1120198 part 1 - Introduce nsTHashtable::SwapElements for a fast way to swap the elements of two hashtables. r=nfroyd 2015-01-13 14:44:33 +00:00
Birunthan Mohanathas
e56d4684a9 Bug 1115061 - Ignore calls to BackgroundHangMonitor::Notify{Activity,Wait} when Telemetry is disabled. r=froydnj 2015-01-13 06:41:15 +02:00
ffxbld
5e7f48cfda Update configs. IGNORE BROKEN CHANGESETS CLOSED TREE NO BUG a=release ba=release 2015-01-12 15:33:37 -05:00
Masatoshi Kimura
40a556102e Bug 1120062 - Part 1: Remove most Nullptr.h includes. r=waldo 2015-01-11 11:34:52 +09:00
Jim Chen
440aa2410a Bug 1113416 - Don't read stack labels inside hang monitor sighandler; r=nfroyd r=snorp
When we're inside the hang monitor's signal handler, we must not read any string labels. Doing so may result in on-demand decompression kicking in on Android, which may result in a deadlock.
2015-01-10 12:41:48 -05:00
Chris Peterson
90751d5a6c Bug 1118076 - Remove MOZ_THIS_IN_INITIALIZER_LIST. r=Waldo 2015-01-06 21:39:46 -08:00
Jim Chen
67f8ab8931 Bug 1116589 - Use templated JNI classes in generated bindings; r=snorp 2015-01-09 19:33:57 -05:00
James Willcox
1241cd7cc4 bug 1118552 - fix gcc4.9 warnings on Android r=glandium 2015-01-06 22:20:46 -05:00
Andrew McCreight
10f5c09ecf Bug 1119449 - Disable unified compilation of nsStackWalk.cpp to avoid OSX issue. r=ehsan 2015-01-09 12:41:50 -08:00
Ryan VanderMeulen
3eeaeacf04 Backed out changeset c358e102e573 (bug 1008091) for B2G mochitest failures.
CLOSED TREE
2015-01-09 11:54:14 -05:00
Daniel Stenberg
dbb7778c54 Bug 1008091 - Send network change events on FxOS and Linux. r=sworkman 2015-01-07 03:20:00 -05:00
Nicholas Nethercote
2f938c3364 Bug 1088343 (part 1) - Get NS_StackWalk working on Win64. r=aklotz.
--HG--
extra : rebase_source : 9b8262bba126a98b2c5007ee8e149f92e702f5a7
2015-01-08 16:00:07 -08:00
Nicholas Nethercote
499db03f01 Bug 1088343 (part 0) - Clean up the windows implementation of NS_StackWalk a little. r=ehsan.
--HG--
extra : rebase_source : fb31dbf446f5485e5aea6b22687e32ff595efb0b
2015-01-08 15:13:21 -08:00
Ehsan Akhgari
bd52bd3f4e Bug 1118486 - Part 1: Use = delete instead of MOZ_DELETE directly; r=Waldo
Most of this patch (with the exception of dom/bindings/Codegen.py) was
generated by the following bash script:

#!/bin/bash

function convert() {
echo "Converting $1 to $2..."
find . ! -wholename "*nsprpub*" \
       ! -wholename "*security/nss*" \
       ! -wholename "*/.hg*" \
       ! -wholename "*/.git*" \
       ! -wholename "obj-*" \
         -type f \
      \( -iname "*.cpp" \
         -o -iname "*.h" \
         -o -iname "*.cc" \
         -o -iname "*.idl" \
         -o -iname "*.ipdl" \
         -o -iname "*.ipdlh" \
         -o -iname "*.mm" \) | \
    xargs -n 1 sed -i -e "s/\b$1\b/$2/g"
}

convert MOZ_DELETE '= delete'
2015-01-08 23:19:05 -05:00
Andrew McCreight
f6a1ac6cf6 Bug 1118044, part 2 - Use GCCellPtr in NoteJSChild. r=smaug,terrence
Also, strongly type the JS_TraceShapeCycleCollectorChildren function, and add an
isShape() method to GCCellPtr.
2015-01-08 15:30:54 -08:00
Andrew McCreight
31ea288130 Bug 1118044, part 1 - Use GCCellPtr in CycleCollectedJSRuntime::TraverseGCThing. r=smaug 2015-01-08 15:30:54 -08:00
Andrew McCreight
d31cf20502 Backout bug 1052793 for exposing bad decommitting behavior for compartmental GCs. 2015-01-08 09:54:13 -08:00
Ehsan Akhgari
f187581528 Bug 1119254 - Mark virtual overridden functions as MOZ_OVERRIDE in xpcom; r=froydnj 2015-01-08 10:58:39 -05:00
Jon Coppeard
08177bbaf7 Bug 1099152 - Make external GC APIs take invocation kind as a parameter r=terrence r=mccr8 2015-01-02 17:19:43 +00:00
Nicholas Nethercote
b7b5e21cfd Bug 1014341 (part 1) - Remove trace-malloc. r=dbaron,glandium.
--HG--
extra : rebase_source : 771710c5427141d738eef112fab00951eb8e20e3
2015-01-07 16:13:03 -08:00
Michael Pruett
5a6ab9e26e Bug 1118024 - Add explicit PL_DHashTable{Add,Lookup,Remove} functions. r=nfroyd 2015-01-05 20:26:50 -06:00
Ehsan Akhgari
0d93bb1ca7 Bug 1116906 - Move AlreadyAddRefed.h to MFBT; r=froydnj 2015-01-07 11:51:29 -05:00
Ehsan Akhgari
3799d571b8 Bug 1114999 - Part 2: Apply MOZ_NO_ADDREF_RELEASE_ON_RETURN to all smart pointer arrow operators that can return refcounted objects; r=jrmuizel 2015-01-06 16:30:03 -05:00
Ms2ger
cb19ee71a1 Bug 1117068 - Part c: Remove NEED_CPP_UNUSED_IMPLEMENTATIONS; r=mshal
It is only used in one place, and that place is better off with MOZ_DELETE.
2015-01-05 19:18:58 +01:00
Nathan Froyd
aae92d5647 Bug 1117853 - remove duplicate mozilla/Attributes.h #include; r=bsmedberg 2014-01-22 18:37:02 -05:00
Ryan VanderMeulen
8403565003 Backed out 5 changesets (bug 1099152, bug 1117098) for causing frequent B2G debug timeouts.
Backed out changeset 4feee07c34ad (bug 1117098)
Backed out changeset 168e5b9bf198 (bug 1099152)
Backed out changeset 9192d432d87e (bug 1099152)
Backed out changeset 8b891ebcd21f (bug 1099152)
Backed out changeset 24dae3ce853d (bug 1099152)
2015-01-05 12:38:18 -05:00
Ehsan Akhgari
213d9b2833 Bug 1117211 - Move the XPCOM gtests temporarily placed in xpcom/glue/tests/gtest into xpcom/test/gtest now that it exists; r=froydnj 2015-01-05 11:30:36 -05:00
Ehsan Akhgari
61fc99a4ee Bug 1117035 - Mark virtual overridden functions as MOZ_OVERRIDE in XPCOM; r=froydnj 2015-01-05 11:25:41 -05:00
Ehsan Akhgari
6b74d74acf Bug 1112970 - Increase the slack value for TestExpirationTracker to 30ms; r=froydnj 2015-01-05 11:25:18 -05:00
Jon Coppeard
736a661763 Bug 1099152 - Make external GC APIs take invocation kind as a parameter r=terrence r=mccr8 2015-01-02 17:19:43 +00:00
Wes Kocher
df0c0b39cc Backed out 5 changesets (bug 1099152) for hazard build failures on a CLOSED TREE
Backed out changeset 3d195c54dcf1 (bug 1099152)
Backed out changeset e5a903979b5f (bug 1099152)
Backed out changeset 969965f4c893 (bug 1099152)
Backed out changeset 1e4e3b85c620 (bug 1099152)
Backed out changeset 501a22044336 (bug 1099152)
2015-01-02 12:43:48 -08:00
Jon Coppeard
a39711ea1b Bug 1099152 - Make external GC APIs take invocation kind as a parameter r=terrence r=mccr8 2015-01-02 17:19:43 +00:00
Aaron Klotz
d1f86d063e Bug 1100360: Convert ChromeHang annotations to use UniquePtr; r=vladan
--HG--
extra : rebase_source : 5c2ae8645b927c4d73a649beb573cfe2e242c146
2014-12-30 14:52:39 -07:00
Aaron Klotz
d288822794 Bug 998863: Asynchronous Plugin Initialization, Part 2: dom/plugins/base changes; r=johns,josh 2014-12-29 16:12:40 -07:00
Christoph Kerschbaumer
d8823fbc59 Bug 1093948: Make JS callers of ios.newChannel call ios.newChannel2 in xpcom/ (r=bsmedberg) 2014-12-29 12:37:15 -08:00
Phil Ringnalda
7deecb5272 Backed out 15 changesets (bug 1070755, bug 998863) for e10s bustage
CLOSED TREE

Backed out changeset 076d1d47d601 (bug 1070755)
Backed out changeset 43819af59ca5 (bug 998863)
Backed out changeset 5f587697ae63 (bug 998863)
Backed out changeset e2cf239e8572 (bug 998863)
Backed out changeset fe21b6b789ce (bug 998863)
Backed out changeset 404f59f86edc (bug 998863)
Backed out changeset 5dd57abaf2b0 (bug 998863)
Backed out changeset 6c1f006a03bc (bug 998863)
Backed out changeset 9e69875e3667 (bug 998863)
Backed out changeset c6b68f8f72ba (bug 998863)
Backed out changeset 713799a7afe4 (bug 998863)
Backed out changeset 4244d662787c (bug 998863)
Backed out changeset ba058cc7a1b2 (bug 998863)
Backed out changeset dabc69b0b09a (bug 998863)
Backed out changeset 18dad6d2e7cc (bug 998863)
2014-12-24 18:28:45 -08:00
Aaron Klotz
5d13dfd942 Bug 998863: Asynchronous Plugin Initialization, Part 2: dom/plugins/base changes; r=johns,josh 2014-12-24 17:55:58 -07:00
Makoto Kato
577eca4d10 Bug 1112709 - CreateFileW isn't hooking properly on Windows 8/8.1. r=ehsan 2014-12-24 13:23:36 +09:00
Ehsan Akhgari
c9b06aba01 Bug 1114880 follow-up: Rename MOZ_{STRONG,WEAK}_REF to MOZ_{OWNING,NON_OWNING}_REF
--HG--
extra : rebase_source : 51fff0785d112b5b87be3c6ff723c8986b37effe
2014-12-23 21:17:50 -05:00
Ehsan Akhgari
cf06298144 Bug 1114983 - Use nsCOMPtr in nsRunnableMethodReceiver; r=froydnj
--HG--
extra : rebase_source : 4094a49ac67c76f789b685d59fcf3f27c7c304df
2014-12-23 17:30:55 -05:00
Ehsan Akhgari
935e58219e Bug 1114985 - Use nsCOMPtr in nsSingletonEnumerator; r=froydnj
--HG--
extra : rebase_source : b8c8687f663fe5d914bf4bb0b0228e37560aff43
2014-12-23 17:30:14 -05:00
Ehsan Akhgari
4f727bfed1 Bug 1114880 - Annotate some strong and weak references in XPCOM; r=froydnj
--HG--
extra : rebase_source : 3af3de656b98c8f41ed0330f205f9958a384c30c
2014-12-23 17:27:48 -05:00
Ehsan Akhgari
e66c428356 Bug 773014 - Part 2: Mark Static{Auto,Ref}Ptr as global-only; r=jrmuizel 2014-12-22 18:10:44 -05:00
Landry Breuil
9a33fb6dd8 Bug 1113374 followup: test for equality against 'GNU' instead of against a single-entry tuple r=froydnj 2014-12-22 21:45:41 +01:00
Thomas Klausner
1949151187 Bug 1113374 : like done in bug 971897, use xpct{stubs,invoke}_x86_64 from linux/unix on NetBSD/amd64 r=froydnj 2014-12-22 21:16:48 +01:00
Andrew McCreight
632b5ede2e Bug 1109928, part 6 - Define CCGraphBuilder::SetFirstChild() for consistency. r=smaug 2014-12-20 13:35:24 -05:00
Andrew McCreight
a75ff10780 Bug 1109928, part 5 - Inline CCGraphBuilder::DescribeNode because it is silly. r=smaug 2014-12-20 13:35:24 -05:00
Andrew McCreight
289285a48c Bug 1109928, part 4 - Make CCBuilder::AddNode private by adding a new AddPurpleRoot method. r=smaug 2014-12-20 13:35:23 -05:00
Andrew McCreight
9028bbbdf2 Bug 1109928, part 3 - Make CCGraphBuilder::AddWeakMapNode and ::NoteJSChild methods private. r=smaug 2014-12-20 13:35:23 -05:00
Andrew McCreight
13265f3a6d Bug 1109928, part 2 - Inline some CCGraphBuilder methods now that the builder is doing the building. r=smaug
Also, make SetLastChild a private method defined in the class declaration.
2014-12-20 13:35:23 -05:00
Andrew McCreight
274db87c84 Bug 1109928, part 1 - Move graph building inside CCGraphBuilder. r=smaug
This lets us hide a lot of the internal state of graph building from other classes.
2014-12-20 13:35:23 -05:00
Ehsan Akhgari
944ed0fbf5 Bug 1113005 - Copy only the necessary number of bytes from the source buffer; r=froydnj
--HG--
extra : amend_source : 2367a3ad35a599790fc333e35e1b9272653463a1
2014-12-20 10:25:02 -05:00
Steven Michaud
899d9ab9f9 Bug 997908 - crash in ReleaseSliceNow(unsigned int, void*) accessing memory at 0x5a5a5a5a5a5a5a5a, another test patch. r=continuation 2014-12-19 17:26:13 -06:00
Chih-Kai (Patrick) Wang
4ee772690e Bug 970307: Part 1: Report status of each thread to find when all the threads are idle. r=nfroyd 2014-12-18 17:00:39 +08:00
Chris Peterson
e56f788c56 Bug 1110031 - Part 1: Mark more directories as FAIL_ON_WARNINGS. r=gps 2014-12-10 22:56:31 -08:00
Jim Chen
02fe0889b7 Bug 1109291 - Include better paths for hanging chrome scripts in profile extensions directory; r=snorp r=bsmedberg
--HG--
extra : amend_source : 82f1911bd294cc38076bf2bea2113b9e58e4bcc5
2014-12-16 17:09:17 -05:00
Terrence Cole
93097b7e72 Bug 1105069 - Part 21: Remove AsCell in preference of GCCellPtr; r=jonco, r=mccr8
--HG--
extra : rebase_source : 5c4470f3efbd9dbe3caee08ed88b07da549912e0
2014-12-14 08:27:52 -08:00
Terrence Cole
d43eafbed3 Bug 1105069 - Part 17: Convert xpc_IsGrayGCThing to GCCellPtr; r=mccr8, j=jonco
--HG--
extra : rebase_source : 9fdc5ac9ca8de9c12a399532db7e77bc34abb7da
2014-12-05 09:38:34 -08:00
Terrence Cole
e94f0aec36 Bug 1105069 - Part 15: Convert xpc_GCThingIsGrayCCThing to GCCellPtr; r=mccr8, r=jonco
--HG--
extra : rebase_source : 096b8eaf5b46afc1c40b0b9e8b233ec13c638c85
2014-12-09 16:22:51 -08:00
Terrence Cole
fdf40725d5 Bug 1105069 - Part 14: Convert NoteJSChild to GCCellPtr; r=mccr8, r=jonco
--HG--
extra : rebase_source : 2338e0a57779401f9bc4744bc2fa59a4b31d76bf
2014-12-05 09:38:34 -08:00
Ehsan Akhgari
8c71aed1e0 Bug 1111224 - Move TestExpirationTracker.cpp to gtest and enable it; r=froydnj
--HG--
rename : xpcom/tests/TestExpirationTracker.cpp => xpcom/glue/tests/gtest/TestExpirationTracker.cpp
extra : rebase_source : 3961e36029257b2e923fe6597aadf684f93fcc41
2014-12-15 15:43:22 -05:00
Carsten "Tomcat" Book
32ca8e0e81 merge b2g-inbound to mozilla-central a=merge 2014-12-16 12:54:14 +01:00
Wes Kocher
aa564b4488 Backed out changeset c6287220baaf (bug 1111224) for Windows build bustage on a CLOSED TREE
--HG--
rename : xpcom/glue/tests/gtest/TestExpirationTracker.cpp => xpcom/tests/TestExpirationTracker.cpp
2014-12-15 14:55:09 -08:00
Ehsan Akhgari
21c5ccfd08 Bug 1111224 - Move TestExpirationTracker.cpp to gtest and enable it; r=froydnj
--HG--
rename : xpcom/tests/TestExpirationTracker.cpp => xpcom/glue/tests/gtest/TestExpirationTracker.cpp
extra : rebase_source : 6c7ef5eccec61e97aef7e85195c01b11b8ff2f91
2014-12-15 15:43:22 -05:00
Ehsan Akhgari
89279ec607 Bug 1111152 - Move TestEncoding.cpp to gtest and enable it; r=froydnj
--HG--
rename : xpcom/tests/TestEncoding.cpp => xpcom/glue/tests/gtest/TestEncoding.cpp
extra : rebase_source : 4beccae061390e7b4dd6ba45113daea43865c63d
2014-12-15 15:42:41 -05:00
Ehsan Akhgari
7a8c5fecc7 Bug 1111151 - Move TestCRT.cpp to gtest and enable it; r=froydnj
--HG--
rename : xpcom/tests/TestCRT.cpp => xpcom/glue/tests/gtest/TestCRT.cpp
extra : rebase_source : 95297289071d49a160cfd79a609ba81d3aaf994c
2014-12-15 15:41:37 -05:00
Ehsan Akhgari
0287e573b6 Bug 1111149 - Move TestArray.cpp to gtest and enable it; r=froydnj
--HG--
rename : xpcom/tests/TestArray.cpp => xpcom/glue/tests/gtest/TestArray.cpp
extra : rebase_source : 204c2aa966c3df9949efa182e865de404256f386
2014-12-15 15:39:28 -05:00
Kartikaya Gupta
86dc212385 Bug 1111407 - Allow sending a copy of all stderr to a file to get around logcat overflow. r=ehsan 2014-12-15 15:00:56 -05:00
Andrew McCreight
87c4bbdc6b Bug 1052793 - Do per-zone GC for CC_WAITING triggers. r=smaug 2014-12-13 21:17:35 -08:00
Ehsan Akhgari
57666729b5 Bug 1109746 - Fix more bad implicit constructors in some random code across the tree
--HG--
extra : amend_source : 48ca151cb1ca2193404c65831556051c02093914
2014-12-13 14:17:04 -05:00
Ms2ger
8462adc27e Bug 1111190 - Fix sign-compare warnings in CollectIonReports; r=froydnj
We only use kNumFields to compare it to the result of int sscanf(...).
2014-12-13 14:46:03 +01:00
Botond Ballo
79bcb7c0d7 Bug 1073081 - Fix -Waddress warnings about Nuwa functions. r=khuey
--HG--
extra : source : 8cd5108862aaf2c579a76ac6e9c08eb69fa5f3ff
2014-11-26 19:20:03 -05:00
Ehsan Akhgari
09a3807915 Bug 1110956 follow-up: Fix a build bustage on non-unified builds 2014-12-12 22:11:23 -05:00
Ehsan Akhgari
ced5ebbec3 Bug 1110956 follow-up: Use EXPECT macros instead of ASSERT 2014-12-12 21:52:22 -05:00
Ehsan Akhgari
7fb49d9a87 Bug 1110956 - Port TestStrings.cpp to gtest and enable it; r=froydnj
--HG--
rename : xpcom/tests/TestStrings.cpp => xpcom/glue/tests/gtest/TestStrings.cpp
extra : rebase_source : 07362a75215f15211a6ef9989a555dff5a7b5a23
2014-12-12 19:05:10 -05:00
Ehsan Akhgari
1576e9507a Bug 1101337 - Make the ReplaceSubstring() XPCOM string API linear; r=froydnj
ReplaceSubstring() is an O(n*m) algorithm (n being the length of the
string and m being the number of occurrences of aTarget) because we have
to move the remainder of the string, search it again and potentially
memmove most of it again as we find more matches.  This patch rewrites
that function to make it O(n+m).

Note that we currently don't build TestStrings.cpp, so the test case in
this patch is not run automatically, but the test case has been verified
to pass separately by moving the test function into Gecko and calling it
during startup and stepping through it in the debugger.

--HG--
extra : rebase_source : b020e17c1973330b0dbbd6bf956c073cfdcb775e
2014-12-12 18:57:09 -05:00
Wes Kocher
8d1fd679eb Backed out changeset 95377313608b (bug 1101337) for linux debug build bustage 2014-12-12 16:34:43 -08:00
Wes Kocher
fee70237b1 Backed out changeset d468b88bdb23 (bug 1110956)
--HG--
rename : xpcom/glue/tests/gtest/TestStrings.cpp => xpcom/tests/TestStrings.cpp
2014-12-12 16:34:21 -08:00
Wes Kocher
47e1ed5fc1 Backed out changeset 71378a872c99 (bug 1110956) 2014-12-12 16:33:57 -08:00
Ehsan Akhgari
a3407ff4aa Bug 1110956 follow-up: Actually re-enable the test that was commented out 2014-12-12 19:10:48 -05:00
Ehsan Akhgari
31dec06c70 Bug 1110956 - Port TestStrings.cpp to gtest and enable it; r=froydnj
--HG--
rename : xpcom/tests/TestStrings.cpp => xpcom/glue/tests/gtest/TestStrings.cpp
2014-12-12 19:05:10 -05:00
Ehsan Akhgari
4e1fe285c4 Bug 1101337 - Make the ReplaceSubstring() XPCOM string API linear; r=froydnj
ReplaceSubstring() is an O(n*m) algorithm (n being the length of the
string and m being the number of occurrences of aTarget) because we have
to move the remainder of the string, search it again and potentially
memmove most of it again as we find more matches.  This patch rewrites
that function to make it O(n+m).

Note that we currently don't build TestStrings.cpp, so the test case in
this patch is not run automatically, but the test case has been verified
to pass separately by moving the test function into Gecko and calling it
during startup and stepping through it in the debugger.
2014-12-12 18:57:09 -05:00
Ben Kelly
d60f59e183 Bug 1098004 Follow-up to fix non-unified bustage. r=me 2014-12-12 16:57:23 -05:00
Andrew McCreight
c682ddc471 Bug 1097850 - ChildFinder::NoteNativeChild() should call CanSkip(). r=smaug 2014-12-12 13:42:21 -08:00
Andrew McCreight
4402e15738 Bug 1110243 - CCGraphBuilder::NoteNativeChild should call CanSkipThis(). r=smaug 2014-12-12 13:42:21 -08:00
Shih-Chiang Chien
1e29b21379 Bug 1102439 - Clean up child-side PBackground before thread shutdown. r=khuey
--HG--
extra : transplant_source : %29r%7D%0CP%9F%D6%20%8B%A9%EA%EE%7D%AC%BB%80%1AB%D86
2014-11-20 14:16:36 -08:00
Ben Kelly
4bb128c79d Bug 1098004 Implement snappy compression framing protocol as nsI(Input|Output)Streams. r=froydnj 2014-12-12 14:12:27 -05:00
Ehsan Akhgari
8e62eb9e34 Backed out 2 changesets (bug 1101337) because of ASAN bustage landed on a CLOSED TREE
Backed out changeset ffef93ec94aa (bug 1101337)
Backed out changeset 2954a37bc2df (bug 1101337)
2014-12-12 13:04:44 -05:00
Ehsan Akhgari
a0c7fa1cfd Bug 1101337 follow-up: Move the Segment class to nsTString_CharT in order to satisfy older gcc's used on b2g, landed on a CLOSED TREE to fix build bustage 2014-12-12 12:43:04 -05:00
Ehsan Akhgari
95f33c8aea Bug 1101337 - Make the ReplaceSubstring() XPCOM string API linear; r=froydnj
ReplaceSubstring() is an O(n*m) algorithm (n being the length of the
string and m being the number of occurrences of aTarget) because we have
to move the remainder of the string, search it again and potentially
memmove most of it again as we find more matches.  This patch rewrites
that function to make it O(n+m).

Note that we currently don't build TestStrings.cpp, so the test case in
this patch is not run automatically, but the test case has been verified
to pass separately by moving the test function into Gecko and calling it
during startup and stepping through it in the debugger.

--HG--
extra : rebase_source : 0330c130520802392b92bd094dde85f57cfe6420
2014-12-12 11:47:55 -05:00
Jason Orendorff
d8d2b7ff19 Bug 1103368, part 5 - Make Class::getProperty and setProperty nullable instead of needing stub functions. Never store stub functions in JSPropertyDescriptors. r=bhackett.
--HG--
extra : rebase_source : a44070dd6155426ef6026c1575116f90b5fdac0c
extra : amend_source : 8d8fcf05dfd5fdf214a39501663347a6d6b56463
2014-11-22 12:23:39 -06:00
Nicholas Nethercote
7553049ead Bug 1094552 (part 6) - DMD: add support for cumulative heap profiling. r=mccr8.
By adding a new "cumulative" mode.

--HG--
extra : rebase_source : 5c851b7c594a134fae48393ff0becfd057715041
2014-10-30 20:22:47 -07:00
Nicholas Nethercote
4409b85c94 Bug 1094552 (part 4) - Rename AnalyzeReports() as Analyze(). r=mccr8.
Because DMD is no longer just about measuring memory reports coverage, but is
also used for more general heap profiling.

--HG--
extra : rebase_source : 82b4579de240037f96cf6618b15870925adc431b
2014-12-08 14:45:13 -08:00
Jason Orendorff
7acf3e4267 Bug 1103152 - Remove JS_DeletePropertyStub, JS_EnumerateStub, JS_ResolveStub, and JS_ConvertStub. Make five mandatory JSClass hooks optional (nullable). r=bhackett.
--HG--
extra : rebase_source : a349ef612573aff8f87b995a65df94ae56cab13d
extra : amend_source : bbfe549fe0735d8b33ffff66d7eeddcc2ad042d2
2014-12-02 16:56:35 -06:00
Terrence Cole
577d0c8110 Bug 1105069 - Part 12: Convert VisitGrayWrapperTargets to GCCellPtr; r=jonco, r=mccr8
--HG--
extra : rebase_source : e74a8a70f5110cb64787fa3ef9669819f0d24c85
2014-12-05 09:38:33 -08:00
Terrence Cole
151dacd151 Bug 1105069 - Part 11: Convert UnmarkGrayGCThingRecursively to GCCellPtr; r=jonco, r=mccr8
--HG--
extra : rebase_source : da3b54ac1300838bbe66dbd74af89ff56302ba23
2014-12-05 09:38:33 -08:00
Terrence Cole
04e0cb95e1 Bug 1105069 - Part 10: Convert NoteWeakMapping to GCCellPtr; r=jonco, r=mccr8
--HG--
extra : rebase_source : b660a676c03c4a0bbdc521a6401a2a619543aa2a
2014-12-05 09:38:32 -08:00
Terrence Cole
c851dcb10c Bug 1105069 - Part 9: Strongly type NoteWeakMapChildrenTracer; r=mccr8
--HG--
extra : rebase_source : d9022b88da99b7c8df01cc222cd98f83ed795ecb
2014-12-05 09:38:32 -08:00
Terrence Cole
ceddb6ef1f Bug 1107349 - Always build in enerational GC support; r=jonco 2014-12-04 09:45:05 -08:00
Mason Chang
92e6a610c8 Bug 1108613. Create an XRE_IsParentProcess to detect if code is running in the parent process. r=roc 2014-12-09 11:21:47 -08:00
Nicholas Nethercote
d7b18893df Bug 1102525 (part 3) - Replace SegmentedArray with mozilla::SegmentedVector in the cycle collector. r=smaug.
--HG--
extra : rebase_source : fb8b9f52958d6823dc011892b06bf42989a60a75
2014-12-08 14:45:13 -08:00
Chris Peterson
9cad8a95ff Bug 1107814 - Part 2: Mark some directories as FAIL_ON_WARNINGS conditionally for some compilers. r=gps 2014-12-04 01:11:14 -08:00
Chris Peterson
47091050b7 Bug 1107814 - Part 1: Mark more directories as FAIL_ON_WARNINGS for all compilers. r=gps 2014-12-04 16:24:03 -08:00
Wes Kocher
8384912619 Backed out changeset bf25101e66cf (bug 1095098) for build bustage 2014-12-08 16:27:12 -08:00
Denis Volk
29c122c0d3 Bug 1095098: move do_QueryObject templates into their own header r=froydnj 2014-11-20 12:20:10 +01:00
Terrence Cole
dcc14e9e51 Bug 1105069 - Part 8: Remove implicit cast from GCCellPtr to js::gc::Cell*; r=jonco, r=mccr8
--HG--
extra : rebase_source : 0dfb2314f5d20770b7b92fa9fde23cb6c41f20d8
2014-12-01 22:34:25 -08:00
Terrence Cole
6cbcc53e0d Bug 1105069 - Part 7: Convert WeakMapTracer to use GCCellPtr; r=jonco, r=mccr8
--HG--
extra : rebase_source : d61c5f00a86472581bedd833fd4fbaf1f6700a0a
2014-12-01 15:06:38 -08:00
Terrence Cole
6863bef43e Bug 1105069 - Part 1: Move GCTraceKind from jspubtd to TraceAPI; r=jonco, r=mccr8
--HG--
extra : rebase_source : 86fef608628fe2eaa6c6f91e84d90aa9e9baa84d
2014-12-01 14:49:07 -08:00
Zhenbo Li
936e8adc5d Bug 1106050 - Fix variable ‘fifoCallbacksRegistered’ set but not used warning. r=njn 2014-12-04 21:30:22 +08:00
Daniel Holbert
93e7a11ae5 Bug 1108024: Add MOZ_OVERRIDE annotations to function-decls in NS_DECL_ISUPPORTS & its variants. r=froydnj 2014-12-05 12:49:05 -08:00
Olli Pettay
ed659058ad Bug 1107775 - Make deferred finalization more re-entrant safe, r=mccr8 2014-12-05 08:53:00 -08:00
Landry Breuil
effe48be0c Bug 1106551: Include sys/mount.h only in the linux quota case r=froydnj
Fixes build on OpenBSD where you cant include sys/mount.h alone, you
also need sys/param.h
2014-12-05 15:46:53 +01:00
Carsten "Tomcat" Book
f25029b155 Backed out changeset 81bec89d093b (bug 1107775) for Valgrind and other test failures 2014-12-05 08:19:28 +01:00
Olli Pettay
ab84494b5a Bug 1107775 - Make deferred finalization more re-entrant safe, r=mccr8
--HG--
extra : rebase_source : 74e300e96b50b470dbc89cdbbcfb9dbc7b75e629
2014-12-04 21:59:30 -08:00
Mats Palmgren
9ce25f95ec Bug 1101625 part 1 - Don't escape all non-ASCII characters when unsafe characters are found, just escape the unsafe characters. r=smontagu 2014-12-01 15:55:15 +00:00
ffxbld
4130d4a2f3 Update configs. IGNORE BROKEN CHANGESETS CLOSED TREE NO BUG a=release ba=release 2014-11-28 10:54:49 -05:00
Ben Hearsum
03c550c974 Backout bad version bumps IGNORE BROKEN CHANGESETS CLOSED TREE NO BUG a=release ba=release 2014-11-28 10:51:29 -05:00
ffxbld
54c7c6a960 Update configs. IGNORE BROKEN CHANGESETS CLOSED TREE NO BUG a=release ba=release 2014-11-28 10:39:09 -05:00
ffxbld
9b3319e2ca Update configs. IGNORE BROKEN CHANGESETS CLOSED TREE NO BUG a=release ba=release 2014-11-28 10:33:05 -05:00
Olli Pettay
702d381ada Bug 1105089, try to have shorter ICC slices during animations, r=mccr8
--HG--
extra : rebase_source : bfe8cc2825b7cb2ec86f6e8f5ba590593e1c378b
2014-11-27 13:47:51 +02:00