mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность
276 850 коммитов 615 Ветки 98 Теги 5,7 GiB
Граф коммитов

10552 Коммитов

Автор SHA1 Сообщение Дата
Asaf Romano 42ca210005 Butage fix for bug 745466 (that test is not valid on windows). 2012-04-16 23:47:42 +03:00
Asaf Romano bc880d784d Bug 745466 - initWithPath fails for "~". r=bz. sr=bsmedberg. 2012-04-16 21:40:47 +03:00
Ms2ger 6a4d885b40 Bug 744347 - Remove last traces of EventException; r=smaug 2012-04-14 14:57:07 +02:00
Ms2ger 77ca860259 Backing out bf0a78471e5e:dc7022e2d807 for inexplicable windows crashes. 2012-04-14 17:52:34 +02:00
Ms2ger 2009883804 Bug 744347 - Remove last traces of EventException; r=smaug 2012-04-14 14:57:07 +02:00
Anant Narayanan 6707836f9a Bug 695515 - Remove last use of memmem. r=khuey 2012-04-24 08:21:12 -07:00
Benjamin Smedberg b328c7b488 Bug 743056 - nsPrintfCString is consistently misused because people don't understand its length-truncation behavior. Make it behave the way people expect by expanding the string as necessary (and use nsTSubstring::AppendPrintf to unify the codepath), r=jlebar 
--HG--
extra : rebase_source : 8d638515f4ef5b89f0ecaca5a4cc2974982d7092
 2012-04-13 12:58:59 -04:00
Mark Capella bb0cb90d39 Bug 740688 - Use uintptr_t instead of PRUword, and intptr_t instead of PRWord. r=jwalden 
--HG--
extra : rebase_source : 648a581323d2c2893df780f71fe34dadcc4bbaab
 2012-04-11 17:17:44 -07:00
David Rajchenbach-Teller 6f228de18f Bug 728171 - Use Scoped.h throughout the code. r=cjones 2012-04-12 12:21:24 +02:00
Andrew McCreight 291442c9c4 Bug 744088 - remove nsCycleCollector_getRuntime. r=smaug 2012-04-11 16:50:03 -07:00
Richard Newman f8c8184e2b Backout 0e03eb171e08 (Bug 743574 - Deprecate DOMException.code). a=bustage 2012-04-11 15:33:37 -07:00
David Rajchenbach-Teller b219309fc2 Bug 728171 - Use Scoped.h throughout the code. r=cjones 2012-04-11 18:59:10 +02:00
Justin Lebar ec87e5bf0c Bug 743786 - Add IsMainThread assertions to ClearOnShutdown. r=bmsedberg 2012-04-10 15:58:10 -04:00
Justin Lebar c5b2e91dc3 Bug 724072 - If using a content process, display the pid and "parent"/"child" along with each NS_WARNING. r=bsmedberg 
--HG--
extra : rebase_source : e50670c28aa95de347ce68efaebb84c9682b2c36
 2012-04-10 15:57:20 -04:00
Steven Michaud b02d7f21d4 Bug 313700 - Stale information in about:plugins (pluginreg.dat) after a plugin update. r=josh 2012-04-10 10:56:49 -05:00
Ehsan Akhgari da8a28843b Merge the last PGO-green changeset from mozilla-inbound into mozilla-central 2012-04-10 11:11:37 -04:00
Serge Gautherie 0d51cc4432 Bug 740769. (Cv1a) test_bug325418.js: Create separate observers, Initialize gStartTime[12] later, Use Date.now() instead of (new Date()).getTime(), "timer = null;" a bit later, Nits. r=bzbarsky. 2012-04-10 15:59:43 +02:00
Serge Gautherie f5cb497d42 Bug 740769. (Bv1) Convert test_bug325418.js file to LF end-of-lines, Fix nsITimer.idl documentation. r=bzbarsky. 
DONTBUILD.
 2012-04-10 04:32:19 +02:00
Takanori MATSUURA bd9ba0040a Bug 737006 - Use internal ply only if needed. r=khuey 2012-04-06 14:06:52 -04:00
Dave Townsend 5510693793 Bug 738790: Add mozglue to dependentlibs.list to fix xulrunner stub loading. r=glandium 2012-04-06 08:26:38 -07:00
Jacek Caban c7a0b43a81 Bug 742281 - Append instead of assigning OS_LIBS in xpcom/tests/windows/Makefile.in r=glandium 2012-04-06 11:13:28 +02:00
Richard Newman 4cf57b304c Merge m-c to m-i. 2012-04-05 22:06:41 -07:00
Serge Gautherie 0556412b21 Bug 740769. (Av1) Fix multiple issues in test_bug325418.js. r=bzbarsky. 2012-04-05 22:59:38 +02:00
Mike Hommey 609e12c771 Bug 738176 - Completely disable jemalloc when it's supposed to be disabled on OSX, and cleanup exposed APIs. r=jlebar,r=khuey 2012-04-05 09:20:53 +02:00
Michael Wu bbcee4bb27 Bug 742107 - Use GRE_HOME or /system/b2g on Gonk, r=glandium 2012-04-04 20:24:10 -07:00
Benjamin Smedberg 4036c3cfb5 Bug 740919 - Don't delay-load gkmedias.dll and make the XPCOM glue work by eagerly loading it in dependentlibs.list, r=khuey 
--HG--
extra : rebase_source : cb2c83a5ca23c4ed93b18622503efc834c4465c4
 2012-04-03 14:08:23 -04:00
Justin Lebar 7bfb741688 Bug 741540 - Add AvailableMemoryTracker's hooks before any threads have started up. r=bsmedberg 
--HG--
extra : rebase_source : 5135df39b3ae022e75f8651b2e10a378edbae158
 2012-04-09 13:53:08 -04:00
Daniel Holbert 9b5846b3dc backout 118c07dc56f9 (bug 742179) for windows build bustage 2012-04-05 10:56:10 -07:00
Doug Turner 18e6967fd4 Bug 742179 - Move MakeRandomString to xpcom/ds. r=bsmedberg 2012-04-05 09:50:55 -07:00
Geoff Lankow 5f83fb3fab Bug 682360 - Merge nsILocalFile and nsIFile interfaces; r=bsmedberg 2012-04-04 23:04:37 +12:00
Veeraya Pupatwibul 344b2b1753 Bug 741333 - Remove PRBool/PR_TRUE/PR_FALSE that crept in r=Ms2ger 2012-04-04 11:15:10 +02:00
Ryan VanderMeulen 503ea93a8c Backout 17deb5f61b4d (bug 150073) due to build bustage. a=shouldausedtryfirst 2012-04-03 20:22:42 -04:00
Masatoshi Kimura 79c26e3bdb Bug 738912 - Part 1: Sort dictionary members lexicographically. r=khuey 2012-04-03 20:08:28 -04:00
Shriram Kunchanapalli dcbb9c3017 Bug 150073 - Remove nsCRT:: in nsCRT::strlen. f=sgautherie, r=dougt 2012-02-18 19:17:01 +05:30
Justin Lebar 31cebc2b87 Bug 738624 - Add ghost windows to about:compartments. r=njn 
--HG--
extra : rebase_source : c16cdfc4c06b363f54f1d0f37bb006cf977b079a
 2012-04-02 22:28:05 -04:00
Mark Capella bfa59371ce Bug 712936 - Convert users of PR_STATIC_ASSERT to MOZ_STATIC_ASSERT. r=jwalden 2012-04-02 17:21:24 -07:00
Matt Brubeck 6113f7efa8 Back out bug 738011, bug 738624, and bug 737857 because of WinXP debug reftest log errors 
--HG--
extra : rebase_source : 965c755f6416e2ca102b38633fe7a2c7267e956e
 2012-04-02 12:44:31 -07:00
Justin Lebar 39bee4009c Bug 738624 - Add ghost windows to about:compartments. r=njn 
--HG--
extra : rebase_source : a486e644351af72a4276f26de2e4588ee851426f
 2012-04-02 10:37:04 -04:00
Ed Morley 3de190bb3e Backout 9e4d09efa335 (bug 737857), bd73daadcfe9 (bug 738624), 110338618465 (bug 738011) for mochitest-oth orange 2012-04-01 03:58:06 +01:00
Justin Lebar 285de39efb Bug 738624 - Add ghost windows to about:compartments. r=njn 
--HG--
extra : rebase_source : 37480ae937cbe2a09ae0ce7c187dafef94db5e16
 2012-03-31 15:39:31 -07:00
Peter Van der Beken 3b271dc91f Add include guards to nsVariant.h. No bug. r=bz. 2012-03-29 13:18:32 -07:00
Phil Ringnalda 16b8634b73 Back out b00bf7f3869c (bug 737976) for apparently causing mochitest-1 leaks on a CLOSED TREE 2012-03-28 22:43:09 -07:00
Kyle Huey 33073664dc Bug 737976: Remove nsINodeInfo. rs=bent 2012-03-28 19:07:37 -07:00
Jeff Muizelaar a5a6b40e88 Bug 719427. Add a comment about malloc_logger. r=espindola 2012-03-27 13:48:58 -04:00
Marco Bonardo 59330158ea Merge last green PGO from inbound to central 2012-03-27 13:56:40 +02:00
Michael Wu 3c93531706 Bug 739108 - Set android_sdk_version on gonk, r=cjones 2012-03-25 18:52:03 -07:00
Doug Turner 9129ad3159 Bug 734855 - Rename DeviceMotion to DeviceSensors. r=mwu 
--HG--
rename : dom/system/nsDeviceMotion.cpp => dom/system/nsDeviceSensors.cpp
rename : dom/system/nsDeviceMotion.h => dom/system/nsDeviceSensors.h
rename : xpcom/system/nsIDeviceMotion.idl => xpcom/system/nsIDeviceSensors.idl
 2012-03-24 17:29:57 -07:00
Doug Turner ec38c98821 Bug 734855 - Device Orientation - Make EnableDeviceMotion finer grain. r=mwu 2012-03-24 17:29:49 -07:00
Cameron McCormack 2ea93b529b Bug 739129 - Add LastElement and SafeLastElement functions to nsTArray. r=dbaron 2012-03-27 09:48:25 +11:00
Andrew McCreight d1db0b69b9 Bug 738769 - only unmark purple if purple. r=smaug 2012-03-26 09:57:29 -07:00
Jonathan Kew 34b9df2a69 bug 737863 - nsBaseHashtable::SizeOfExcludingThis should be declared const. r=njn 2012-03-23 12:13:56 +00:00
Nicholas Nethercote bcd2963e13 bug 737412 - handle null sizeOfEntryExcludingThis pointer within ns{T,Base}Hashtable SizeOfExcludingThis functions. r=jfkthame 2012-03-23 12:13:44 +00:00
Ryan VanderMeulen 554919925b Backout 1152d14294df, 18c70ab50559, dbd51616925a, 730c2e84247f, and 7beb8fd46629 due to perma-hangs on WinXP debug moth. (test_memoryReporters.xul | application timed out after 330 seconds with no output) 2012-03-23 17:04:28 -04:00
Chris Lord aa2bb6dae0 Bug 738740 - Fix handling of parameters in nsTArray::ReplaceElementAt. r=bz 
Handle the parameters given to ReplaceElementAt the same way as those given to
other methods in the class. This allows removal of the & in GLContext.cpp that
was taking the address of a temporary, and causing a build error when using
clang, or when using GCC with particular parameters.
 2012-03-23 19:27:25 +00:00
Benjamin Smedberg d14fc6c435 Bug 719154, remove the implementation of chained and filtered event queues now that they are no longer needed, r=jlebar 
--HG--
extra : rebase_source : 54e3f130dfaf59e67974019e39bf85471b22b4bf
 2012-03-23 14:45:41 -04:00
Jonathan Kew 1324886d80 bug 737863 - nsBaseHashtable::SizeOfExcludingThis should be declared const. r=njn 2012-03-23 12:13:56 +00:00
Nicholas Nethercote 65d37d97ce bug 737412 - handle null sizeOfEntryExcludingThis pointer within ns{T,Base}Hashtable SizeOfExcludingThis functions. r=jfkthame 2012-03-23 12:13:44 +00:00
Makoto Kato df9f6ff270 Bug 738157 - missing nsSubstring_h___. r=dbaron 2012-03-23 14:46:04 +09:00
Ehsan Akhgari 263497d709 Bug 737959 - Fix the startup crash with MallocStackLogging; r=bsmedberg 2012-03-22 13:18:36 -04:00
Matias Juntunen 702f8921b8 Bug 617947 - Merge 'class nsQuickSortComparator' into 'nsTArray'. r=bsmedberg 2012-03-21 19:52:24 -04:00
Hessam Salehi 2bda7efc98 Bug 474505 - Replace uses of nsVoidPtrHashkey with nsPtrHashKey<T>; r=bsmedberg 2012-03-21 14:07:31 -04:00
Josh Dhaliwal 36b41a1970 Bug 735011 - geolocation - support enableHighAccuracy position option. r=dougt 2012-03-21 10:52:35 -07:00
Doug Turner b1e4247d44 Bug 735330 - move device motion from dom/system to hal. r=jdm 
* * *
Bug 735330 - move device motion from dom/system to hal. cocoa bits. r=jdm
* * *
Bug 735330 - move device motion from dom/system to hal. window/qt/linux bits. r=jdm
* * *
Bug 735330 - move device motion from dom/system to hal. move accuracy into sensor data.  support compassneedscalibration. r=jdm

--HG--
rename : dom/system/cocoa/smslib.h => hal/cocoa/smslib.h
rename : dom/system/cocoa/smslib.mm => hal/cocoa/smslib.mm
 2012-03-20 23:36:17 -07:00
Matt Brubeck 388850e1f0 Back out bug 735330, bug 737462, bug 734854 because they broke XUL Fennec 
--HG--
rename : hal/cocoa/smslib.h => dom/system/cocoa/smslib.h
rename : hal/cocoa/smslib.mm => dom/system/cocoa/smslib.mm
 2012-03-20 16:59:24 -07:00
Doug Turner 075acfd9f5 Bug 735330 - move device motion from dom/system to hal. r=jdm 
* * *
Bug 735330 - move device motion from dom/system to hal. cocoa bits. r=jdm
* * *
Bug 735330 - move device motion from dom/system to hal. window/qt/linux bits. r=jdm
* * *
Bug 735330 - move device motion from dom/system to hal. move accuracy into sensor data.  support compassneedscalibration. r=jdm

--HG--
rename : dom/system/cocoa/smslib.h => hal/cocoa/smslib.h
rename : dom/system/cocoa/smslib.mm => hal/cocoa/smslib.mm
 2012-03-20 14:46:14 -07:00
Mats Palmgren 7badd9a8e0 Bug 732951. r=bsmedberg 2012-03-20 19:02:38 +01:00
Vladan Djeric 3f47c98434 Bug 735829. Report PDB filename in chrome hang reports. r=ehsan 2012-03-19 19:05:25 -04:00
Nathan Froyd 9e3011bdab Bug 695214 - Make xpidl.py enforce [retval] parameters coming last. r=khuey 2012-03-13 16:50:45 -04:00
Mounir Lamouri 979c1d9364 Bug 735778 - Call MOZ_ASSERT if RemoveObserver is called with an observer that is not present. r=jlebar 2012-03-19 16:49:39 +01:00
Nicholas Nethercote 4583ceebea Bug 732842 - Add assertions for memory reports. r=jlebar. 2012-03-15 15:16:11 -07:00
Andrew McCreight a13cc9c35d Bug 736763 - CanSkipInCC when adding roots. r=smaug 2012-03-18 07:17:04 -07:00
Mark Finkle 5d52d341f9 Backout 7e28d1a2c648, 330b210f503d, 2421d39e0ab3, aa978ffa44bc, 38a71ae7e06d, b94319584a7a, 7e8278f5e814, 0b4e3c7608ab, 329c07609ca8, 0d61a0d8dba4, Due to Ts regression on Android 2012-03-17 21:51:39 -04:00
Ehsan Akhgari 9b15a69d3e Merge from mozilla-central 2012-03-17 12:32:28 -04:00
Mounir Lamouri e8b1ffee78 Bug 735778 - Call MOZ_ASSERT if RemoveObserver is called with an observer that is not present. r=jlebar 2012-03-16 19:32:11 +01:00
Kyle Huey 261786f710 No Bug: Shut pldhash up for the 'probably' case. rs=bz 2012-03-16 10:09:14 -07:00
Andrew McCreight 488be30e8c Bug 521853 - Make all cycle collector faults fatal. r=smaug 2012-03-15 21:13:08 -07:00
Ekanan Ketunuti f0a078afd5 Bug 722180 - Remove error codes for proxies. r=khuey 2012-02-01 18:53:29 +07:00
Landry Breuil 20513ab95d Bug 735422: Don't use shared-libraries.h and SharedLibraryInfo structs where SPS is not enabled; r=ehsan 2012-03-14 22:57:04 -04:00
Jacek Caban 8708c2df91 Bug 734903 - Undefined reference to XRE_GetProcessType in nsMediaCacheRemover.cpp on mingw r=benjamin 2012-03-14 15:08:04 +01:00
Mike Hommey 55cf56f3bf Bug 716544 - Fix comparison between signed and unsigned integer expressions in nsStringAPI.h. r=dbaron 2012-03-13 09:47:02 +01:00
Doug Turner 49f90f168c Bug 734324 - implement device motion - rotation rate and acceleration. r=jdm 2012-03-13 16:57:51 -07:00
Doug Turner b8e66a3424 Bug 734325 - implement compassneedscalibration event. r=jdm 2012-03-13 16:57:09 -07:00
Ed Morley 1f10388ce3 Backout 8b74d5ae78c3 & c619bbb2951f (bug 734391), 772c994fa869 (bug 734324), fd23ff0f9dd1 (bug 734325), d1e037a9390e (bug 733653), 3a7bf79b5b2d (bug 733650) & 9d9392fce538 (bug 733652) for OS X M1 & M3 orange 2012-03-13 22:29:29 +00:00
Ed Morley 234ed1374d Merge mozilla-central to mozilla-inbound 2012-03-13 20:52:11 +00:00
Lukas Blakk 221bdcc6e6 Merging in version bump NO BUG 2012-03-13 13:38:38 -07:00
Kyle Huey 2289b5607f No bug: Fix ply being dumb. r=ted 2012-03-13 10:22:14 -07:00
Doug Turner 10f24217b7 Bug 734324 - implement device motion - rotation rate and acceleration. r=jdm 2012-03-13 10:00:02 -07:00
Doug Turner 3e44310837 Bug 734325 - implement compassneedscalibration event. r=jdm 2012-03-13 09:59:24 -07:00
Marco Bonardo 720c67a69d Merge last green PGO from inbound to central 2012-03-13 11:17:21 +01:00
Masatoshi Kimura dceba2b661 Bug 721569 - Implement nullable types. r=khuey 2012-03-12 21:44:51 -07:00
Masatoshi Kimura c1d1c7ca5d Bug 721569 - Support default values for Web IDL dictionaries. r=khuey CLOBBER BUILD 2012-03-12 21:44:48 -07:00
Boris Zbarsky 9801e6dd67 Bug 705877 part 1. Rename mayContain on BloomFilter to mightContain. r=dbaron 2012-03-12 22:54:12 -05:00
Phil Ringnalda ef5d0d917f Back out 83a33626d965:6e9330f5a9bd (bug 732667 and bug 705877) for Windows build bustage 2012-03-12 22:12:41 -07:00
Boris Zbarsky 2b9e15c16a Bug 705877 part 1. Rename mayContain on BloomFilter to mightContain. r=dbaron 2012-03-12 22:54:12 -05:00
Justin Lebar 1fc1dc1879 Bug 729940 - Part 2: Stop using crappy hash functions in Gecko. r=bz 
--HG--
extra : rebase_source : 6fa267a89878cc1a766d8618569debcea9b12e48
 2012-03-12 18:53:18 -04:00
Daniel Holbert aaa40f6c5c Bug 711047, followup to part 2: use C-style comment in nsError.h, to fix build warnings for its inclusion in .c files. rs=sicking 2012-03-16 15:16:40 -07:00
Ehsan Akhgari 405bf0b4e6 Bug 733277 - Prevent firing timers from lock contention with the main thread; r=bsmedberg 2012-03-04 18:56:19 -05:00
Nathan Froyd 267da86e44 Bug 695235 - enforce unsigned long type on size_is parameters; r=khuey 2012-03-09 17:06:13 -05:00
Vladan Djeric a6bb287122 Bug 712109 - Implement chrome hang reporting on profiling branch. r=ehsan 2012-03-12 07:07:05 -04:00
Daniel Holbert 70775ba4c6 merge m-c tip over to m-i 2012-03-11 15:40:05 -07:00
Ms2ger 83fd0cc50a No bug - Remove unused variables origStr from HashString; r=themaid 2012-03-11 09:48:18 +01:00
Phil Ringnalda 06492092d4 Bug 582821 - skip test_nsIProcess.js on Windows until it can learn not to leave an unremovable file on the slave 2012-03-10 18:01:30 -08:00
Jeff Muizelaar 79f09f5a88 Bug 732806. Make stackwalking respect the stack end on OS X. r=ehsan 
This will help us avoid some crashes.
 2012-02-15 00:17:34 -05:00
Nicholas Nethercote a4e916975c Bug 732843 - Handle Callback() failures in memory multi-reporters. r=jlebar. 
--HG--
extra : rebase_source : 54af85a1ef839922d5443cdc36f601611258944a
 2012-03-04 15:26:30 -08:00
Jacob Holzinger 6a62cb6a9b Bug 696242 - Convert NS_RegisterStaticAtoms and nsCSSScanner::ReportUnexpectedParams to take an array-reference rather than a pointer and length, making it impossible to pass a pointer/length that are inconsistent. r=jwalden 
--HG--
extra : rebase_source : 882b5b4d500b1fa242c0a3cfa3084e4171cbaa9d
 2012-03-08 18:22:57 -08:00
Justin Lebar 0430db83ce Bug 733495 - Monitor ullAvailPageFile (available commit space) on Windows, and fire a low-memory event when it gets low. r=bsmedberg 2012-03-08 14:44:20 -05:00
Justin Lebar 3b4dd4a675 Back out changeset b2ac02d89f41 (wrong bug number; was 733496, should have been 733495). 2012-03-08 14:43:09 -05:00
Justin Lebar d235870b65 Bug 733496 - Monitor ullAvailPageFile (available commit space) on Windows, and fire a low-memory event when it gets low. r=bsmedberg 2012-03-08 14:27:14 -05:00
Nathan Froyd 094e7d2b3c Bug 730825 - Part 2: remove nsDoubleHashtable.h; r=bsmedberg 2012-03-02 09:52:26 -05:00
Nicholas Nethercote f5e01f1737 Bug 729008 - Add memory reporter for FramePropertyTable. r=bz. 
--HG--
extra : rebase_source : e366cd84d50b5277f9949b340d44190371e753f8
 2012-02-20 21:02:24 -08:00
Ehsan Akhgari d5ecc5c5ab Bug 733264 - Define FramePointerStackWalk on platforms where stackwalking is not supported; r=jrmuizel 2012-03-06 11:38:04 -05:00
Adam Dane 017d8a0b01 Bug 612246 - Store the media cache in the profile directory for single process Gecko and the system temp directory for multi-process. r=cpearce 2012-03-05 14:40:56 -06:00
Cameron McCormack 1cabdcdd82 Bug 732664 - Use FormatMessageA so that XPCOM stack walker prints error message correctly. r=dbaron 2012-03-06 10:04:40 +11:00
Andrew McCreight f578cf1551 Bug 728460, part 1 - add forget_skippable option to remove childless nodes. r=smaug 2012-03-05 13:48:04 -08:00
Ed Morley 3c657080b5 Backout afeafc02c1de, dfae37833c9b & f9f51c726fa7 (bug 729940 parts 1-3) for talos regressions 2012-03-05 15:22:28 +00:00
Nicholas Nethercote 3b808f9c61 Bug 682431 (part 2) - Add memory reporters for URIs and Links. r=biesi,bz,jlebar. 
--HG--
extra : rebase_source : db4f094a7d334914b986bb66f5bf1089aafda561
 2012-02-19 19:51:48 -08:00
Justin Lebar 7e343a6c1d Bug 729940 - Part 3: Stop using crappy hash functions in Gecko. r=bz 2012-03-04 15:58:06 -05:00
Justin Lebar e2b30b7a56 Back out bug 729940 (a108aee:d75775d) due to 32-bit red. 2012-03-04 14:20:34 -05:00
Justin Lebar 9cf4ac042d Bug 729940 - Part 3: Stop using crappy hash functions in Gecko. r=bz 2012-03-04 13:49:42 -05:00
Aryeh Gregor 1b6aea2012 Bug 711047 Part 2 - Remove RangeException in favor of DOMException. r=sicking 2012-03-01 13:35:48 -05:00
Jesse Ruderman f4c11108ff Bug 732607 - make nsTArray assertions fatal. r=bz 2012-03-03 13:16:13 -08:00
Nathan Froyd d4d6700e26 Bug 666612 - Fix compiler warnings in xpt_xdr.c. r=dougt 2012-02-21 08:49:18 -08:00
Justin Lebar 88875b0e3a Bug 729952 - Part 2: Use a better hash function in nsCRT, nsTHashtable, and pldhash. r=bz 2012-03-02 17:20:44 -05:00
Nicholas Nethercote da738c5677 Bug 723799 - Use mallocSizeOf in the DOM memory reporters. r=mounir. 
--HG--
extra : rebase_source : 2eb96d2f901bbe4cc1ff6dbccdec4dc4099b08fc
 2012-02-01 13:58:01 -08:00
Ryan VanderMeulen 8ec6c084fc Backout bug 666612 (rev 897ee1cf8514) due to build bustage. 2012-03-01 17:26:58 -05:00
Nathan Froyd 9b77ef62a6 Bug 666612 - Fix compiler warnings in xpt_xdr.c. r=dougt 2012-02-21 08:49:18 -08:00
Bas Schouten cc9d118a70 Bug 725552 - Part 1: Turn MutexAutoLock into a template with specializations. r=cjones 2012-02-16 04:11:34 +01:00
Justin Lebar 69fb6f1047 Bug 731789 - Rename mfbt/StdInt.h to mfbt/StandardInteger.h, so stdint types work from cpp files inside mfbt. r=waldo 2012-02-29 22:56:43 -05:00
Boris Zbarsky b338b37cbf Bug 730414 followup comment to address review comments 2012-02-29 21:44:02 -05:00
Boris Zbarsky a27156b93e Bug 730414. Expose a quick way to get a hash key for an atom. r=bsmedberg 2012-02-29 21:40:51 -05:00
Boris Zbarsky 3c48581eda Bug 730100. Add a Bloom filter implementation. r=waldo 2012-02-29 21:40:47 -05:00
Nathan Froyd a34fca0853 Bug 700659 - Delete nsHashSets code. r=bsmedberg 2012-02-27 11:26:58 -05:00
Brian R. Bondy 915a11f219 Bug 731170 - Download Manager Open containing Folder not working. r=bsmedberg 2012-02-28 13:42:13 -05:00
Matt Brubeck 4b1062f69d Merge from mozilla-central to mozilla-inbound 2012-02-28 10:08:33 -08:00
Mark Capella 0c0047820a Bug 489728. (Bv6a) Use passed() in TestTXMgr.cpp, Make passed() accept a va_list in TestHarness.h. f=sgautherie r=ehsan. 2012-02-28 10:17:15 +01:00
Brian R. Bondy 079540f7c6 Bug 632556 - Run nsIFile::Reveal/Launch asynchronously. r=bsmedberg 2012-02-26 16:46:38 -05:00
Andrew McCreight a2b9892187 Bug 730357 - factor out common NoteChild code. r=smaug 2012-02-26 13:18:44 -08:00
Nicholas Nethercote 7eb283d80a Bug 728990 - Change "The two measurements of 'explicit' memory usage don't match" assertion to a warning, because it fails occasionally due to races. r=jruderman. 
--HG--
extra : rebase_source : 3b2a8c8f14690bea041366dd35ff5147895abd56
 2012-02-26 20:17:46 -08:00
Nathan Froyd 2fb087ff7a Bug 729256 - Make xpidl.py error out on multiple-method function interfaces. r=bsmedberg 2012-02-27 18:57:28 -05:00
Nathan Froyd 987c379263 Bug 700659 - Slay nsHashSets in xpcom/base. r=khuey 2011-11-08 15:25:33 -05:00
Nathan Froyd f795f3de9b Bug 700659 - add a Contains method to nsTHashtable; r=bsmedberg 2012-02-22 06:32:13 -08:00
Marco Bonardo 6efc9d9ae6 Merge central to inbound 2012-02-25 11:12:42 +01:00
Brian R. Bondy dbab800567 Bug 708690 - Updater enhancements for product information blocks. r=rstrong 2012-02-24 16:29:41 -05:00
Andrew McCreight d592ecef31 Bug 697115 - return detailed CC results. r=smaug 2012-02-23 20:16:37 -08:00
Nathan Froyd da98e3c58e Bug 722689 - remove nsHashSets from nsCheapSets; r=bsmedberg 2012-02-10 11:30:40 -08:00
Richard Newman e7b436563b Merge last win pgo-green changeset from m-i to m-c. 2012-02-23 18:35:17 -08:00
Masatoshi Kimura 651eabedd7 Bug 699247 - Remove Win2K related code. r=jimm, sr=neil 2012-02-23 08:53:55 -06:00
Mike Hommey 90431b093f Bug 728229 - Allow to build with system python ply library. r=ted 2012-02-23 11:00:18 +01:00
Justin Lebar fc32ec463a Bug 729453 - Decrease stack allocation in nsTArray::SwapArrayElements from 8KB to 64B. r=roc 2012-02-22 12:26:21 +01:00
Mark Capella 3a0b126058 Bug 721496 - Remove MOZ_WINSDK_TARGETVER ifdefs for pre-Windows 7 SDKs. r=jimm 2012-02-23 01:33:19 +01:00
aceman 5cfbcc2a29 Bug 406336 - Fix indexOf and enumerate documentation. r=benjamin 2012-02-22 14:05:23 +01:00
Ed Morley 363756466a Merge last PGO-green changeset of mozilla-inbound to mozilla-central 2012-02-23 13:58:27 +00:00
Kyle Huey 03dd251a24 Merge b-s to m-c. 2012-02-22 19:00:04 -08:00
Kyle Huey 0a928bbce6 Bug 728429: Require ASLR for binary components on Windows. r=bsmedberg,ehsan 2012-02-22 15:05:28 -08:00
Phil Ringnalda 6bb007b4d6 Merge m-c to m-i 2012-02-21 23:36:31 -08:00
Mike Hommey 14011c7522 Bug 723861 - Ship xpidllex.py and xpidlyacc.py. r=ted 2012-02-22 08:12:15 +01:00
Mike Hommey af0ef99a2c Bug 728071 part 1 - Move nsXREAppData definition in a separate header, and use it from application.ini.h. r=bsmedberg 2012-02-22 08:12:15 +01:00
Mike Hommey 4221a257f2 Bug 686805 part 7 - Display linker stats on each Startup Timeline event. r=tglek,r=khuey 2012-02-22 08:12:15 +01:00
Phil Ringnalda ba5084f33c Back out b27980f1de54 and 39ea8d8f9768 (bug 728429) for potential Windows PGO build bustage on a CLOSED TREE 2012-02-21 20:01:01 -08:00
Kyle Huey c55d8ac9be Bug 728429: Fix typo. r=me 2012-02-21 19:07:22 -08:00
Kyle Huey 76f70c43c2 Bug 728429: Require ASLR for binary components on Windows. r=bsmedberg,ehsan 2012-02-21 16:09:39 -08:00
Nicholas Nethercote a14057dd8c Bug 702300 (part 8) - Add about:compartments. r=jlebar, ehsan. 
--HG--
extra : rebase_source : ad9de010f0b51d5ae7d74b8cbc04c8748767ec0b
 2012-02-16 22:10:39 -08:00
Nicholas Nethercote 8a288b60e4 Bug 682431 (part 1) - Fix up ns{String,CString} SizeOf* functions. r=bz. 
--HG--
extra : rebase_source : 85813ee7d843b6422f1a80a36a06fb42aa93b801
 2012-02-19 19:16:41 -08:00
Andrew McCreight 50124fe16f Bug 727604 - add release assertions to investigate cycle collector crashes. r=smaug 2012-02-20 12:13:29 -08:00
Robert O'Callahan 4d53757359 Bug 727695. Add TimeDuration::FromMicroseconds. r=cjones 2012-02-19 21:53:40 +13:00
Ed Morley f58ce433db Merge last PGO-green changeset of mozilla-inbound to mozilla-central 2012-02-18 00:16:22 +00:00
Serge Gautherie 26bc00d3ba Bug 721065. (Bv2a) pyxpt: Report true Typelib filename for both files, when IIDs/names differ. r=ted.mielczarek. 2012-02-17 19:37:52 +01:00
Olli Pettay 2421420211 Bug 726346 - Implement a version of nsICycleCollectorListener for devtools, r=mccr8 
--HG--
extra : rebase_source : e0ff9a1bba67eb8efa433f954ac03691252f6bed
 2012-02-17 19:35:22 +02:00
Brian R. Bondy 31f4294d94 Bug 726576 - Optimize calls to nsLocalFileWin's HasFileAttribute. r=neil 2012-02-17 09:24:09 -05:00
John Schoenick 8f85c825e0 Bug 716556 - Fix possible buffer overflow in nsScriptableInputStream (attempt 2). r=bsmedberg 2012-02-13 11:26:28 -08:00
Brian R. Bondy b2c6eef529 Bug 726503 - FILE_FLAG_SEQUENTIAL_SCAN always being passed for all file IO. r=taras 2012-02-16 08:55:19 -05:00
Brian R. Bondy 3e0d245944 Bug 726481 - Reduce calls to nsLocalFileWin's IsDirectory by not calling it when enumerating directories. r=neil 2012-02-16 08:49:24 -05:00
Marco Bonardo b9a5cb8c01 Merge central to inbound 2012-02-16 11:47:36 +01:00
Marco Bonardo b6fdf810ab Merge last green PGO from inbound to central 2012-02-16 11:45:18 +01:00
Makoto Kato 9b08baf531 Bug 727367 - xpcom/build has references of xpcom/proxy. r=bsmedberg 2012-02-16 10:08:00 +09:00
Andrew McCreight c4adf5736e Bug 727313 - avoid warnings, add case for skippable CC macros. r=smaug 2012-02-15 15:28:42 -08:00
Serge Gautherie e930a78b86 Bug 721065. (Av1b) pyxpt: Report Typelib filename, when IIDs/names differ. r=ted.mielczarek. 2012-02-15 22:19:16 +01:00
Daniel Holbert 4e017cf537 Bug 727686: Remove unused variable 'sTestDeque' from TestDeque.cpp. r=cpearce 2012-02-15 23:11:48 -08:00
Kyle Huey 3b439ba3ee Merge m-c to m-i to pick up Bug 725848. 2012-02-14 14:37:20 -08:00
Mark Banner e5953d7c54 Bug 722262 Fix ordering for extra app libs in dependentlibs.list. r=khuey 
--- Port |Bug 552864 - Throw away wrapper shell script on unix and lazily load libxul| to SeaMonkey
 2012-02-14 11:50:00 -05:00
Marco Bonardo 5f22420e58 Merge last green PGO from inbound to central 2012-02-14 11:16:13 +01:00
Matthew Noorenberghe 8e7f218b8e Bug 726043 - Rev uuids for bug 294260 and add NS_ENSURE_ARG_POINTER. r=Mossop 
--HG--
extra : rebase_source : 6dd8139b7efd86fe55668de56494d43e4726a1b6
 2012-02-10 12:07:19 -08:00
Michael Wu 5f7e8936f8 Bug 712789 - Put packed xpi extensions in the extension lists, r=bsmedberg 2012-02-13 13:57:28 -05:00
Justin Wood f6d9a8e0b0 Bug 722262 - allow other apps to expand the list of dependentlibs easily. r=glandium 2012-02-12 06:02:00 -05:00
Justin Wood da4aa0e6cb Backed out changeset 6d3493e971ea due to bad rebase 2012-02-13 08:54:50 -05:00
Justin Wood eb2c1e7196 Bug 722262 - allow other apps to expand the list of dependentlibs easily. r=glandium 2012-02-12 09:00:40 -05:00
Jeff Muizelaar c71622c072 Bug 724079. Add an internal stackwalk API. r=ehsan 
This will be used by the profiler to be able to unwind arbitrary threads.
 2012-02-03 15:13:24 -05:00
Olli Pettay a19334a3f9 Bug 725768 - BBP for ObjectHolders, additional patch 2, r=mccr8 2012-02-13 22:59:14 +02:00
Andrew McCreight 9d988357ab Bug 726374 - clean up CC debug timing infrastructure. r=smaug 2012-02-12 08:02:01 -08:00
Benjamin Smedberg a7b8b87b12 Bug 725015 - Always deliver category-change notifications asynchronously. This is required because extensions need the JavaScript-global-property category to work, but we always register contracts at the "end" of a chrome.manifest so that they will always be after the CIDs, but that means that they are after the categories are registered. r=bz 
--HG--
extra : rebase_source : 495126e85c6a76697610cb5eceab124871b8c5db
 2012-02-09 10:41:16 -05:00
Benjamin Smedberg b012d47bed Test for bug 725016 - extensions which add categories in their chrome.manifest expect that they contract they refer to will be available when the category observer notification is fired. 
--HG--
extra : rebase_source : d5ee7c20f54a1d3a7b14051bdf0ba309fc6aee17
 2012-02-08 14:00:07 -05:00
Phil Ringnalda e852e68d95 Back out 20ad3570d599 (bug 716556) for xpcshell orange 2012-02-08 22:11:42 -08:00
John Schoenick 7a8db952f3 Bug 716556 - Fix possible buffer overflow with nsScriptableInputStream, r=bsmedberg 2012-02-08 14:44:55 -08:00
Brian R. Bondy 74e7a459bf Bug 724207 - Save 15-20ms on startup from unused file attributes fetch when opening files. r=neil. 2012-02-08 16:51:45 -05:00
Brian R. Bondy b0ce243e0e Bug 724203 - Optimize nsLocalFile::IsDirectory on Windows by 50% giving 5ms startup improvement. r=neil. 2012-02-08 16:48:23 -05:00
Brian R. Bondy f115f9ac71 Bug 713485 - Crash when invalid drive is used in local file URL. r=neil. 2012-02-08 16:41:12 -05:00
Ed Morley 91422f00de Backout f1acc52a59da (bug 719983) & 6771bd53e267 (bug 699247) for 30% WinXp Ts regression 2012-02-08 21:04:21 +00:00
Masatoshi Kimura b40c031d6c Bug 699247 - Say goodbye to Win2k related code. r=jimm, sr=neil 2012-02-08 10:00:45 -06:00
Jacek Caban 42dc2181a8 Bug 724864 - perfprobe.cpp doesn't compile on mingw r=Yoric 2012-02-08 11:53:52 +01:00
Matthew Noorenberghe f018d13961 Bug 294260 - Safe Mode: Auto detect previous start-up failure and offer to start in safe mode r=bsmedberg,Mossop 
--HG--
rename : toolkit/components/startup/tests/Makefile.in => toolkit/components/startup/tests/browser/Makefile.in
extra : rebase_source : 8df6b163173362ae80832eb3667e04bb817280b3
 2011-11-07 21:20:42 -08:00
Andrew McCreight a3f6bcc6f0 Bug 696174 - Log JS heap at the same time as CC heap. r=bholley,smaug 2012-02-02 16:32:30 -08:00
Boris Zbarsky 257873b0a7 Bug 723498. Make sure to always set our out param in nsMultiplexInputStream::IsNonBlocking when returning success. r=bsmedberg 2012-02-07 15:28:06 -05:00
Benjamin Smedberg 7e07fb61e1 Bug 716594 - Switch nsBinaryInputStream::ReadBytes back to using the fallible allocator because it correctly checks for allocation errors and streams are untrusted input we should try to work with, r=dbaron 2012-02-07 13:06:05 -05:00
Brian R. Bondy 8685af94fd Bug 724256 - Optimize move file calls on Windows, saving about 2ms per call (1 call on startup). r=bsmedberg 2012-02-07 08:58:17 -05:00
Makoto Kato c591c1f4a6 Bug 723055 - remove nsLocalFileUnicode.h. r=bsmedberg 2012-02-07 11:36:09 +09:00
Nicholas Nethercote 5a1cbe043f Bug 689583 - Add names for memory multi-reporters. r=jlebar. 
--HG--
extra : rebase_source : adb3fb2cbbb8a07b60edd48c7dc9a3a4a4763b79
 2012-02-06 17:02:59 -08:00
Raúl Porcel 27ea55eda1 Bug 724615 - Fix TARGET_CPU usage on ARM. r=benjamin 2012-02-06 22:44:52 +01:00
Brian R. Bondy d438b3dd0f Bug 724177 - 30-50ms (5%) Firefox startup speed optimization on Windows in nsLocalFileWin. r=jimm 2012-02-06 14:11:30 -05:00
Nicholas Nethercote df90421a0d Bug 710054 - Add {nsString,nsCString}::SizeOf{In,Ex}cludingThis. r=bz. 
--HG--
extra : rebase_source : 2f5eb0a61cc36bdefe420658a86e5badc79484df
 2012-02-02 14:52:02 -08:00
David Rajchenbach-Teller 2374512d9b Bug 696033 - Add xperf probes (the API); r=glandium 2012-02-05 22:49:37 +00:00
Rafael Ávila de Espíndola 7ab5ca14fb Bug 723501 - Mark MemoryReporter_* final. r=justin.lebar. 
--HG--
extra : rebase_source : 7c1066ab8353c8d4766b060491cbbd4adfa44ce0
 2012-02-03 10:22:01 +01:00
Daniel Holbert 9cb879c9cc Bug 723809: Fix signed/unsigned build warning in TestTArray.cpp. r=jlebar 2012-02-03 01:18:58 -08:00
Boris Zbarsky a479b4be2a Bug 723446. Be a little more careful changing declarations on keyframe rules. r=dbaron 2012-02-02 11:59:39 -05:00
Ed Morley 20833ba752 Merge last PGO-green changeset of mozilla-inbound to mozilla-central 2012-02-02 10:22:32 +00:00
Tim Taubert 71edb76c65 merge m-c to fx-team 2012-02-02 10:03:01 +01:00
Tim Taubert 97bb2ea404 Bug 720697 - Provide internal API to get canvas image data as nsIInputStream; r=khuey 2012-02-01 01:13:44 +01:00
Ms2ger c4992ad023 Bug 719895 - Don't return an nsresult from nsComponentManagerImpl::KnownModule::Load; r=bsmedberg 2012-02-01 11:54:21 +01:00
Ed Morley 74d8e85167 Merge last PGO-green changeset of mozilla-inbound to mozilla-central 2012-02-01 10:55:34 +00:00
Mark Finkle bc2e11a2c4 Bug 671634 - Fennec UA changes. Useragent should be different between phones and tablets. r=me sr=bz a=gerv 
Please read http://groups.google.com/group/mozilla.dev.platform/msg/8133920a2ccf4d5b for the details.

Also see https://wiki.mozilla.org/Fennec/User_Agent for Gerv's accepted proposal.
 2012-01-31 20:04:23 -08:00
Alex Keybl a4822849fd Bug 700000 - Version bump 2012-01-31 10:57:49 -08:00
Ginn Chen 4fd8973e50 Bug 717861 GetVsize and GetResident underestimate memory size on Solaris r=justin.lebar 2012-01-31 14:32:10 +08:00
Andrew McCreight 92c993fb12 Bug 721794 - add SPS labels for CC entry points. r=smaug 2012-01-31 13:47:47 -08:00
Andrew McCreight 6eea252eb2 Bug 721248 - make nsICycleCollectorListener a builtinclass. r=smaug 2012-01-31 13:47:47 -08:00
Makoto Kato c00fefe24b Bug 719718 - hostxpt is unnecessary even if cross. r=khuey 2012-01-31 10:24:08 +09:00
Andrew McCreight d7371468e7 Bug 721420 - WantAllTraces should disable Skippable CC optimizations. r=smaug 2012-01-29 16:45:08 -08:00
Matt Brubeck 59734e78eb Merge mozilla-central and mozilla-inbound 2012-02-01 17:09:34 -08:00
Jonathan Watt dbb7cecf4b Bug 721210 - Remove dead include paths from XPCOM Makefiles. r=bsmedberg. 2012-01-19 15:07:01 +00:00
Justin Lebar 841722744a Bug 716523 - ClearOnShutdown() should assert if called after XPCOM shutdown. r=bsmedberg 
--HG--
extra : rebase_source : 7b25ac2044f1ecf88ca44aa48447cbfe1fc807cd
 2012-01-26 15:54:03 -05:00
Justin Lebar c27428d068 Bug 719531 - Part 2: Make FallibleTArray use moz_malloc rather than NS_Alloc, because only the former is fallible. r=bsmedberg 
--HG--
extra : rebase_source : 9259871f86b6fcaa805b0e042c52e10b751acdf5
 2012-01-26 12:51:45 -05:00
Justin Lebar 51a9d97275 Bug 719531 - Part 1: Add test that FallibleTArray returns false instead of crashing. r=bsmedberg 
--HG--
extra : rebase_source : 171dd32b0d2e863fa623fe05b76fc2986db5f057
 2012-01-26 12:51:34 -05:00
Ehsan Akhgari 17c5a879b4 Bug 718032 - Make stackwalking for other threads cheaper on Windows by avoiding involving a third walker thread; r=jrmuizel 2012-01-26 11:57:23 -05:00
Nicholas Nethercote 7559a70a04 Bug 715453 - Remove computedSize from nsMallocSizeOfFun. r=jlebar,bhackett. 
--HG--
extra : rebase_source : a65039a407daab45360a5b375b53cbf1bc05b7f6
 2012-01-25 00:52:51 -08:00
Ed Morley 38ce873b08 Merge last PGO-green changeset of mozilla-inbound to mozilla-central 2012-01-26 01:30:30 +00:00
Bill McCloskey dc52ba7996 Bug 706227 - Add way for JS_GC API users to give detailed reason for invocation (r=mccr8) 2012-01-25 10:59:55 -08:00
Ed Morley c4c765992a Merge last green changeset of mozilla-inbound to mozilla-central 2012-01-25 14:14:48 +00:00
Serge Gautherie 2e3dfd7e13 Bug 720955. (Av1) xpt.py: Report IIDs when they differ. r=ted.mielczarek. 2012-01-25 14:22:28 +01:00
Marco Bonardo 9cd7f532f6 Merge last green PGO from inbound to central 2012-01-24 13:27:20 +01:00
Makoto Kato 36c9cf4197 Bug 717526 - fix warning of nsStringAPI.h on Win64. r=dbaron 2012-01-25 15:43:27 +09:00
Olli Pettay ccc5ef850d Bug 720423 - Add NS_DECL_CYCLE_COLLECTION_SKIPPABLE_SCRIPT_HOLDER_CLASS_INHERITED, r=mccr8 
--HG--
extra : rebase_source : 91df46f35d3cc2c24462e0373c69e207f65a8bc3
 2012-01-23 23:06:58 +01:00
Andrew McCreight 821eb101a0 Bug 720292 - add more cycle collector edge names. r=smaug 2012-01-23 15:25:53 -08:00
Vladan Djeric 6bb3870456 Bug 716590 - WalkStackMain64 shouldn't skip frames unless it's walking the thread that called NS_StackWalk. r=dbaron 2012-01-23 17:21:23 -05:00
Nicholas Nethercote 0709e1673b Bug 671299 (part 3) - Add style sheet memory reporters. r=dbaron. 2012-01-02 18:19:14 -08:00
Nicholas Nethercote 8a9f231eaa Bug 671299 (part 2) - Add nsStringBuffer::SizeOfIncludingThisMustBeUnshared. r=bz. 
--HG--
extra : rebase_source : 1702e32e19828ae061c89f017f27efc75dab6cff
 2012-01-02 18:19:12 -08:00
Nicholas Nethercote b5b0bf9fbe Bug 671299 (part 1) - Add ns{Void,COM}Array::SizeOfExcludingThis(). r=bz. 
--HG--
extra : rebase_source : 170c6943e985a8bafc4c441918a0e23fd52e15f2
 2012-01-02 18:18:26 -08:00
Marco Bonardo 5c4bd88710 Bug 712767: Send profile shutdown topics to cpp tests requesting a profile. 
r=waldo
 2012-01-20 14:47:51 +01:00
Mike Hommey 0587da37fd Bug 683127 part 6 - Use wrapped dl* functions in the XPCOM standalone glue when building with MOZ_LINKER on Linux. r=bsmedberg 2012-01-20 09:48:44 +01:00
Chris Pearce add2f3c00b Bug 713381 - Add nsDeque::RemoveObjectAt(index). r=bsmedberg 2012-01-20 07:29:38 +13:00
Ted Mielczarek 3a5926f308 bug 706554 - Add nsRefPtrHashKey. r=bsmedberg 2011-11-30 16:30:55 -05:00
Nicholas Nethercote bfdbdcd83a Bug 715453 (part 2) - Ignore computedSize in nsMallocSizeOfFun. r=jlebar. 2012-01-17 20:23:55 -08:00
Chris Pearce 7894822b60 Bug Bug 713381 - backout 38271572005b,d5ebbc25b4b8,6435f51dd10d. r=backout 2012-01-19 11:56:54 +13:00