Commit Graph

568 Commits

Author SHA1 Message Date
Phil Ringnalda
2e98180c3d Back out a7255af10a2a and da193f5b526b (bug 729403) for xpcshell assertions in test_TelemetryPing.js 2012-02-26 18:39:06 -08:00
Nicholas Nethercote
7d90bc00d0 Bug 729403 (part 2) - Add js/runtime/gc-marker memory reporter. r=wmccloskey.
--HG--
extra : rebase_source : 9f078515b971e3de4156bb3edd3f8aea74c9fa8f
2012-02-21 21:43:45 -08:00
Nicholas Nethercote
f65c98bbba Bug 730182 - Show location for "[System Principal]" compartments in about:compartments. r=bholley.
--HG--
extra : rebase_source : 084b36938e00058503fba426aeb42ca5cd85698d
2012-02-26 13:23:32 -08:00
Peter Van der Beken
3b0644136d Fix for bug 691707 (Enumerating new proxy-based DOM bindings should enumerate the prototype too). r=mrbkap.
--HG--
extra : rebase_source : 788c2b3f9666ca654fab67047f6309937360f725
2012-02-07 20:55:37 +01:00
L. David Baron
5c4dc186ed Add a header file for CSS property aliases (and temporarily resurrect the aliases whose DOM properties we forgot to remove). (Bug 730532, patch 1) r=bzbarsky 2012-02-24 21:23:14 -08:00
David Mandelin
59dcf8cdf7 Bug 725550: remove obsolete typedef jsdouble, r=jwalden 2012-02-24 14:19:52 -08:00
Marco Bonardo
74afb56c79 Backout 4fc2f49371a8 (bug 725550) for build failures 2012-02-25 00:16:47 +01:00
David Mandelin
ad7cda83f5 Bug 725550: remove obsolete typedef jsdouble, r=jwalden
--HG--
extra : rebase_source : 772c2982184d7b3d1680737323395365e6b218da
2012-02-24 14:19:52 -08:00
Marco Bonardo
bcb8184750 Backout 92c25caf3990 (bug 691707) for m-oth failures 2012-02-24 20:05:44 +01:00
Peter Van der Beken
6bb126a26b Fix for bug 691707 (Enumerating new proxy-based DOM bindings should enumerate the prototype too). r=mrbkap.
--HG--
extra : rebase_source : 2877f225f60750d27005fccc0225e5c0482fb441
2012-02-07 20:55:37 +01:00
Daniel Holbert
72dfdfe8df Bug 730074: Use JSCLASS_NO_OPTIONAL_MEMBERS in JSClass definition within XrayWrapper.cpp, to fix build warning about missing braces. r=mrbkap 2012-02-24 14:31:49 +01:00
Richard Newman
f8f9fa6f5d Merge m-c to m-i. 2012-02-23 18:37:12 -08:00
Richard Newman
85840c2035 Merge last win pgo-green changeset from m-i to m-c. 2012-02-23 18:35:17 -08:00
Ben Turner
7af9098625 Backed out changeset 1f3643b7de2d 2012-02-23 07:09:11 -08:00
Ben Turner
3dc2527e7f Bug 717414 - 'Telephony: Make calls array live'. r=sicking. 2012-02-23 03:48:35 -08:00
Florian Boesch
fc9e33241d Bug 728354 - Implement WebGL EXT_texture_filter_anisotropic extension *proposal* - r=bjacob
The spec proposal for this extension is at
  https://cvs.khronos.org/svn/repos/registry/trunk/public/webgl/extensions/proposals/EXT_texture_filter_anisotropic/index.html

This adds a conformance test as well, that will have to be merged upstream.
2012-02-23 08:43:57 -05:00
Kyle Huey
8482a5faf3 Bug 728429: Require ASLR for binary components on Windows. r=bsmedberg,ehsan 2012-02-22 15:05:28 -08:00
Phil Ringnalda
83cb7a525c 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
e45a96deb7 Bug 728429: Require ASLR for binary components on Windows. r=bsmedberg,ehsan 2012-02-21 16:09:39 -08:00
Ed Morley
465164e131 Merge mozilla-central to mozilla-inbound 2012-02-21 14:15:58 +00:00
Ed Morley
ec5a7c5b3d Merge last PGO-green changeset of mozilla-inbound to mozilla-central 2012-02-21 11:59:33 +00:00
Ms2ger
5ed0ff5c65 Bug 726964 - Remove unused sDOMStringFinalizerIndex; r=bholley 2012-02-21 10:34:02 +01:00
Ms2ger
1944749327 Bug 726960 - Introduce xpc::NonVoidStringToJsval; r=bholley 2012-02-21 10:34:02 +01:00
Nicholas Nethercote
f407686454 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
c34bc1317f Bug 702300 (part 7) - Add the "compartments" multi-reporter. r=billm.
--HG--
extra : rebase_source : e45e59bd8657197dbd61c257f46ad6396cdda3c3
2012-02-16 22:10:39 -08:00
Luke Wagner
e360e8fdf0 Bug 729584 - mozJSComponentLoader::ImportInto needs to wrap exceptions (r=bholley)
--HG--
extra : rebase_source : c5c575a789647348fcca5bf9ef5368873f0016f4
2012-02-23 13:50:01 -08:00
Igor Bukanov
87ee03b495 bug 726944 - Remove JSClass::xdrObject and related functionality. r=luke 2012-02-13 09:02:21 +01:00
Bobby Holley
196a0a6768 Bug 700561 - Relax short-circuit principal checks on account of inner window reuse. r=bz 2012-02-18 08:55:28 -08:00
Bill McCloskey
c6cd982f05 Bug 641025 - Incremental GC (r=igor,smaug,roc,cdleary,gregor) 2012-02-17 14:35:20 -08:00
Bobby Holley
fe2e5fde31 Bug 714590 - Use the helper jsclass format everywhere. r=mrbkap 2012-02-16 12:22:16 -08:00
Terrence Cole
ed5d8783f0 Bug 726115 - Make the tracer callback take an indirect pointer; r=billm
This will be required for a tracer to move objects.  This patch only
updates the tracer interface and users of the interface.

--HG--
extra : rebase_source : 844d819a80cf6cb1dba0d07ea97f647802c66d40
2012-02-15 16:28:41 -08:00
Jeff Walden
7086420197 Convert the last remaining direct JS_Assert users to MOZ_Assert, followup to bug 717540 that seems to have been missed in my initial review. Also switch the JS_ASSERT uses to MOZ_ASSERT in passing. r=trivial
--HG--
extra : rebase_source : 70746d934b529c3e28d83dc2aced690ba92044db
2012-02-14 16:16:14 -08:00
Olli Pettay
49ff9c7a84 Bug 725768 - BBP for ObjectHolders, additional patch 2, r=mccr8 2012-02-13 22:59:14 +02:00
Bill McCloskey
03499f06a0 Bug 716067 - UnmarkGray more often (r=bent) 2012-02-10 18:32:13 -08:00
Phil Ringnalda
aa7113899f Back out 5f623a11c6cb (bug 713226), 1ed8ccf96402 (bug 721579), 32af27f89c49 (bug 722028), 1300d282fd22 (bug 716067), dc0f6ad7eff3 (bug 723313), 0d2ab3f2e9b9 (bug 723773) for talos crashes 2012-02-10 19:47:48 -08:00
Bill McCloskey
c96a433a29 Bug 716067 - UnmarkGray more often (r=bent) 2012-02-10 18:32:13 -08:00
Olli Pettay
0fe1640d6b Bug 725768 - BBP for ObjectHolders, r=mccr8
--HG--
extra : rebase_source : 31e088050144099582d035f758d716516885ebd3
2012-02-10 21:50:37 +02:00
Ed Morley
04d8171793 Merge last PGO-green changeset of mozilla-inbound to mozilla-central 2012-02-10 12:14:39 +00:00
Ms2ger
ccee066e87 No bug - Propagate false return value from xpc_qsThrowMethodFailedWithDetails; r=bz 2012-02-07 21:31:29 +01:00
Jeff Walden
e46b0ed4d4 Bug 725888 - Remove some js_GetClassPrototype calls, using faster methods on GlobalObject instead. Also introduce JS_GetObjectPrototype to retrieve Object.prototype so that a friend API can be made un-friendly. r=dmandelin
--HG--
extra : rebase_source : d68d7f1fdcc1bc9a1a027c08ea62bebd8e9d0178
2012-02-07 11:45:18 -08:00
Igor Bukanov
18e6a2e079 bug 724310 - drop cx argument from JSObject field and fixed slots infallible API. r=:Waldo
--HG--
extra : rebase_source : b78519db2ff008eb5143676d2db47935f0e89f45
2012-02-05 21:07:23 +01:00
Igor Bukanov
eb3cfce3dc backout merge for bug 724310. r=irc 2012-02-09 21:28:22 +01:00
Igor Bukanov
efe64d22c0 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
Bobby Holley
29328b7b57 Bug 622301 - Remove now-obsolete 'callee' parameter. r=mrbkap 2012-02-07 18:06:41 -08:00
Bobby Holley
09d06adbcf Bug 622301 - Don't use XPCWrappedNative::GetWrappedNativeOfJSObject in quickstub unwrapping. r=mrbkap 2012-02-07 18:06:34 -08:00
Igor Bukanov
672b98ffbe bug 660441 - removal of cx parameter from IsAboutToBeFinalized. r=anygregor 2012-02-08 01:51:32 +01:00
Andrew McCreight
ed6da3301f Bug 696174 - Log JS heap at the same time as CC heap. r=bholley,smaug 2012-02-02 16:32:30 -08:00
Igor Bukanov
249bae9bfd 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
4e6e2ddc69 Bug 699565 - Part 4 - for-of loops on array-like DOM object. r=bz. 2012-02-07 12:57:17 -06:00
Marco Bonardo
3cb51695d8 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
Nicholas Nethercote
ddd936d488 Bug 689583 - Add names for memory multi-reporters. r=jlebar.
--HG--
extra : rebase_source : adb3fb2cbbb8a07b60edd48c7dc9a3a4a4763b79
2012-02-06 17:02:59 -08:00
Andrew McCreight
e74e061086 Bug 724398 - specialize GCThingIsMarked to GRAY. r=billm 2012-02-05 19:43:35 -08:00
Nicholas Nethercote
aada2ed431 Bug 722609 - Rename the js-total memory reports. r=luke. 2012-01-30 20:03:29 -08:00
Nicholas Nethercote
a1ab9492f5 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
885fc84d72 Bug 723894 - Crash when Web IDL dictionary object is null; r=mrbkap 2012-02-05 18:57:46 +00:00
Igor Bukanov
afb57a37a5 bug 723517 - Drop cx argumrent from JS_GetClass(cx, obj). r=luke 2012-02-04 01:54:57 +01:00
Luke Wagner
b78ff5f631 Bug 722594 - Remove xpc_CreateMTGlobalObject and mMTCompartmentMap (r=mrbkap)
--HG--
extra : rebase_source : 6dd76009eb8029499efcbe6bbb0b74d58000612c
2012-02-01 13:36:51 -08:00
Luke Wagner
492489ef53 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
Blake Kaplan
2718588789 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
Igor Bukanov
08ee5eda35 bug 723021 - moving native stack limits into runtime. r=luke 2012-01-31 23:28:22 +01:00
Phil Ringnalda
23ca89ddfb Back out 9aac714775b9 (bug 723111) for make check orange 2012-02-01 10:25:04 -08:00
Blake Kaplan
7cce8db259 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
Peter Van der Beken
5be8d4ae29 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
Peter Van der Beken
8f4abab950 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
0fc6b252db 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
a16c2d5b2f Bug 722729. Expose a public API for LinkConstructorAndPrototype. r=bhackett 2012-01-31 22:40:49 -05:00
Nicholas Nethercote
2806f8e46a Bug 671299 (part 3) - Add style sheet memory reporters. r=dbaron. 2012-01-02 18:19:14 -08:00
Brian Hackett
3fad42139d 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
Sander van Veen
b8326718a6 Bug 681556 - Default sandboxName to the caller's filename. r=mrbkap. 2012-01-30 20:06:41 -08:00
Nicholas Nethercote
99f6891b58 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
b88e427016 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
a686663b5d 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
cb6170460f 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
Igor Bukanov
9eb0ae5f93 bug 722348 - eliminate JSRuntime::requestCount. r=luke 2012-01-30 11:15:13 +01:00
Jon Buckley
ec8f21a6ca Bug 721230 - Implement a compressed texture support stub for WebGL conformance. r=bjacob 2012-01-28 16:15:27 -05:00
Andrew McCreight
f5ad40b334 Bug 693527 - tell the cycle collector about watchpoints. r=jorendorff 2012-01-27 17:13:21 -08:00
Peter Van der Beken
17cd65acea Back out 570dd369e02a, bc777c65c5ca and 12a483042e9a to fix bustage 2012-01-27 15:34:30 +01:00
Peter Van der Beken
a315c8f9b9 Fix for bug 717009 (Inline ListBase<LC>::instanceIsListObject and ListBase<LC>::getListObject). r=bz.
--HG--
extra : rebase_source : 661d5fc98c76506ab6abccd057a0ce1e8cf6b0f8
2011-11-09 11:37:47 +01:00
Peter Van der Beken
92dc06c0ef Fix for bug 716997 (Allow new DOM bindings with 0 methods or properties). r=jst.
--HG--
extra : rebase_source : c6a702d61a75bae8e328d9cda6a717d75829ebf3
2011-10-14 23:21:39 +02:00
Peter Van der Beken
234f42c6e0 Fix for bug 693811 ("Assertion failure: shouldCacheProtoShape(cx, proto, &shouldCache) && shouldCache" in ListBase::nativeGet). r=mrbkap.
--HG--
extra : rebase_source : 191e550e9aac822f82e771a5a21fe74f90f728cb
2011-10-14 23:29:36 +02:00
Marco Bonardo
650ada821b Merge mozilla-central to mozilla-inbound 2012-01-26 19:34:35 +01:00
Olli Pettay
2130de6646 Bug 720686, add some cycle collection optimizations to XPC, f=mrbkap,r=mccr8
--HG--
extra : rebase_source : 7e8f68a30048f613acc99201c3c1e12b6f74eaba
2012-01-26 14:52:25 +01:00
Bill McCloskey
b5b7133e4b 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
Nicholas Nethercote
a7ad4ef70e Bug 715453 - Remove computedSize from nsMallocSizeOfFun. r=jlebar,bhackett.
--HG--
extra : rebase_source : a65039a407daab45360a5b375b53cbf1bc05b7f6
2012-01-25 00:52:51 -08:00
Nicholas Nethercote
bdcd8d9251 Bug 720219 (part 1) - Clean up JS object measurement. r=bhackett.
--HG--
extra : rebase_source : ff9aa7da84814e6868fef88b56bcb038389d5fb9
2012-01-23 15:35:37 -08:00
Luke Wagner
deb78ef5af Bug 675078 - rm JSThreadData and JSThread (JSRuntime is now officially single-threaded) (r=igor,rs=mccr8)
--HG--
extra : rebase_source : f6d2c2c6083f4589691ede571159bfd7e7ef8701
2011-07-18 14:54:48 -07:00
Matt Brubeck
54f0eed49e Back out 79deba022227 (bug 675078) because of Win debug mochitest-other failures 2012-01-24 17:32:30 -08:00
Luke Wagner
411fc35146 Bug 675078 - rm JSThreadData and JSThread (JSRuntime is now officially single-threaded) (r=igor) 2011-07-18 14:54:48 -07:00
Nathan Froyd
e0439c9672 Bug 714365 - DictionaryHelpers.cpp gets rebuilt on every build. r=ted 2012-01-23 07:55:21 -08:00
Ben Turner
c043698ddd Bug 705640 - Implement DOMError as defined in DOM 4, r=mounir.
--HG--
extra : transplant_source : %15%98Xx%C3%F3%89%95%94%5Eu%99%B0%CC%8B%E0V%3A4%C6
2012-01-24 02:13:41 -08:00
Bill McCloskey
37bab689c0 Bug 716033 - Move write barriers from jsapi.h to jsfriendapi.h (r=luke,bholley) 2012-01-23 16:43:12 -08:00
Andrew McCreight
8a73fee0b0 Bug 720292 - add more cycle collector edge names. r=smaug 2012-01-23 15:25:53 -08:00
Ed Morley
52a93f5d13 Backout 143f01714f2b (bug 705640) for build failures 2012-01-23 14:25:47 +00:00
Ben Turner
00f78a4ed3 Bug 705640 - 'Implement DOMError as defined in DOM 4'. r=mounir. 2012-01-23 03:02:54 -08:00
Ed Morley
0c97f287c4 Backout fcb3a7884fa9 (bug 705640) for build failures 2012-01-23 11:48:35 +00:00
Ben Turner
70d8b59c47 Bug 705640 - 'Implement DOMError as defined in DOM 4'. r=mounir. 2012-01-23 03:02:54 -08:00
John Schoenick
7bbce8eb51 Bug 718899 - Implement Cu.forceShrinkingGC / Cu.schedulePreciseShrinkingGC r=gwagner 2012-01-19 10:58:25 -08:00
Andrew McCreight
e33c1372a4 Bug 718029 - don't skip JSContexts with outstanding requests. r=smaug 2012-01-17 09:38:24 -08:00
Nathan Froyd
f427e14b9a Bug 711563 - compact function specs; r=jorendorff 2011-12-29 16:23:53 -05:00
Nathan Froyd
cae1a132cc Bug 711563 - flatten property and function names; r=jorendorff 2011-12-29 16:20:26 -05:00
Nathan Froyd
dd4958fcd7 Bug 711563 - more compact property and function tables; r=jorendorff 2011-12-29 15:18:41 -05:00
Nathan Froyd
deed107b93 Bug 711563 - reduce space required by hash entry chains; r=jorendorff 2011-12-16 14:49:53 -05:00
Justin Wood
94e66a942e Merge m-c tip to m-i 2012-01-15 05:29:24 -05:00
Ms2ger
877acb1064 Bug 717195 - Export dombindings.h; r=bholley 2012-01-15 09:13:12 +01:00
Ms2ger
6f32f32b0c Bug 677079 - Part aa: Expose sizeof(JSContext) in jsfriendapi.h; r=njn 2012-01-15 09:13:11 +01:00
Ms2ger
51d689e4f8 Bug 677079 - Part z: Move JS_CHECK_RECURSION to jsfriendapi.h; r=mjrosenb 2012-01-15 09:13:11 +01:00
Ms2ger
eabd14ca4c Bug 677079 - Part y: Move AutoIdVector to jsapi.h; r=evilpie 2012-01-15 09:13:11 +01:00
Ms2ger
93d155a6e0 Bug 677079 - Part x: Move AutoValueVector to jsapi.h; r=evilpie 2012-01-15 09:13:11 +01:00
Ms2ger
36d683ad8a Bug 677079 - Part v: Expose rt->compartments in jsfriendapi.h; r=jorendorff 2012-01-15 09:13:11 +01:00
Ms2ger
af15e55f33 Bug 677079 - Part u: Provide TriggerOperationCallbacksForActiveContexts in jsfriendapi.h; r=bhackett 2012-01-15 09:13:10 +01:00
Ms2ger
475d2d2ae7 Bug 677079 - Part t: Provide IsContextRunningJS in jsfriendapi.h; r=jorendorff 2012-01-15 09:13:10 +01:00
Ms2ger
ca8fadca6c Bug 677079 - Part s: Make JS_TRACER_INIT a function instead of a macro; r=billm 2012-01-15 09:13:10 +01:00
Ms2ger
fb1a9705e9 Bug 677079 - Part r: Provide AutoSkipConservativeScan in jsfriendapi.h; r=luke 2012-01-15 09:13:10 +01:00
Ms2ger
2fa4283d53 Bug 677079 - Part q: Expose gcLock in jsfriendapi.h; r=gal 2012-01-15 09:13:10 +01:00
Ms2ger
9cc9bf5989 Bug 677079 - Part p: Remove AutoLockJSGC in favour of js::AutoLockGC; r=bholley 2012-01-15 09:13:10 +01:00
Ms2ger
5760a0138f Bug 677079 - Part o: Expose setActivityCallback in jsfriendapi.h; r=gal 2012-01-15 09:13:10 +01:00
Ms2ger
dcc2192b9e Bug 677079 - Part n: Expose JSOPTION_UNROOTED_GLOBAL in jsfriendapi.h; r=gal 2012-01-15 09:13:09 +01:00
Ms2ger
073f6de1f2 Bug 677079 - Part m: Expose context's compartment in jsfriendapi.h; r=jorendorff 2012-01-15 09:13:09 +01:00
Ms2ger
5dd89f7622 Bug 677079 - Part l: Use the existing JSAPI for the global object for a context; r=bholley 2012-01-15 09:13:09 +01:00
Ms2ger
b9c45d68a5 Bug 677079 - Part k: Expose outstandingRequests in jsfriendapi.h; r=cdleary 2012-01-15 09:13:09 +01:00
Ms2ger
12e2f46eaf Bug 677079 - Part i: Expose errorReporter in jsapi.h; r=mrbkap 2012-01-15 09:13:09 +01:00
Ms2ger
ea843ee873 Bug 677079 - Part d: Move js_GetErrorMessage to jsfriendapi.h; r=jorendorff 2012-01-15 09:13:08 +01:00
Ms2ger
aec664aa8d Bug 677079 - Part b: Use existing JSAPI functions where those are available; r=bholley 2012-01-15 09:13:07 +01:00
Landry Breuil
1a664042ed Bug 717733 - Fix int64 types usage in js/xpconnect, build failure on OpenBSD
js/xpconnect/src/XPCJSRuntime.cpp:1881:
error: invalid conversion from 'PRInt64*' to 'int64_t*'
2012-01-12 16:56:02 -05:00
Ms2ger
7f96c272cf Bug 716357 - Fix license header in FilteringWrapper.cpp; r=gerv DONTBUILD 2012-01-11 17:12:21 +01:00
Ms2ger
27ed38a4d4 Bug 332648 - Part g: Move AutoIdArray to jsapi.h; r=evilpie 2012-01-11 09:23:09 +01:00
Ms2ger
06db6578d4 Bug 332648 - Part e: Move AutoArrayRooter to jsapi.h; r=evilpie 2012-01-11 09:23:09 +01:00
Ms2ger
25c1f65ab1 Bug 332648 - Part c: Move AutoObjectRooter to jsapi.h; r=evilpie 2012-01-11 09:23:08 +01:00
Ms2ger
d7850e8af7 Bug 332648 - Part b: Move AutoValueRooter to jsapi.h; r=evilpie
This patch also moves the MarkRuntime function into the JS namespace.
2012-01-11 09:23:08 +01:00
Ms2ger
4de4e729e4 Bug 714264 - Part c: Move IterateData / CollectCompartmentStatsForRuntime / GetExplicitNonHeapForRuntime to js/MemoryMetrics.h; r=njn
This patch also removes those APIs exposed in js/MemoryMetrics.h that aren't
used anymore.
2012-01-11 09:23:08 +01:00
Ms2ger
d8cd240512 Bug 714264 - Part b: Move CompartmentStats to MemoryMetrics.h; r=njn
The name member is implemented as a void*, because it needs to remain an
nsCString, and as such the logic to get the name also remains in XPConnect.
2012-01-11 09:23:08 +01:00
Ms2ger
b320983b67 Bug 714458 - Part c: Don't include jscntxt.h in xpcprivate.h; r=bholley
This removes the inclusion from xpcprivate.h, and adds the include to XPConnect
files that still need it, along with notes to clarify what these files need
from the include. These notes will be removed while fixing bug 677079.
2012-01-11 09:23:08 +01:00
Ms2ger
fab1325ed4 Bug 714458 - Part b: Provide the thread-related APIs xpcprivate.h needs; r=igor
This introduces a JS_GetCurrentThread to go with the existing
JS_GetContextThread, as well as a js::GetContextThread to get at the actual
JSThread object, and inlines the only use of JS_THREAD_ID.
2012-01-11 09:23:07 +01:00
Ms2ger
38fbde8026 Bug 714458 - Part a: Introduce JSAPI for JSContext's second private pointer; r=Waldo
JSContext currently has 2 private pointers, but the JSAPI only provides access
to one of them.
2012-01-11 09:23:07 +01:00
Ms2ger
123076fb33 Bug 715634 - Cleanup XPCJSContextStack; r=bholley 2012-01-11 09:23:07 +01:00
Ms2ger
73894ac8db Bug 714728 - Remove jsword/jsuword in favour of intptr_t/uintptr_t; r=Waldo 2012-01-11 09:23:05 +01:00
Andrew McCreight
9099508fe7 Bug 708322 - never traverse non-gray JS Objects. r=billm 2012-01-09 12:02:25 -08:00
Phil Ringnalda
a3ac43e4fa Back out 3ab1dcfb2218 and 46ae4bf4aaf4 (bug 622301) for Windows PGO bustage 2012-01-14 18:56:00 -08:00
Bobby Holley
8d2c4fbbc0 Bug 716167 - Add a release-mode assertion that XPConnect is never used off the main thread. r=mrbkap 2012-01-14 10:31:19 -08:00
Bobby Holley
588c8cc229 Bug 716167 - Only push null contexts in XPConnect for main thread events, and remove infrastructure from bug 326777. r=bz 2012-01-14 10:31:16 -08:00
Bobby Holley
e5f552adf4 Bug 622301 - Remove now-obsolete 'callee' parameter. r=mrbkap 2012-01-14 10:29:56 -08:00
Bobby Holley
5cde0ddc16 Bug 622301 - Don't use XPCWrappedNative::GetWrappedNativeOfJSObject in quickstub unwrapping. r=mrbkap 2012-01-14 10:29:56 -08:00
Michael Kohler
51e15f5815 Bug 711818 - MOZILLA_GUARD_OBJECT_NOTIFIER* should use a MOZ_ prefix to follow MFBT style 2012-01-10 00:29:30 -05:00
Ben Turner
c375cc74c4 Bug 674726 - WebTelephony. r=philikon+mounir, sr=sicking. Not part of the default build.
--HG--
extra : transplant_source : %1A%23%10d%88%B3%DA%87%C9%DD0%E6P%1Ct%AD%7D%80%B6%B4
2012-01-09 14:28:47 -08:00
Ed Morley
d57a89d468 Backout b1612e3ba9b9 & 668a56be0eef (bug 622301) for Dromaeo regressions 2012-01-07 14:17:54 +00:00
Bobby Holley
f46a9e22a3 Bug 622301 - Remove now-obsolete 'callee' parameter. r=mrbkap 2012-01-06 17:29:02 -08:00
Bobby Holley
727aeb5e13 Bug 622301 - Don't use XPCWrappedNative::GetWrappedNativeOfJSObject in quickstub unwrapping. r=mrbkap 2012-01-06 17:29:02 -08:00
Jeff Walden
1ecff3d221 Bug 713965 - Replace deleteGeneric (taking a jsid) with deleteByValue (taking a Value), and use the property-type-specific methods exclusively. r=bhackett
--HG--
extra : rebase_source : c9273f81996c755f6b3814895a4ce64f390f7c50
2011-12-28 16:33:20 -06:00
Bill McCloskey
5957dd4b9c Bug 714418 - Remove nsIXPCScriptable::DONT_SHARE_PROTOTYPE (r=bholley, sr=mrbkap) 2012-01-04 14:13:20 -08:00
Bill McCloskey
14477ceb3b Bug 714353 - Remove nsIXPCScriptable::Trace (r=mrbkap) 2012-01-04 14:13:15 -08:00
Bill McCloskey
095c6da986 Bug 714350 - Remove nsXPConnect::RestoreWrappedNativePrototype (r=mrbkap) 2012-01-04 14:13:08 -08:00
Luke Wagner
9505e967d8 Bug 714696 - rm lingering remains of tracer in js::Value (r=waldo)
--HG--
extra : rebase_source : c0d377c97e450b515941a5677eaafd5b23122d2c
2012-01-02 15:06:15 -08:00
Gabor Krizsanits
f2bac14884 Bug 677294 - part 2: need a way to create new JS scopes and run scripts against them (same compartment); r=mrbkap 2012-01-02 19:06:07 +01:00
Ms2ger
1f37b86a6b Bug 710805 - Assert validity in xpc_qsBasicString; r=jst 2012-01-02 19:05:19 +01:00
Ms2ger
2db789079c Bug 709086 - Don't use JS_GetParent in mozJSSubScriptLoader::LoadSubScript; r=jorendorff 2012-01-02 19:05:19 +01:00
Ms2ger
29d457f80c Bug 714057 - Remove uintn users from XPConnect; r=bholley+khuey 2012-01-02 19:05:19 +01:00
Ms2ger
51f59f0021 Bug 713645 - Remove superfluous inclusions of jscntxt.h; r=luke 2012-01-02 19:05:19 +01:00
Bill McCloskey
0e0533464b Bug 714363 - Remove XPCWrappedNativeScope::mPrototypeJSFunction (r=bholley) 2012-01-01 14:48:15 -08:00
Nicholas Nethercote
13e0ce90ef Bug 708159 - Avoid unnecessary work done by multi-reporters in nsMemoryReporterManager::GetExplicit. r=jlebar,bent. 2011-12-12 19:04:12 -08:00
Boris Zbarsky
5ea84e0dfe Backing out bug 707717 because it seems to be a perf hit, not a perf win. 2011-12-28 16:22:05 -05:00
Matt Brubeck
442a1b085f Merge mozilla-central and mozilla-inbound 2011-12-28 11:17:19 -08:00
Josh Matthews
a18ebbe4ab Bug 463122 - Propagate mozJSComponentLoader exceptions that occur while executing the script. r=mrbkap 2011-12-28 11:55:11 -05:00
Ms2ger
08d1075fb2 Bug 713550 - Move Base64 code on nsXPConnect to XPCOM / xpcpublic.h; r=bholley+khuey 2011-12-28 09:13:38 +01:00
Ms2ger
bf9d539b9d Bug 713340 - Fix jsShell_ErrorFormatString array lengths; r=luke 2011-12-28 09:13:37 +01:00
Ms2ger
285970686c Bug 713553 - Remove GetRTStringByIndex; r=bholley 2011-12-28 09:13:37 +01:00
Ms2ger
3b98653c7b Bug 713554 - Remove xpc_SameScope declaration; r=bholley 2011-12-28 09:13:37 +01:00
Olli Pettay
c2e7d2b30f Bug 710380 - IndexedDB could use the dictionary reader, r=khuey 2011-12-27 20:01:28 +02:00
Boris Zbarsky
5e4f813534 Bug 707717. Don't dynamically mutate the proto chains of DOM prototypes. r=peterv 2011-12-26 11:31:07 -05:00
Phil Ringnalda
30796bb59b Merge m-i <-> m-c 2011-12-24 21:50:23 -08:00
Ms2ger
3483b813ea Bug 711859 - Add an IsObjectInContextCompartment API; seems-better-than-the-alternative-all-things-considered=Waldo 2011-12-24 09:28:55 +01:00
Ms2ger
6aaac66913 Bug 711748 - Remove FIT_U32 from XPCConvert; r=bholley 2011-12-24 09:28:39 +01:00
Ms2ger
8ab0c6de34 Bug 712055 - Remove xpc_qsInt32ToJsval/xpc_qsUint32ToJsval; r=jorendorff 2011-12-24 09:28:14 +01:00
Ms2ger
d78a953c36 Bug 711826 - Remove nsJSRuntimeServiceImpl declaration; r=bholley 2011-12-24 09:28:03 +01:00
Ms2ger
ebb23ed2ef Bug 692277 - Part b: Remove js/src from xpconnect LOCAL_INCLUDES; r=luke 2011-12-24 09:27:51 +01:00
Ms2ger
474f03a4a7 Bug 692277 - Part a: Introduce an unstable public API for JS memory measurements to be used in XPCJSRuntime; r=njn sr=dmandelin 2011-12-24 09:27:39 +01:00
Ms2ger
99e36e1123 Bug 711240 - Part b: Expose xpc_qsStringToJsval publicly; r=bholley 2011-12-24 09:27:04 +01:00
Ms2ger
2a9fde8d7d Bug 711240 - Part a: Expose BAD_TLS_INDEX in xpcpublic.h; r=bholley 2011-12-24 09:26:34 +01:00
Ms2ger
86227c89ab Bug 711404 - Part b: Remove xpc_qsDoubleToUint64; r=bholley 2011-12-24 09:26:18 +01:00
Makoto Kato
e75b93afae Bug 711404 - Part a: Correctly handle unsigned long long as PRUint64 instead of PRInt64; r=bholley 2011-12-24 09:25:54 +01:00
Ms2ger
e2dcfa6ed5 Bug 712649 - Components.utils.getWeakReference(null) should fail silently; r=bholley 2011-12-24 09:20:04 +01:00
Olli Pettay
3851d96683 Bug 709569, a tool for webidl dictionary-like interfaces, r=khuey,mrbkap 2011-12-24 00:13:46 +02:00
Jeff Walden
841701c767 Bug 711647 - Add MOZ_DELETE to a bunch of deliberately-not-implemented methods across the tree. r=dbaron
--HG--
extra : rebase_source : 507006c0f099da6851b585d2062267d285978ad7
2011-12-16 14:42:07 -05:00
Bobby Holley
cb7c5d7fc2 Bug 712858 - Remove lingering XPT_TDP_POINTER uses in XPConnect. r=mrbkap 2011-12-23 16:22:44 -08:00
aceman
eb3ebc1fc0 Bug 711721 - merge nsIScriptError and nsIScriptError2 interfaces; r=neil, sr=bzbarsky 2011-12-21 16:51:29 -05:00
Ben Turner
ae2da55496 Bug 712448 - 'Slim wrappers do not use deferred release mechanism'. r=mrbkap. 2011-12-20 17:42:51 -05:00
Ed Morley
6b3e3d80a0 Merge last PGO-green changeset from mozilla-inbound to mozilla-central 2011-12-20 11:15:11 +00:00
Jason Duell
e1e683a5e9 Bug 695635: Unprefix websockets. r=sicking, sr=smaug
--HG--
rename : content/base/public/nsIMozWebSocket.idl => content/base/public/nsIWebSocket.idl
2011-12-20 00:20:12 -08:00
Marco Bonardo
951b7a56f6 Merge last green PGO changeset from mozilla-inbound to mozilla-central 2011-12-19 12:47:41 +01:00
Phil Ringnalda
595ce8403f Bug 695345 - Bring back ISO8601DateUtils.jsm, a=akeybl 2011-12-18 18:50:13 -08:00
Matt Brubeck
dde6ccdccc Merge mozilla-central to mozilla-inbound 2011-12-18 08:22:53 -08:00
Ms2ger
09490d5127 Bug 708330 - Use IDL for Components.utils.getWeakReference; r=bholley 2011-12-18 11:11:56 +01:00
Ms2ger
fe9b843007 Bug 708326 - Use IDL for Components.utils.forceGC; r=bholley 2011-12-18 11:11:23 +01:00
Ms2ger
21ffe5b481 Bug 708253 - Use IDL for Components.(utils.)reportError; r=bholley 2011-12-18 11:10:59 +01:00
Ms2ger
18a1378840 Bug 705324 - Remove nsAXPCNativeCallContext::{GetRetValPtr,GetReturnValueWasSet,SetReturnValueWasSet}; r=bholley sr=bz 2011-12-18 11:09:58 +01:00
Ms2ger
9dce0a682b Bug 705355 - Use IDL for Components.utils.evalInSandbox; r=bholley 2011-12-18 11:09:56 +01:00
Ms2ger
b69c913b12 Bug 705188 - Use IDL for mozIJSSubScriptLoader::LoadSubScript, {xpcIJSModuleLoader,nsIXPCComponents_Utils}::Import; r=bz 2011-12-18 11:09:16 +01:00
Ms2ger
29d2d0e19b Bug 705344 - Use IDL for Components.(utils.)lookupMethod; r=bholley 2011-12-18 11:08:04 +01:00
Ms2ger
070299e0ab Bug 707576 - Remove nsIDOMNSElement; r=smaug 2011-12-18 11:06:23 +01:00
Andrew McCreight
198963afc3 Bug 711616 - QI wrapped native weak map keys to nsINode. r=jst 2011-12-17 22:11:04 -08:00
John Schoenick
1c874917cd Bug 687679 - Rename JS_CompileFile to JS_CompileUTF8File, fix users. r=jorendorff,jst 2011-12-16 11:08:59 -08:00
Jeff Walden
7f153524ef Bug 711672 - Break mfbt's dependency on jstypes.h by moving various API macros out of JS and into mfbt. r=luke, r=cjones
--HG--
extra : rebase_source : f18993e1eec1a5e5bcdb9cd97fa7d7c6ad261e2c
2011-12-13 14:26:58 -05:00
Andrew McCreight
db59eae076 Bug 710492 - add special cycle collector shape tracing path. r=bhackett 2011-12-19 10:24:56 -08:00
Nicholas Nethercote
1c1d565232 Bug 709653 - Fix GC heap memory reporters. r=bhackett.
--HG--
extra : rebase_source : 6805671750bd6a9e9661e70832a3837d4064f6ea
2011-12-11 21:21:18 -08:00
Nicholas Nethercote
8f335f567c Bug 707865 - Convert nsTArray::SizeOf() to nsTArray::SizeOfExcludingThis(). r=jlebar.
--HG--
extra : rebase_source : d802d58bc7dedda2490878793923adc0ab55f779
2011-12-15 14:59:53 -08:00
Jeff Walden
98dd456fc1 Bug 711799 - Fix a bunch of initializing-pointer-from-boolean warnings. r=dholbert
--HG--
extra : rebase_source : 4a5d03b10ad8ac4eaff222037ba3400a26e7cf55
2011-12-18 01:00:47 -05:00
Jeff Walden
9d7141da5c Add MOZ_OVERRIDE to CrossOriginWrapper functions. No bug (but sort of r=luke from bug 708735 :-) )
--HG--
extra : rebase_source : d0bdbc8c031457a3a9f7f8cc82d141e0d83883f4
2011-12-15 14:32:25 -05:00
aceman
e03bb0b7ab Bug 122213 - Display time and date of messages in toolkit's Error Console. r=neil sr=bz 2011-12-17 05:22:26 +01:00
Doug Sherk
f8cc305c99 Bug 708207: implement WebGL's getShaderPrecisionFormat r=bjacob 2011-12-16 13:11:59 -08:00
Ms2ger
c3c3bdba73 Backed out changeset ba447ace2594 (bug 687679) for bustage. 2011-12-16 21:17:16 +01:00
John Schoenick
a355d623f2 Bug 687679 - Rename JS_CompileFile to JS_CompileUTF8File, fix users. r=jorendorff,jst 2011-12-16 11:08:59 -08:00
Jeff Walden
87d3f92e61 Bug 708735 - Use <stdint.h> types in JSAPI and throughout SpiderMonkey. Continue to provide the {u,}int{8,16,32,64} and JS{Uint,Int}{8,16,32,64} integer types through a single header, however, for a simpler backout strategy -- and also to ease the transition for embedders. r=timeless on switching the jsd API to use the <stdint.h> types, r=luke, r=dmandelin 2011-12-08 22:54:10 -05:00
Andrew McCreight
3366dba944 Bug 680937, part 3 - implement and set preserve wrapper callback. r=jst 2011-12-15 17:45:49 -08:00
Andrew McCreight
64385f889e Bug 680937, part 2 - Add native wrapper preservation hook, call it in WeakMap_set. r=billm 2011-12-15 17:45:21 -08:00
Bobby Holley
84032122fb Bug 711203 - enable XPConnect wstring test. r=khuey 2011-12-15 13:27:42 -08:00
Andrew McCreight
59ca827dee Bug 709162 - crash test for cycle collector dumping. rs=bholley a=mbrubeck 2011-12-14 16:02:12 -08:00
Andrew McCreight
07887213c4 Bug 710761 - test if CC listener begin fails, don't call listener again. rs=bholley 2011-12-14 15:56:37 -08:00
Andrew McCreight
e32959a25b Bug 709160 - fix ObjShrink fallout in nsXPConnect::Traverse CC printing code. r=luke 2011-12-14 15:56:37 -08:00
Andrew Quartey
faa8be8d82 Bug 706010 - Remove NS_SPECIALIZE_TEMPLATE and HAVE_CPP_MODERN_SPECIALIZE_TEMPLATE_SYNTAX; r=khuey a=cleanup/removal 2011-12-13 14:17:59 +00:00
Ms2ger
ac9df022f7 Bug 709603 - Remove unused variables 'type' in CallMethodHelper::Get{ArraySize,InterfaceType}FromParam; r=bholley a=ehsan 2011-12-13 09:49:31 +11:00
Nicholas Nethercote
688c469bc9 Bug 704400 - Implement --enable-dmd. r=khuey. 2011-12-08 19:09:36 -08:00
Mike Hommey
57f9bdde28 Bug 695843 part 9 - Use FileLocations in the component manager. r=bsmedberg 2011-11-08 18:10:51 +01:00
Mike Hommey
1c5ea5be3e Bug 695843 part 8 - Properly handle jar-in-jars when importing modules. r=mrbkap 2011-12-08 11:03:36 +01:00
Mike Hommey
1d5e489323 Bug 695843 part 7 - Use the URI string as the key for the various mozJSComponentLoader hashtables. r=mrbkap 2011-11-08 18:08:49 +01:00
Bill McCloskey
b931f019bd Bug 707051 - Change MarkChildren for shapes (r=igor) 2011-12-07 09:52:16 -08:00
Blake Kaplan
dc51d7dcc5 Bug 708215 - Report errors from the safe JS context. r=bent 2011-12-07 18:12:20 +08:00
Bobby Holley
9171552a19 Bug 706301 - Tests. r=mrbkap 2011-12-06 11:05:26 -08:00
Bobby Holley
bbdbbf662a Bug 706301 - Don't cache own properties on XrayProxy. r=mrbkap 2011-12-06 11:05:26 -08:00
Nicholas Nethercote
6c8107ba0c Bug 704723 - Add memory reporter for XPConnect. r=mrbkap. 2011-12-05 14:24:28 -08:00
Ed Morley
1ffbd8940f Merge mozilla-central and mozilla-inbound 2011-12-04 15:04:54 +00:00
Ms2ger
18fa4b8800 Bug 705357 - Use IDL for Components.utils.getGlobalForObject; r=bholley 2011-12-03 22:50:16 +01:00
Ms2ger
7835d6610a Bug 705333 - Use IDL for nsJSCID::{CreateInstance,GetService}; r=bholley 2011-12-03 22:50:16 +01:00
Kyle Huey
a441b10233 Merge b-s to m-c. 2011-12-03 16:27:21 -05:00
Brian Hackett
356489907c Merge MC -> JM 2011-12-03 10:34:26 -08:00
Antti Haapala
55185ebf5e Bug 699156: Support TypedArrays in XPConnect. r=bholley,evilpie 2011-12-03 09:33:20 -05:00
Brian Hackett
d3db56074b Merge MC -> JM 2011-12-01 11:51:09 -08:00
Brian Hackett
4fa421bf15 Merge MC -> JM 2011-11-30 12:45:27 -08:00
Brian Hackett
73956e1912 Merge MC -> JM 2011-11-26 15:03:20 -08:00
Brian Hackett
586dafd5c1 Add about:memory reporters for per compartment shape tables, bug 704372. 2011-11-21 20:29:05 -05:00
Brian Hackett
9a1b4e584a Merge mozilla-central and mozilla-inbound 2011-12-03 14:36:54 -08:00
Makoto Kato
c012763b5c Bug 655658 - NetUtil.readInputStreamToString should have aCharset argument as optional. r=sdwilsh, sr=bz 2011-11-25 11:23:41 +09:00
Andrew McCreight
4453584b8b Bug 668855, part 6: test weak maps and the cycle collector. r=gal 2011-11-24 07:35:57 -05:00
Brian Hackett
299ac2bf87 Merge MC -> JM 2011-11-18 18:02:40 -08:00
Brian Hackett
2f44413ef8 Mark uncacheable prototypes on objects whose prototype has dynamically changed, bug 703047. 2011-11-18 13:28:07 -08:00
Brian Hackett
fdac79a1f2 Avoid shape changes on XPConnect wrapper prototype changes, bug 703047. 2011-11-16 12:52:47 -08:00
Brian Hackett
57fdfc58fd Clear XPCWrappedNativeScope fields to avoid accessing freed arenas during destruction, no bug. r=billm 2011-11-14 17:06:53 -08:00
Ed Morley
1c87228e23 Merge last green changeset of mozilla-inbound to mozilla-central 2011-11-16 11:02:43 +00:00
Ms2ger
d2ea6246bf Bug 672796 - Move MOZILLA_GUARD_OBJECT_NOTIFIER_* out of AutoRestore.h; r=khuey 2011-11-16 08:50:19 +01:00
Ms2ger
b97f7f7801 Bug 702106 - Remove xpc_CloneJSFunction; r=bholley 2011-11-16 08:50:18 +01:00
Ms2ger
2424957995 Bug 701735 - xpc_qsJsvalToWcharStr shouldn't const_cast; r=bz 2011-11-16 08:50:18 +01:00
Steve Fink
d069c50175 Bug 700202 - Propagate exceptions from ConstructSlimWrapper (r=bholley)
--HG--
extra : rebase_source : 8ce6d12e100a2e3639c4d1fddbadee25e6dd12cf
2011-11-21 09:28:19 -08:00