Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-29 21:25:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
264,131 Commits 615 Branches 98 Tags 6 GiB
8e0ae48a6c
Commit Graph

27074 Commits

Author SHA1 Message Date
Igor Bukanov
55704654e7 backout merge for bug 724310. r=irc 2012-02-09 21:28:22 +01:00
Jeff Walden
b8e00ef503 Warning patrol. No bug, r=themaid 
--HG--
extra : rebase_source : 1e5d09b39c41229086d25f3e0368441c7d9ce3f1
 2012-02-09 11:43:52 -08:00
Jeff Walden
638e9fa48e Bug 722121 - Remove the last now-unnecessary uses of CheckRedeclaration from JSOP_GETTER/JSOP_SETTER, as syntactically we guarantee no conflicts are possible. r=jorendorff 
--HG--
extra : rebase_source : f9b9bac41153cd269e3d9a4f02a4bd6f963b82fa
 2012-01-28 23:13:12 -08:00
Jeff Walden
c0a49d053b Bug 722121 - Remove JSOP_DEFFUN_FC, because it can never be generated. r=jorendorff 
--HG--
extra : rebase_source : 75d2fd13bfa2b706bbc6f82493b5bd23d241e8ce
 2012-01-28 22:46:08 -08:00
Jeff Walden
cff574d67b Bug 722121 - Remove uses of CheckRedeclaration from defvar/defconst. r=jorendorff 
--HG--
extra : rebase_source : 01545432f592a4c9e1cf2a2df13ffd7c233e3733
 2012-01-28 22:09:15 -08:00
Igor Bukanov
ca990d2064 bug 723517 - drop cx argument from JSObject field and fixed slots infallible API. r=:Waldo 
--HG--
extra : rebase_source : c461dfc0e0e0462ab262cc01c2a771d3bb0971cc
 2012-02-05 21:07:23 +01:00
Terrence Cole
929648f248 Bug 720439 - Generalize the Chunk allocator; r=igor 
These are currently hard-coded to the size and alignment required by Chunk.
Since we will need almost identical allocators for the new Nursery and
WriteBuffer required for GenerationalGC, we should just generalize the
existing Chunk allocator.

--HG--
extra : rebase_source : 50995c0bf3b6f35c8b4fe64efc13a433174bdb3f
 2012-01-23 14:43:01 -08:00
Luke Wagner
d97e2cbe45 Bug 723791 - remove now-unnecessary noteArgumentsPropertyAccess (r=jorendorff) 
--HG--
extra : rebase_source : 66c7930d21f380a1ad885550239f20b890d24e78
 2012-02-03 00:11:31 -08:00
Luke Wagner
b41ddecdd5 Bug 723791 - fun_getProperty needs a method barrier (r=jorendorff) 
--HG--
extra : rebase_source : 3fea7a8d9f965e921bb2744b8588f241e2e7c843
 2012-02-03 00:11:31 -08:00
Bobby Holley
a3f57f90f9 Bug 622301 - Remove now-obsolete 'callee' parameter. r=mrbkap 2012-02-07 18:06:41 -08:00
Bobby Holley
16036591ab Bug 622301 - Don't use XPCWrappedNative::GetWrappedNativeOfJSObject in quickstub unwrapping. r=mrbkap 2012-02-07 18:06:34 -08:00
Igor Bukanov
68b70a8965 bug 660441 - removal of cx parameter from IsAboutToBeFinalized. r=anygregor 2012-02-08 01:51:32 +01: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
Steve Fink
0de86e28cd Bug 712289 - Test alignment of jsval across C and C++. r=bz 2012-01-18 14:56:49 -08:00
Terrence Cole
47ebc73c1f Bug 724586 - Use modern tools to clean up obj_ToSource; r=Waldo 
This patch replaces the fiddly strcat logic with StringBuilder usage and cleans
up the error handling control flow using RAII.

--HG--
extra : rebase_source : d42753a880a8d242627534cd5827075ea4a8966d
 2012-02-07 10:39:58 -08:00
Igor Bukanov
b06d882ffd bug 724810 - storing finalizer in external strings directly. r=luke 
--HG--
extra : rebase_source : d3222c685190bbdbe9446628f2f73f2a6f81eb11
 2012-02-07 19:44:54 +01:00
Jason Orendorff
7d08e94bef Bug 699565 - Part 6 - for-of loops on typed arrays. r=bhackett. 2012-02-07 12:57:17 -06:00
Jason Orendorff
487db5a582 Bug 699565 - Part 5 - for-of loops on arguments objects. r=bhackett. 2012-02-07 12:57:17 -06:00
Jason Orendorff
2ee2e8f0d9 Bug 699565 - Part 4 - for-of loops on array-like DOM object. r=bz. 2012-02-07 12:57:17 -06:00
Jason Orendorff
84ac816f69 Bug 699565 - Part 3 - for-of loops on wrappers. r=bhackett. 2012-02-07 12:57:16 -06:00
Jason Orendorff
86a2aac956 Bug 699565 - Part 2 - for-of loops on arrays. r=bhackett. 2012-02-07 12:57:16 -06:00
Jason Orendorff
c2f9f6404d Bug 699565 - Part 1 - for-of loop basics. r=Waldo. 2012-02-07 12:57:16 -06:00
Marco Bonardo
ae9b10638c Bug 722254 - Add an XPCOMUtils method to generate a singleton factory. 
Use the new factory in Places js services, to ensure they can't be instanced multiple times.
r=bsmedberg
 2012-02-07 10:17:42 +01:00
Marco Bonardo
9461ad58a3 Backout c0077ffef801 (bug 723806) for failures in xpcshell and m-oth tests 2012-02-07 10:16:58 +01:00
Makoto Kato
e0b7612a1e Bug 715849 - yasm and GNU as should add debug flag if MOZ_DEBUG_SYMBOLS=1. r=khuey 2012-02-07 15:06:28 +09:00
Jim Blandy
01319b1c05 Bug 723806: Make JavaScript CTypes print function types correctly. r=bholley 
This adds new tests, and also fixes existing CTypes tests that relied on
the bug's presence.
 2012-02-06 21:18:42 -08: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
Brian Hackett
08da3edc46 Tweak logic when analyzing properties of new scripts, bug 720380. r=dvander 2012-02-06 11:18:33 -08:00
Brian Hackett
a509098dee Don't invoke __noSuchMethod__ on primitive lvalues in ICs, bug 721939. r=dvander 2012-02-06 10:49:31 -08:00
Andrew McCreight
ae5be20b56 Bug 724398 - specialize GCThingIsMarked to GRAY. r=billm 2012-02-05 19:43:35 -08:00
Nicholas Nethercote
411c1b8538 Bug 722609 - Rename the js-total memory reports. r=luke. 2012-01-30 20:03:29 -08:00
Nicholas Nethercote
a2845c0ea3 Bug 722595 - Add memory reporters for misc things hanging off JS objects. r=bhackett. 
--HG--
extra : rebase_source : 211b35134923f4cb99625bb240b96e81f0f28b4b
 2012-01-30 18:12:03 -08:00
Masatoshi Kimura
c3d7b0b2bb Bug 723894 - Crash when Web IDL dictionary object is null; r=mrbkap 2012-02-05 18:57:46 +00:00
Tom Schuster
d0d0f9f213 Bug 720675 - OOM Crash [@ JSString::isFlat] because of NULL deref for ensureFlat. r=bhackett 2012-02-05 11:32:12 +01:00
Panagiotis Koutsourakis
9c7dfb9706 Bug 702388 - Convert Makefiles to use |TEST_DIRS += foo| r=khuey 
Files named Makefile.in containing the expression

DIRS += <foo>
or
DIRS = <foo>

inside the conditional expression

ifdef ENABLE_TESTS
...
endif

are changed to

TEST_DIRS += tests

outside any conditional expression.

The files

./layout/Makefile.in
./layout/Makefile.in
./layout/style/Makefile.in
./rdf/Makefile.in
./security/manager/Makefile.in
./content/Makefile.in
./content/smil/Makefile.in
./content/xul/templates/Makefile.in
./content/xul/content/Makefile.in
./content/base/Makefile.in
./content/media/Makefile.in
./parser/htmlparser/Makefile.in
./dom/sms/Makefile.in
./js/jsd/Makefile.in
./js/xpconnect/Makefile.in
./widget/Makefile.in
./widget/windows/Makefile.in
./Makefile.in
./startupcache/Makefile.in
./storage/Makefile.in
./gfx/Makefile.in
./intl/strres/Makefile.in
./intl/uconv/Makefile.in
./intl/unicharutil/Makefile.in
./intl/lwbrk/Makefile.in
./embedding/Makefile.in
./modules/libjar/Makefile.in
./modules/libpref/Makefile.in
./build/Makefile.in
./build/win32/Makefile.in
./xpcom/Makefile.in
./extensions/spellcheck/hunspell/Makefile.in
./extensions/cookie/Makefile.in
./netwerk/Makefile.in
./netwerk/streamconv/Makefile.in
./editor/txmgr/Makefile.in
./toolkit/mozapps/shared/Makefile.in
./toolkit/mozapps/update/Makefile.in
./toolkit/library/Makefile.in
./toolkit/library/Makefile.in
./toolkit/crashreporter/Makefile.in
./toolkit/components/perf/Makefile.in
./toolkit/components/perf/Makefile.in
./toolkit/components/feeds/Makefile.in
./toolkit/components/url-classifier/Makefile.in

contain the string

ifdef ENABLE_TESTS

but have some other statement inside (e.g. TOOL_DIRS += <foo> etc) and
they remain unchanged by this patch.
 2012-02-04 17:32:24 +00:00
Igor Bukanov
17db9a067b bug 723517 - Drop cx argumrent from JS_GetClass(cx, obj). r=luke 2012-02-04 01:54:57 +01:00
David Mandelin
34efbde005 Bug 723728: use calloc again in allocateArrayBufferSlots because it's faster, r=jwalden 2012-02-03 15:02:39 -08:00
David Mandelin
be9a8abe8b Bug 714616 followup: add assertions to moveDenseArrayElements unbarriered, r=billm 2012-02-03 13:47:39 -08:00
Terrence Cole
fec49555cc Bug 716069 - Add missing post barriers to newObjectFromHit; r=billm 
When we copy in the new object, we need to trigger barriers on the shape and
type pointers.  Note: all value immediates in the object are guaranteed to be
uninitialized.
 2012-01-12 19:03:25 -08:00
Jonathan Kew
ec184320f2 backout c18523b51058 (bug 716014) on suspicion of causing Win Debug reftest timeouts. 2012-02-03 14:01:35 +00:00
Luke Wagner
0c3a78bf21 Bug 688069 - fix String.prototype.{replace,match,search,split} for transparently wrapped RegExp arguments (r=cdleary) 
--HG--
extra : rebase_source : 52e43bfbd134f8afcff15b354fcb777d9b0e71ba
 2012-02-01 13:36:48 -08:00
Luke Wagner
19a5502f89 Bug 688069 - Use CallArgs typey-ness throughout jsstr (r=waldo) 
--HG--
extra : rebase_source : e07b03a817dff4193762ae7d134765e05065fc31
 2012-01-27 15:32:53 -08:00
Luke Wagner
cb392d44d9 Bug 688069 - remove spurious call to zeroLastIndex, bringing us to parity with jsc/v8. This allows removing RegExpPair and several other cleanups (r=cdleary) 
--HG--
extra : rebase_source : ae6497b500e93019ecc06ba2668fbdbe70b15417
 2012-01-27 15:32:53 -08:00
Luke Wagner
55d9645111 Bug 722594 - Remove xpc_CreateMTGlobalObject and mMTCompartmentMap (r=mrbkap) 
--HG--
extra : rebase_source : 6dd76009eb8029499efcbe6bbb0b74d58000612c
 2012-02-01 13:36:51 -08:00
Luke Wagner
542a670fec Bug 692269 - Remove jsstr.h, vm/String.h, jsautokw.h, jsclone.h, jsopcode.tbl, jsopcode.h, jsstdint.h from INSTALLED_HEADERS (r=billm) 
--HG--
extra : rebase_source : f9e20f1d52987251ad3d58c76531dcd5135076ad
 2012-01-30 09:17:38 -08:00
Matt Brubeck
73e694d1d5 Merge mozilla-central to inbound 2012-02-02 20:49:06 -08:00
Olli Pettay
8e65790a5d Bug 716014 - Use CompartmentGC more often, r=billm,mccr8 2012-02-02 22:34:53 +02:00
Terrence Cole
853d196cb5 Bug 716136 - Add a configure flag to enable Generational GC; r=billm 
These are already in the tree in several places to protect (empty) post write
barriers.  This will make it easier to test this functionality on more
platforms going forward.

--HG--
extra : rebase_source : d9c7f4f46392abbd608da94d02a7bc45f9fe8613
 2012-01-06 17:05:33 -08:00
Matthew Gregan
576ad01988 Bug 623444 - Import Windows libcubeb implementation. r=doublec, r=khuey 2012-01-13 14:38:39 +13:00
Andrew McCreight
e9dd77e37e Bug 721933 - add way to do compartment GC with a reason. r=billm 2012-02-01 17:55:09 -08:00
Jeff Walden
f59e6258a1 Bug 723249 - Implement a dump() function on JSString, JSAtom, and JSObject, for easier typing than js_Dump*. Also implement JSString::equals. r=luke 
--HG--
extra : rebase_source : 0bb078d0ded8aa52753261605bc72a5eef45e65e
 2012-01-31 18:03:41 -08:00
Igor Bukanov
ac75a17316 bug 723021 - moving native stack limits into runtime. r=luke 2012-01-31 23:28:22 +01:00
Jeff Walden
29b6689cf7 Bug 722260 - Properly handle NaN values as keys in Map objects. r=luke 2012-01-31 16:49:27 -08:00
Jeff Walden
ea987f7685 Bug 720316 - Convert the various object and function indexes into uint32_t. r=jorendorff 2012-01-19 17:15:33 -08:00
Steve Fink
01ef79496d Bug 717104 - test that an unreachable global does not keep its Debuggers alive. r=woof! 
--HG--
extra : rebase_source : 6249095c7501ba1e1647ea01998de685fe0a278e
 2012-01-26 11:55:39 -08:00
Steve Fink
024b8e70d2 Bug 717104 - unreachable debuggee globals should not keep their debuggers alive. r=jorendorff 
--HG--
extra : rebase_source : e1b4bc44adea1fa0bb94188ccaccc156c194dfbb
 2012-01-16 17:02:15 -08:00
Phil Ringnalda
5a0b40ee93 Back out 9aac714775b9 (bug 723111) for make check orange 2012-02-01 10:25:04 -08:00
Blake Kaplan
ddbc4e3a61 Bug 723111 - Add an option to js::UnwrapObject so that it doesn't stop at outer windows when unwrapping. This is useful for cases where we are trying to find the wrapped native for a security wrapper. r=bzbarsky 
--HG--
extra : rebase_source : 51216cf21b63554e50633c89f393c5888241dee2
 2012-01-26 14:55:27 +01:00
Terrence Cole
a443fae4b9 Bug 716042 - Add missing barriers to JSObject::TradeGuts; r=billm 
Add a manual post barrier to match the existing pre-barrier.
 2012-01-06 14:00:35 -08:00
Brian Hackett
406d930214 Catch some opcodes which return directly from a script, bug 723099. r=dvander 2012-02-02 16:09:47 -08:00
Brian Hackett
2131326400 Remove bogus assert, bug 722021. r=jandem 2012-02-02 16:06:41 -08:00
Blake Kaplan
4296a9ecc3 Bug 723111 - Add an option to js::UnwrapObject so that it doesn't stop at outer windows when unwrapping. This is useful for cases where we are trying to find the wrapped native for a security wrapper. r=bzbarsky 2012-01-26 14:55:27 +01:00
Bobby Holley ext:(%2C%20Jason%20Orendorff%20%3Cjorendorff%40mozilla.com%3E)
bc4e554f2e Do not innerize an object assigned to __proto__ or used as the target of a with statement. Bug 719841, r=mrbkap. 2012-01-27 14:16:27 -06:00
Jason Orendorff
814e3ad8bc Make the JS debugger consistently ignore dummy frames, fixing an assertion failure. Bug 678086, r=jimb. 2012-01-27 14:16:22 -06:00
Jason Orendorff
2d49b6d984 Reinstate a few assertions in TokenPos constructors. Bug 695922, r=luke. 2012-01-27 14:14:01 -06:00
Peter Van der Beken
848a63e2e6 Fix for bug 717009 (Inline ListBase<LC>::instanceIsListObject and ListBase<LC>::getListObject). r=bz. 
--HG--
extra : rebase_source : 368514fa942cb31751e5c6b4ff9d206c1bb609bc
 2011-11-09 11:37:47 +01:00
Landry Breuil
3120a633d9 Bug 653551 - Jaegermonkey Sparc back-end broken on sparc64. r=leon.sha 2012-02-02 15:31:56 +09:00
Peter Van der Beken
4ecf3a4db3 Fix for bug 716997 (Allow new DOM bindings with 0 methods or properties). r=jst. 
--HG--
extra : rebase_source : 2b16fa38254362cdedc136a8a4b07261ab2f6a76
 2011-10-14 23:21:39 +02:00
Peter Van der Beken
8a0db342c0 Fix for bug 693811 ("Assertion failure: shouldCacheProtoShape(cx, proto, &shouldCache) && shouldCache" in ListBase::nativeGet). r=mrbkap. 
--HG--
extra : rebase_source : 5baa4b1afeecf64e7f1945869e9cd2ae9045b44c
 2011-10-14 23:29:36 +02:00
Boris Zbarsky
d51e043630 Bug 722729. Expose a public API for LinkConstructorAndPrototype. r=bhackett 2012-01-31 22:40:49 -05:00
Nicholas Nethercote
0709e1673b Bug 671299 (part 3) - Add style sheet memory reporters. r=dbaron. 2012-01-02 18:19:14 -08:00
Matt Brubeck
ca5328a5d6 Back out 08f4fc94e27b f3ceed05f6b7 f87d25461d6c 317e842f6c65 57adfe804b56 (bug 720316, bug 722260) 2012-01-31 17:34:26 -08:00
Jeff Walden
bdc1919d39 Add END_CASE_LEN7 for Windows support, and add two forgotten manifest lists. Bug 722260 for the latter, no bug for the former, r=bustage 2012-01-31 16:49:27 -08:00
Brian Hackett
da5a8bd9e1 Don't run compile-and-go scripts on globals with a cleared scope, bug 680456. r=dmandelin 2012-01-31 16:36:07 -08:00
Jeff Walden
a40d4b431f Backed out changeset f87d25461d6c -- seems js_DumpString (at least) is only exposed in vm/String.cpp #ifdef DEBUG. Still no bug, r=bustage 2012-01-31 16:32:02 -08:00
Jeff Walden
3e916d11bc Add dump() to JSString, JSAtom, and JSObject as an easier-to-type alias to js_Dump*. Also add equals(const char*) methods to JSAtom and JSString. These methods are all to be used *only* while debugging. No bug, rs=luke over IRC 2012-01-31 15:48:27 -08:00
Jeff Walden
3f191286a8 Bug 722260 - Properly handle NaN values as keys in Map objects. r=luke 
--HG--
extra : rebase_source : 54ac2dccb9c1cb5c53f726939c988c4abfd74ab7
 2012-01-30 17:08:34 -08:00
Jeff Walden
2261405ba1 Bug 720316 - Convert the various object and function indexes into uint32_t. r=jorendorff 
--HG--
extra : rebase_source : 179deea8ca29b157b88658ccde6eabd6df48fab2
 2012-01-19 17:15:33 -08:00
Sander van Veen
ec0478f3a6 Bug 681556 - Default sandboxName to the caller's filename. r=mrbkap. 2012-01-30 20:06:41 -08:00
Boris Zbarsky
e5a7f88d45 Bug 722734. Add const signatures for converting back and forth between JS::Class and JSClass. r=mrbkap 2012-01-31 17:14:56 -05:00
Ed Morley
e64ba340a4 Merge mozilla-central to mozilla-inbound 2012-01-31 21:20:50 +00:00
Jim Blandy
bcc9969b0b Bug 722551: Once a function proxy has been frozen, operating on it should not cause its trap handlers to be called. 2012-01-31 12:48:14 -08:00
Jim Blandy
7e686fa9c1 Bug 722622: Remove custom trace function from js_NoSuchMethodClass. r=waldo 
Since js_NoSuchMethodClass is a native class, the normal slot traversal
will reach the function and id slots.
 2012-01-31 12:38:19 -08:00
Alex Keybl
a4822849fd Bug 700000 - Version bump 2012-01-31 10:57:49 -08:00
David Mandelin
e4b7d42c42 Bug 714616: fix write barrier in Array.shift, r=billm 
--HG--
extra : rebase_source : 2fd10ab4cc3a93aee188ef6f9bbc388f66da2d37
 2012-01-30 17:13:07 -08:00
David Anderson
df23f1de54 Support soft-float for ARMv6 (bug 696291, r=mrosenberg). 2012-01-30 18:53:37 -08:00
Jeff Walden
d9cb20ca59 Bug 722023 - Only call GetElementIC::attachGetProp with named properties, not indexed properties. r=bhackett 
--HG--
extra : rebase_source : aec995e286ec3d6bc85ed539d39840217f2ec4cf
 2012-01-29 12:29:29 -08:00
Jeff Walden
6660432aef Bug 721322 - Functions containing |expr.arguments| should be marked (conservatively) as using arguments. r=jorendorff 
--HG--
extra : rebase_source : 3ef23e440de3244ffff8ceb30e75fe086ae3b577
 2012-01-26 17:04:00 -08:00
Kan-Ru Chen
f54487e0fe Bug 709585 - Part 5, hal code for the Power API. r=cjones 
--HG--
extra : rebase_source : 49c8cb29be617293eb9143b3e3c760229b37943c
 2012-01-31 01:08:00 -05:00
Makoto Kato
c879e1a278 Backout bug Bug 702179 due to bustage on MacOSX deubg and Win32 debug 2012-01-31 18:00:25 +09:00
Ginn Chen
0fd3f01707 Bug 702179 Reland 1d0ec7fa8b96 since Bug 719742 is fixed. 2012-01-31 14:51:13 +08:00
Scott Johnson
8a04769547 Backout 6a4c4cb828a8 for bustage on windows. 2012-01-30 18:47:43 -06:00
Kan-Ru Chen
fd88fd0443 Bug 709585 - Part 5/6, hal code for the Power API. r=cjones 
--HG--
extra : rebase_source : 689315521a72444c8a0fc92efe128d5bf3fbbada
 2012-01-30 17:02:51 -06:00
Nicholas Nethercote
2ceea515c6 Bug 721628 (part 5) - Use size_t instead of int64_t in some JS memory reporting structs. r=luke. 
--HG--
extra : rebase_source : c3e13b8042b8914ae16cee38b0299f6164ba9222
 2012-01-29 14:13:18 -08:00
Nicholas Nethercote
f80bd86cce Bug 721628 (part 4) - Use better names for various JS memory reporting things. r=Ms2ger. 
--HG--
extra : rebase_source : 4edc916c571906329075b6be68c245267f9b61d0
 2012-01-29 14:11:32 -08:00
Nicholas Nethercote
7e06e236ee Bug 721628 (part 3) - Rename several size type-inference-related measurement functions and types. r=bhackett. 
--HG--
extra : rebase_source : e66bc2d787c31de93ff80280597543cf47924967
 2012-01-26 19:09:31 -08:00
Nicholas Nethercote
e51d580a67 Bug 721628 (part 2) - Remove mention of slop bytes from JS memory reporter descriptions. r=luke. 
--HG--
extra : rebase_source : f9babd22a734eae87a5f671f8ac405939d27e690
 2012-01-26 05:55:03 -08:00
Nicholas Nethercote
99919eca9d Bug 721628 (part 1) - remove the non-working shell built-in stringstats(). r=luke. 
--HG--
extra : rebase_source : f56320a19d39035fac5cd6bccf21e101b9184d82
 2012-01-26 05:46:54 -08:00
Till Schneidereit
a2f3351029 Bug 679026 - Add gcMallocBytes per compartment. r=gwagner 2012-01-30 13:21:42 -08:00
Igor Bukanov
34cdaf426d bug 722348 - eliminate JSRuntime::requestCount. r=luke 2012-01-30 11:15:13 +01:00