Commit Graph

1211 Commits

Author SHA1 Message Date
Steve Fink
52611d1e2d Bug 785167 - Root while allowing cx to be NULL for some typed array APIs. r=terrence
--HG--
extra : rebase_source : 41565e76dc534deb75e10ef65429e5bb9793f47f
2012-08-29 12:29:18 -07:00
Boris Zbarsky
db146aed28 Bug 765163 followup. Don't write DictionaryHelpers.h while generating DictionaryHelpers.cpp. r=build-bustage for checkin to CLOSED TREE 2012-07-22 01:17:38 -04:00
Jonas Sicking
690071fc50 Bug 774585: Rename getCodebasePrincipal to getSimpleCodebasePrincipal since the behavior has semantically changed. r=mounir 2012-07-21 00:29:40 -07:00
Jonas Sicking
ba50571c17 Bug 774585: Fix xpc-sandbox creation code to create the correct principals. r=mrbkap 2012-07-21 00:29:40 -07:00
David Anderson
596d3144a5 Merge from mozilla-central. 2012-07-12 13:23:26 -07:00
David Anderson
86f0b2a6d8 Merge from mozilla-central.
--HG--
rename : editor/libeditor/base/DeleteElementTxn.cpp => editor/libeditor/base/DeleteNodeTxn.cpp
rename : gfx/layers/basic/BasicLayers.cpp => gfx/layers/basic/BasicBuffers.cpp
rename : gfx/layers/basic/BasicLayers.cpp => gfx/layers/basic/BasicBuffers.h
rename : gfx/layers/basic/BasicLayers.cpp => gfx/layers/basic/BasicCanvasLayer.cpp
rename : gfx/layers/basic/BasicLayers.cpp => gfx/layers/basic/BasicColorLayer.cpp
rename : gfx/layers/basic/BasicLayers.cpp => gfx/layers/basic/BasicContainerLayer.cpp
rename : gfx/layers/basic/BasicLayers.cpp => gfx/layers/basic/BasicContainerLayer.h
rename : gfx/layers/basic/BasicLayers.cpp => gfx/layers/basic/BasicImageLayer.cpp
rename : gfx/layers/basic/BasicLayers.cpp => gfx/layers/basic/BasicLayerManager.cpp
rename : gfx/layers/basic/BasicLayers.cpp => gfx/layers/basic/BasicLayersImpl.cpp
rename : gfx/layers/basic/BasicLayers.cpp => gfx/layers/basic/BasicLayersImpl.h
rename : gfx/layers/basic/BasicLayers.cpp => gfx/layers/basic/BasicThebesLayer.cpp
rename : gfx/layers/basic/BasicLayers.cpp => gfx/layers/basic/BasicThebesLayer.h
rename : js/src/jsobj.cpp => js/src/builtin/Eval.cpp
2012-07-10 19:45:14 -07:00
Aryeh Gregor
6edbec8406 Bug 778681 part 6 - Fix some misuses of bool as nsresult; r=bz 2012-07-27 16:51:50 +03:00
Andrew McCreight
e82547c80d Bug 761831 - Be less ambitious in GetMemberInfo. r=bholley 2012-07-18 13:28:58 -07:00
Bobby Holley
2d242e094b Bug 774245 - Remove unnecessary memset. r=mccr8 2012-07-18 14:56:54 +02:00
Bobby Holley
b4fc3bcfe8 Bug 774245 - Tests. r=mrbkap 2012-07-18 13:51:28 +02:00
Bobby Holley
0a7b5241fb Bug 774245 - Reimplement LookupMethod. r=mrbkap 2012-07-18 13:51:28 +02:00
Bobby Holley
217bf3edb0 Bug 774245 - Add WrapperFactory and XrayWrapper machinery to allow same-compartment Xray wrapping. r=mrbkap 2012-07-18 13:51:28 +02:00
Joshua Cranmer
e1cdfe2f05 Bug 773637 - Kill NS_SCRIPTABLE annotations, Part 1: Remove NS_*PARAM annotations. r=ehsan
--HG--
extra : rebase_source : a0b4bc50fece36d9a90fed61431635948bfa33b5
2012-07-06 15:14:07 -05:00
Ehsan Akhgari
ed5670e57a Bug 776660 - Return null from EnsureExpandoObject instead of false; r=bholley 2012-07-23 15:58:41 -04:00
Bobby Holley
16e4b5b871 Bug 772288 - Waive Xray for target objects in Cu.import. r=mrbkap 2012-07-23 16:47:18 +02:00
Matthew Noorenberghe
649ea34449 Bug 772288 - Tests. r=bholley 2012-07-23 16:47:18 +02:00
Bobby Holley
6761975fd3 Bug 773962 - Tests. r=mrbkap 2012-07-23 15:51:19 +02:00
Bobby Holley
75f3cd7c86 Bug 773962 - Introduce Cu.recomputeWrappers. r=mrbkap
It's sort of annoying to add this API just for tests, but there's not another
great way to trigger a compartment-wide transplant with Xray waivers
(since setting document.domain doesn't recompute wrappers to/from chrome, and
Xray waivers will stop being accessible to content entirely in bug 742444).
2012-07-23 15:51:18 +02:00
Bobby Holley
3c7a723a9f Bug 773962 - Fix up waivers after transplanting. r=mrbkap 2012-07-23 15:51:18 +02:00
Bobby Holley
c85756fcc0 Bug 773962 - Refactor Xray waiving logic to allow simple lookups in the waiver map without creating a waiver. r=mrbkap 2012-07-23 15:51:18 +02:00
Mike Hommey
d3b70db257 Bug 775424 - Make cycle collection vtables rodata. r=smaug 2012-07-23 07:42:23 +02:00
Chris Jones
17dd1fb32e Bug 774139, part 0: Rename 'NO' typename because that's a constant in Objective-C++. r=bz 2012-07-17 16:01:56 -07:00
Gabor Krizsanits
0b4bc96f9f Bug 769273 - part4: avoiding innerization in NukeCrossCompartmentWrappers. r=bholley 2012-07-17 17:51:21 +02:00
Ms2ger
cb4d106015 Bug 716822 - Move attributes and methods on nsIDOMNSEvent to nsIDOMEvent; r=smaug 2012-08-04 09:44:00 +02:00
Ms2ger
cec5e3f75e Bug 780111 - Share code with new DOM bindings for primitive conversions in XPCConvert::JSData2Native; r=bholley 2012-08-04 09:29:18 +02:00
Ms2ger
1ac89f2246 Bug 780108 - Get rid of the double switch in XPCConvert::JSData2Native; r=bholley 2012-08-04 09:28:45 +02:00
Mike Hommey
c1b35e7b2a Bug 774032 bonus - Use @DEPTH@ and @relativesrcdir@ in Makefile.in. r=ted 2012-08-04 20:26:44 +02:00
Ed Morley
4eb11bee72 Revert inbound to 3d5d1daa2505 to stop OS X M5 failures (backout not clean/could have been a bad merge) on a CLOSED TREE 2012-08-04 18:05:15 +01:00
Ms2ger
e6463200a3 Merge m-c to m-i. 2012-08-04 13:02:15 +02:00
Mike Hommey
be451c22dc Backout changeset 2ef51674316a (bug 774032 bonus) for various Mochitest bustages on a CLOSED TREE 2012-08-04 10:38:41 +02:00
Ms2ger
b927c10310 Bug 716822 - Move attributes and methods on nsIDOMNSEvent to nsIDOMEvent; r=smaug 2012-08-04 09:44:00 +02:00
Ms2ger
3c30d568f9 Bug 780111 - Share code with new DOM bindings for primitive conversions in XPCConvert::JSData2Native; r=bholley 2012-08-04 09:29:18 +02:00
Ms2ger
16aadc8dec Bug 780108 - Get rid of the double switch in XPCConvert::JSData2Native; r=bholley 2012-08-04 09:28:45 +02:00
Mike Hommey
e79d87471e Bug 774032 bonus - Use @DEPTH@ and @relativesrcdir@ in Makefile.in. r=ted 2012-08-04 08:48:56 +02:00
Eric Faust
b1b08f985c Bug 742188 - Implement ToInt64 and ToUint64 per the WebIDL standard. (r=jorendorff) 2012-08-03 15:15:04 -07:00
Wes Johnston
7fe524d43a Bug 777706 - Backout new dom bindings for touchlists. r=smaug 2012-08-02 10:41:42 -07:00
Jason Orendorff
9bcd8b30c0 Bug 725907 - for-of improvements, part 3: Implement .iterator() for arraylike DOM objects. r=bzbarsky. 2012-07-03 16:34:56 -05:00
Mounir Lamouri
a849186201 Bug 758258 - Part 2 - Add GetExtendedOrigin(), NO_APP_ID and UNKNOWN_APP_ID. r=sicking 2012-07-18 21:25:19 -07:00
Mounir Lamouri
8b371aed8a Bug 327244 (2/2) - Remove nsIScriptSecurityManager::CheckLoadURI(). r=sicking,jlebar 2012-07-18 15:27:02 -07:00
Mounir Lamouri
ff9d427dc7 Bug 327244 (1/2) - Remove nsIScriptSecurityManager::CheckLoadURIStr(). r=sicking 2012-07-19 10:49:17 -07:00
Justin Lebar
2170f814d5 Bug 773980 - Add Components.utils.isDeadWrapper. r=bholley
--HG--
rename : js/xpconnect/tests/Makefile.in => js/xpconnect/tests/browser/Makefile.in
2012-07-19 12:39:43 -04:00
Terrence Cole
8778e3d28d Bug 772292 - Convert JSObject2WrappedJSMap to a new-style HashTable; r=mrbkap
--HG--
extra : rebase_source : a51ae61fde535ba18e84bec484509099101247ab
2012-07-07 16:11:54 -07:00
Jim Mathies
031c062b8b Bug 762519 - Send xpconnect stack dump output and javascript dump output to the win debugger when attached. r=ehsan, mrbkap 2012-07-19 09:58:44 -05:00
Makoto Kato
2a4902ee1b Bug 771401 - Change PRTime in IDL to signed long long. r=bholley sr=bsmedberg 2012-07-19 18:53:30 +09:00
Ed Morley
bb507d18ac Backout ea6db8f420c0 (bug 770831), b51c79ee0883 (bug 774957), 020f6ed5958b (bug 758258), 11d8e19e1fca (bug 758258), 707fc51bfe2e (bug 775354), 489d944a6fe6 (bug 327244), be7df3c9d50f (bug 327244) for m-oth orange 2012-07-19 08:29:48 +01:00
Mounir Lamouri
147b74c44a Bug 758258 - Part 2 - Add GetExtendedOrigin(), NO_APP_ID and UNKNOWN_APP_ID. r=sicking 2012-07-18 21:25:19 -07:00
Mounir Lamouri
30741d2c3a Bug 327244 (2/2) - Remove nsIScriptSecurityManager::CheckLoadURI(). r=sicking,jlebar 2012-07-18 15:27:02 -07:00
Mounir Lamouri
2b7700d07d Bug 327244 (1/2) - Remove nsIScriptSecurityManager::CheckLoadURIStr(). r=sicking 2012-07-18 13:35:15 -07:00
Nathan Froyd
5b30baa4c3 Bug 370750 - consolidate mochitest files installation; r=glandium
With assistance on the patch from Ms2ger, Waldo, and Mossop.
2012-07-03 16:49:02 -04:00
Eddy Bruel
e445b70867 Bug 703537: Rename AbstractWrapper to IndirectWrapper + adding comments; r=bholley 2012-07-08 19:04:14 +02:00
David Anderson
2d5c5bdcf3 Merge from mozilla-central. 2012-06-28 15:17:18 -07:00
Gabor Krizsanits
ce3fab5c93 Bug 769273 - part3: Cu.nukeSandbox. r=bholley 2012-07-17 17:41:07 +02:00
Peter Van der Beken
629bad9698 Fix for bug 769464 (Check mDOMObjectIsISupports when unwrapping). r=bz.
--HG--
extra : rebase_source : 26d0508b8a11d75164ae4b27af8c64e8845166f9
2012-07-16 16:52:59 +02:00
Ehsan Akhgari
5a262d0761 Bug 749101 - Move window.performance to the new DOM bindings; r=bzbarsky 2012-07-16 21:42:18 -04:00
Nicholas Nethercote
54e1cc8b68 Bug 772615 (part 2) - Enter compartments before calling GetNativeOfWrapper() in the JS memory reporter. r=bholley. 2012-07-15 19:59:47 -07:00
Nicholas Nethercote
1603d4d6fc Bug 772615 (part 1) - Use the safe JSContext in the JS memory reporter. r=bholley. 2012-07-15 21:03:27 -07:00
David Anderson
4dc2835558 Merge from mozilla-central. 2012-06-27 11:00:48 -07:00
Bill McCloskey
3970ae5992 Bug 765065 - Annotation for crash reports: "Are we GCing?" (r=bsmedberg) 2012-08-15 10:47:51 -07:00
Dave Townsend
2e2b4aca5e Backing out bug 761620 due to Add-on SDK test failures. 2012-08-15 10:31:21 -07:00
Aryeh Gregor
3304e571cb Bug 782252 - Cast NS_ENUMERATOR_FALSE to nsresult; r=ehsan 2012-08-07 17:54:44 +03:00
Eddy Bruel
4cc46d10d1 Bug 70357 - Add Wrapper base class; r=bholley 2012-06-28 04:10:37 +02:00
Terrence Cole
340bde0157 Bug 785524 - Remove JS_MakeStringImmutable; it is no longer necessary; r=luke
--HG--
extra : rebase_source : bf9e007733e5f4c6ab3fcc618c3fcff3b2fb69fc
2012-08-24 15:00:38 -07:00
Andrew McCreight
671b32897c Bug 749366 - Remove mostly bogus size arg from CC callbacks. r=smaug 2012-08-27 10:41:04 -07:00
Gabor Krizsanits
5138045eff Bug 763897 - Incorrect behaviour of mozMatchesSelector.call through xray; r=bholley 2012-08-27 15:15:20 +02:00
Gabor Krizsanits
9a223560e1 Bug 738244 - Supporting DOM specific collection properties through xray wrappers; r=mrbkap 2012-08-27 15:06:34 +02:00
Benjamin Peterson
d76d19dc3d Bug 781035 - Use the C++ JS compile API in more places. r=jorendorff sr=jst 2012-08-27 08:04:37 -04:00
Jason Orendorff
309ca80b4b Bug 778851 - Disable E4X in content by default. 2012-08-26 09:04:33 -05:00
Peter Van der Beken
bb71680e0a Bug 753517 part 5. Enable the list IC for new DOM bindings too. r=bz. 2012-08-24 09:32:26 -07:00
Boris Zbarsky
efc50e4b0d Bug 753517 part 4. Set up auto-generation of CSS2Properties.webidl from nsCSSPropList.h and enable Paris bindings for CSSStyleDeclaration and CSS2Properties. r=khuey,peterv,dbaron 2012-08-23 21:08:09 -07:00
Andrew McCreight
86e263762f Bug 750570, part 1 - lift UnmarkIfPurple to the root CC participant. r=glandium,smaug
All CC classes are potentially cycle collectable, so we need
to implement this function on the participant for all CC classes.
2012-08-24 09:50:06 -07:00
Luke Wagner
c3caa3a90c Fix backout to account for infallible-JSAutoCompartment change on a CLOSED TREE (no bug, r=bustage) 2012-08-23 22:12:21 -07:00
Matt Brubeck
424ea88da6 Back out 670c8a2695b3 (bug 771354), 134557d57e6e 4ad52e488977 (bug 774607), and...
036eb8c2a08a d4d36e3b948f 35334e820632 6bd07fd5147d d49e7c0d762c 407f19deb14c d84551808abb (bug 774633)
on a CLOSED TREE
2012-08-23 21:34:27 -07:00
Bobby Holley
48fc85f058 Bug 780370 - Remap objects from standard prototypes even if they're explicitly exposed. r=mrbkap 2012-08-23 19:07:14 -07:00
Bobby Holley
b2b8ff55f2 Bug 780370 - Clarify the compartment situation in ChromeObjectWrapper. r=mrbkap
Not sure what I was thinking before. We should always be in the compartment of the wrapper here.
2012-08-23 19:07:13 -07:00
Bobby Holley
552229b617 Bug 758344 - Make ContextHolder implement nsIScriptContextPrincipal. r=mrbkap 2012-06-26 22:54:18 +02:00
Nicholas Nethercote
daf67b675e Bug 711130 (part 6) - Improve the measurement of decommitted GC memory. r=terrence.
--HG--
extra : rebase_source : ad344b58798cb6837a59f3d48f57880b036c300e
2012-06-25 17:09:00 -07:00
Nicholas Nethercote
688fb0d230 Bug 711130 (part 5) - Overhaul the "other measurements" measurements for JS memory consumption. r=terrence.
--HG--
extra : rebase_source : 492af75618c40eb2a92be2756f67db93834729cf
2012-06-25 17:08:59 -07:00
Nicholas Nethercote
722acb79a1 Bug 711130 (part 4) - Treeify the non-compartment gc-heap-XYZ measurements. r=terrence.
--HG--
extra : rebase_source : ba3ff507e05829ad574e7283c7f3ab48b2416ac1
2012-06-25 17:06:50 -07:00
Nicholas Nethercote
d8c8dc869d Bug 711130 (part 3) - Use consistent names for reports of unused JS memory. r=terrence.
--HG--
extra : rebase_source : a8e5a7d77355539f84a7fbb4d312fa66d2fe5ba6
2012-06-25 17:06:50 -07:00
Nicholas Nethercote
28934b1f94 Bug 711130 (part 2) - Merge "arena/unused" and "arena/padding" into "arena-admin". r=terrence.
--HG--
extra : rebase_source : 1c9d318e86eb27c2e40f2ef95554afefb8a6c653
2012-06-25 17:06:50 -07:00
Boris Zbarsky
9fa48b7247 Bug 766796. Make IDL conversions to 64-bit ints treat NaN and Infinity as 0 instead of whatever the compiler decides to do in that undefined-behavior case. r=peterv 2012-06-25 23:37:47 -04:00
Ryan VanderMeulen
7ad11464cb Merge m-c to inbound. 2012-07-20 17:37:53 -04:00
Olli Pettay
205c93c929 Bug 765947 - Preprocess the config file for generated events, r=khuey 2012-07-20 20:19:40 +03:00
Olli Pettay
2280255d92 Bug 765766 - Convert more event interface implementations to be autogenerated, r=jst 2012-07-20 19:58:28 +03:00
Olli Pettay
c992398490 Bug 765163 - Implement code generator for simple DOM events, r=jst,khuey 2012-07-20 19:42:08 +03:00
Benjamin Peterson
37bb2798f1 Bug 761723 - Add test for chrome toSource. r=bz
--HG--
extra : rebase_source : e4e41b30d2bdb73c8f48dd01a1ad8b974604978c
2012-07-20 20:20:09 +02:00
Benjamin Peterson
310dccbb29 Bug 761723 - Add memory reporting for script sources. r=njn
--HG--
extra : rebase_source : 5f2cdb960f29829e9da19bbe137a810f456cc7fc
2012-07-20 20:18:08 +02:00
Nicholas Nethercote
25db739379 Bug 773533 (part 1) - Skip XBL nodes when looking for orphan DOM nodes. r=mccr8,smaug.
--HG--
extra : rebase_source : 0dd533b41b1ebd73bcd83852c01cd9a64adbc26a
2012-07-18 21:10:36 -07:00
Alex Crichton
f491495a41 Bug 761261 - Add JS profiling to SPS (r=luke,ehsan)
--HG--
extra : rebase_source : 328a82697aa9a9f63d18c7a30a813f436e163922
2012-06-20 17:58:55 -07:00
Bobby Holley
4262204785 Bug 601277 - Better tests for document.domain. r=mrbkap 2012-07-12 10:10:15 +02:00
Bobby Holley
15d867f5bd Bug 655649 - Stop doing dynamic security checks for document.domain. r=mrbkap 2012-07-12 10:10:15 +02:00
Bobby Holley
4a5e0d850d Bug 655649 - Use Subsumes Rather than Equals in XPConnect wrapper computation. r=mrbkap
Now that we have nsExpandedPrincipal, the current way of doing things is wrong. For some reason, the old document.domain hackery was hiding the failures here.
2012-07-12 10:10:15 +02:00
Eddy Bruel
38a59d2484 Bug 771908 - Get rid of Wrapper::leave; r=bholley, sr=mrbkap 2012-07-11 14:01:10 +02:00
Ed Morley
35f13f7e90 Backout a5b21cffeebf (bug 743112) for intermittent but severe leaks; a=whatafunwaytospendtheday on a CLOSED TREE 2012-07-28 18:46:27 +01:00
Bill McCloskey
4d57317ec8 Bug 743112 - Incremental release of C++ objects during GC (r=smaug,jonco) 2012-07-27 11:27:51 -07:00
Bobby Holley
6d3eb5ee8b Bug 760109 - Tests. rs=mrbkap 2012-07-27 12:15:46 +02:00
Bobby Holley
a7c9c6c0e0 Bug 760109 - Override traps in ChromeObjectWrapper to bounce lookups to the local prototype chain. r=mrbkap 2012-07-27 12:15:46 +02:00
Bobby Holley
27dfe5daed Bug 760109 - Introduce an explicit ChromeObjectWrapper. r=mrbkap
For now it's identical to ChromeObjectWrapperBase. Custom behavior comes in the next patch.
2012-07-27 12:15:46 +02:00
Bobby Holley
bc2fe5e629 Bug 760109 - When COWing objects with standard prototypes, use the prototype in the home compartment instead. r=mrbkap 2012-07-27 12:15:46 +02:00
Ryan VanderMeulen
26da6164d3 Merge m-c to inbound. 2012-07-30 20:14:22 -04:00
Olli Pettay
c72a720f48 Bug 777401 - DictionaryHelpers.* build problems, r=khuey 2012-07-30 23:10:26 +03:00
Bobby Holley
2c48de6a45 Bug 778409 - Enter the compartment of unwrappedProto rather than obj in Rewrap. r=gabor
This can happen if chrome sets its proto to a content object from a different scope
than the one doing the wrapping. In this case, the prototype chain looks like this:

chromeobj => CCW(examplecom_obj) => CCW(examplecom_scope.Object.prototype)

When wrapping chromeobj for exampleorg_scope, things will look like this:

COW(chromeobj) => CCW(examplecom_obj) => CCW(examplecom_scope.Object.prototype)

Note that we don't remap the proto of CCW(examplecom_scope) to
exampleorg_scope.Object.prototype, because the proto remapping only happens when
the object we're wrapping is chrome. There's no reason it has to be this way, but
even if we changed it we still wouldn't get the nice remapped lookup behavior to
exampleorg_scope.Object.prototype, because the proxy handler for CCW(examplecom_obj)
isn't a ChromeObjectWrapper, and thus doesn't know how to to the prototype bouncing
correctly.

Anyway, I suspect this case isn't worth worrying about as long as we don't crash.
2012-07-30 22:18:55 +02:00
Jason Orendorff
806c6dc8a4 Disable two E4X tests that were failing only on platforms using e10s content processes after landing bug 765890. no_r=orange. 2012-07-30 14:52:02 -05:00
Ted Shroyer
4211119139 Bug 765890 - Alter mochitests/jsreftests to pass when javascript.options.xml.content defaults to false. r=jorendorff.
--HG--
extra : rebase_source : 12bd1c7b597c4834424876ac797cf7c118434d5e
2012-07-20 14:00:53 -05:00
Aryeh Gregor
2e7996f8d1 Bug 777292 - Convert incorrect conversions to nsresult and fix named constants; r=ehsan 2012-07-27 16:59:29 +03:00
Ehsan Akhgari
c80897316e Merge the nullptr conversion from mozilla-central into mozilla-inbound 2012-07-30 10:28:15 -04:00
Brian Hackett
4da0b7720d Use HandleValue and MutableHandleValue in API hooks where possible, bug 776579. r=billm, sr=dmandelin 2012-07-30 05:19:09 -06:00
Aryeh Gregor
66d337960d Bug 777292 - Add default cases to switches on nsresult; r=ehsan 2012-07-27 17:03:25 +03:00
Bobby Holley
d3655aa616 Bug 767948 - Make assertion nonfatal. r=me 2012-06-25 15:24:21 +02:00
Bobby Holley
5a6f34eba3 Bug 695292 - Port SimpleTest.executeSoon() to SpecialPowers. r=mrbkap
If we just naively use the thread manager to dispatch the event via SpecialPowers,
we cannot avoid the XPCWrappedJS for the runnable being in chrome scope (even if
we pass a content object, we make the call in chrome scope, so we pass a cross-
compartment wrapper). This means that the machinery in
nsXPCWrappedJSClass::CheckForException ends up calling the error reporter for the
SpecialPowers scope, which isn't what we want.

Messing around with the implementation of CheckForException is playing with fire.
So we work around this with an explicit Cu API. :-(
2012-08-16 18:33:27 -07:00
Bobby Holley
ecf7bf46b9 Bug 781476 - Test. r=me 2012-08-16 12:25:39 -07:00
Bobby Holley
239bc1b66a Bug 781476 - Cross-compartment wrap same-origin objects with PreCreate even if PreCreate requests one wrapper per scope. r=mrbkap 2012-08-16 12:25:39 -07:00
Aryeh Gregor
16e0a465fd Bug 779122 - nsXPCComponents_Utils::RecomputeWrappers should return nsresult, not bool; r=bholley 2012-07-31 18:24:38 +03:00
David Anderson
5e98fe788d Merge from mozilla-central. 2012-06-26 15:37:34 -07:00
David Anderson
c0d2427d66 Merge from mozilla-central.
--HG--
extra : rebase_source : 521cbf2f434cad88106f32be797faae4861afc39
2012-06-25 13:09:36 -07:00
Aryeh Gregor
982100775b Bug 780618 - Move all error codes to nsError.h; r=ehsan 2012-07-27 17:03:27 +03:00
Peter Van der Beken
486198a6d8 Fix for bug 785188 (Make Xrays work with newest DOM list bindings). r=mrbkap. 2012-06-06 21:52:26 +02:00
Luke Wagner
ce71e55555 Bug 625199 - s/JSAutoEnterCompartment/JSAutoCompartment/ and make it infallible (r=bholley)
--HG--
extra : rebase_source : 12acf2288285f5caefd7fecea8207de3a47eab5b
2012-08-21 18:42:53 -07:00
Luke Wagner
48412c861d Bug 625199 - kill dummy frames (r=mrbkap)
--HG--
extra : rebase_source : df4e3bddabf20cdc5b9122370fa62b40e64177c7
2012-08-17 18:05:06 -07:00
Bobby Holley
63dfef11f8 Bug 774607 - Remove use of JS_{Is,Make}SystemObject from Gecko. r=bz
We currently set this for system globals and anything whose parent
chain leads to a system global. Maybe this was relevant before, but
with CPG this is just equivalent to asking whether the object is in
a system compartment. And the only place where we _check_ this bit
is immediately after checking for a system compartment, in
WrapperFactory. So AFAICT this can go away entirely.
2012-08-23 16:44:53 -07:00
Bobby Holley
c3b9f1b805 Bug 757046 - Convert enablePrivilege into an insecure test-only construct (preffed off everywhere but in automation). r=bz 2012-08-23 11:45:28 -07:00
Luke Wagner
0f96a5287e Bug 784551 - remove JSSecurityCallbacks::findObjectPrincipals (r=mrbkap)
--HG--
extra : rebase_source : 8043b79eb031e4c3e196f6f693fa6a8a16099ecb
2012-08-23 09:51:09 -07:00
Andrew McCreight
85ee7e2fc8 Bug 761620 - Throw an exception for unpreservable weak map keys. r=billm 2012-08-08 11:05:58 -07:00
Masatoshi Kimura
015510bdc5 Bug 789691 - Migrate BlobPropertyBag to WebIDL binding dictionary, r=bzbarsky 2012-09-10 09:57:15 -04:00
Andrea Marchesini
f1e34bab53 Bug 775368 - Porting Websockets to WebIDL, r=bz
--HG--
rename : content/base/src/nsWebSocket.cpp => content/base/src/WebSocket.cpp
rename : content/base/src/nsWebSocket.h => content/base/src/WebSocket.h
2012-09-10 09:48:14 -04:00
Andrew Sutherland
551a753f47 Bug 786639 - XPCChromeObjectWrapper __exposedProps__ should expose the content of typed arrays like UInt8Array. r=bholley 2012-09-05 14:05:32 -07:00
Bobby Holley
eef8d9f4eb Bug 774607 - Remove use of JS_{Is,Make}SystemObject from Gecko. r=bz
We currently set this for system globals and anything whose parent
chain leads to a system global. Maybe this was relevant before, but
with CPG this is just equivalent to asking whether the object is in
a system compartment. And the only place where we _check_ this bit
is immediately after checking for a system compartment, in
WrapperFactory. So AFAICT this can go away entirely.
2012-09-05 11:32:07 -07:00
Boris Zbarsky
a860438a8a Bug 778044. Add a way to pref off Paris binding constructor objects. r=peterv 2012-09-05 13:37:28 -04:00
Rafael Ávila de Espíndola
323044e9af Bug 771683 - Mark some functions MOZ_ALWAYS_INILINE. r=bzbarsky.
When compiling with gcc 4.2 these functions get inlined, but then
again, gcc 4.2 inlines almost anything.

With clang, newer versions of gcc and msvc marking these functions
with MOZ_ALWAYS_INLINE is a win. I assume part of the perf win
gcc 4.5 and msvc get with pgo is from noticing these are hot
and inlining them.

Without PGO it is hard for the compiler to know that this is a
win. With clang this does increase the codesize by about 6%.

The wins from inlining are
* Stack variables (rv in particular) which have their address taken
and are passed as outparams to these functions can go in registers.
* We find that nothing set mCcxToDestroy and ~XPCLazyCallContext
(which is already inlined) can be simplified.
2012-07-06 21:18:17 -04:00
Kyle Huey
d1532c7382 Bug 765936. r=bent,peterv 2012-07-06 10:28:51 -07:00
Nicholas Nethercote
f77ae85d64 Bug 687724 (part 4) - Re-indent JSMemoryMultiReporter's methods. r=bholley.
--HG--
extra : rebase_source : deba800edfc3f55a9016d29acfd91d07a56e2e62
2012-07-05 21:16:11 -07:00
Nicholas Nethercote
d9d85b82d7 Bug 687724 (part 3) - Report JS memory consumption for compartments that are associated with |window| objects under "window-objects". r=bholley,jlebar,luke.
--HG--
extra : rebase_source : 20329a698154ef61cea74247d3dccc9f01899829
2012-07-05 21:12:37 -07:00
Bill McCloskey
943f752751 Bug 770759 - Add mutable handles (r=bhackett) 2012-07-04 11:12:16 -07:00
Ehsan Akhgari
cabe04854b Backout changeset 4313740f1adc (bug 725907 part 3) under the suspicion of breaking Linux32 mochitest-chrome without framepointers 2012-07-04 19:25:56 -04:00
Ehsan Akhgari
f32943d99a Backout changeset 20b0bce4c165 (bug 703537) under the suspicion of breaking Linux32 mochitest-chrome without framepointers 2012-07-04 19:24:04 -04:00
Eddy Bruel
4109621aae Bug 703537 - Rename AbstractWrapper to IndirectWrapper; r=bholley 2012-07-04 01:20:35 +02:00
Jason Orendorff
2b0768c375 Bug 725907 - for-of improvements, part 3: Implement .iterator() for arraylike DOM objects. r=bzbarsky.
--HG--
extra : rebase_source : 0820d3654318f217b8836a086234736d3aba3819
2012-07-03 16:34:56 -05:00
Peter Van der Beken
854457d901 Fix for bug 768692 (Move DOM list binding generation to the new DOM binding codegen). r=bzbarsky.
--HG--
extra : rebase_source : 651a0fac4c9a87ef1c0a9cd91588c6421fd050c4
2012-05-22 15:46:20 +02:00
Kyle Huey
0baaffe99f Bug 687332: Part 2 - Move event handlers off of DOM objects and keep track of them solely in the event listener manager. r=smaug,bz 2012-08-30 20:45:16 -07:00
Nicolas Chaim Echeverria
4da156d9b6 Bug 726125: Certificates of signed extensions were getting validated on each startup. r=taras, sr=bzbarsky 2012-08-30 16:58:55 -04:00
David Zbarsky
390bb39784 Bug 779084 - Move querySelector stuff out of nsGenericElement and into nsINode r=bz 2012-08-30 13:10:13 -04:00
Luke Wagner
6a04bcb53c Bug 756864 - Decrease MAX_FRAMES in XPCJSStackFrame::CreateStack (r=bhackett) 2012-06-23 20:47:10 -07:00
Luke Wagner
1e1c513d53 Bug 756864 - Decrease MAX_FRAMES in XPCJSStackFrame::CreateStack (r=bhackett)
--HG--
extra : rebase_source : 030728d0d1d797576264a3c204db9254e7ee0328
2012-06-23 20:47:10 -07:00
Luke Wagner
0c274df8bd Bug 755186 - s/JS_NewCompartmentAndGlobalObject/JS_NewGlobalObject/ (r=jorendorff)
--HG--
extra : rebase_source : f1ead9226915f72473a01db0a1019cdbe50c8e92
2012-06-20 08:57:29 -07:00
Luke Wagner
5d7c3690be Bug 755186 - rm JS_NewGlobalObject (r=jorendorff)
--HG--
extra : rebase_source : d9ba442572836406e165cdff11a646e6fd498c03
2012-06-20 08:57:29 -07:00
Steve Fink
222b385266 Bug 764184 - Fix GC_REASON telemetry bucket count (r=froydnj)
--HG--
extra : rebase_source : 790f6727878f44e7cf424d9e32a85347416df625
2012-06-15 15:21:56 -07:00
Steve Fink
bb8f1d1cc9 Backed out changeset c33a30aedb3b (bug 764184) 2012-06-22 12:22:00 -07:00
Bill McCloskey
995b63640b Bug 715761 - Fix build error 2012-06-22 12:12:49 -07:00
Bill McCloskey
ac4296dd82 Bug 715761 - Rename XPCWrappedNativeScope::TraceJS (r=bholley) 2012-06-22 11:37:22 -07:00
Bill McCloskey
352704a8a6 Bug 715761 - De-insanify xpconnect wrapper tracing (r=bholley) 2012-06-22 11:34:51 -07:00
Steve Fink
e0bf7c92f3 Bug 764184 - Fix GC_REASON telemetry bucket count (r=froydnj)
--HG--
extra : rebase_source : b4b9015caab404d8a4b674349fc27ade09dd3ec5
2012-06-15 15:21:56 -07:00
Bobby Holley
3a4cddc21b Bug 767306 - Temporarily make assertion from bug 766641 non-fatal. r=me 2012-06-22 12:01:18 +02:00
Jeff Walden
fdc16c2d6a Bug 765990 - Never use Rooted<T> as a temporary, so that the Rooted->Handle conversion path occurs in only one manner, not two (ambiguous) manners. r=luke
--HG--
extra : rebase_source : d42f8bcf462de54ff6cc7d9054b2561bdd67686a
2012-06-14 19:13:27 -07:00
Bobby Holley
34bf2a92a6 Bug 755255 - Rename XPCThreadContext.cpp to XPCJSContextStack.cpp, since that's all that's left. r=mrbkap
--HG--
rename : js/xpconnect/src/XPCThreadContext.cpp => js/xpconnect/src/XPCJSContextStack.cpp
2012-06-21 16:14:49 +02:00
Bobby Holley
db2c1b417f Bug 755255 - Remove XPCPerThreadData. r=mrbkap
\o/
2012-06-21 16:14:49 +02:00
Bobby Holley
25a83a9ffb Bug 755255 - Remove thread iteration in XPCJSRuntime. r=mrbkap 2012-06-21 16:14:49 +02:00
Bobby Holley
dbfd454b32 Bug 755255 - Remove mThreadData from XPCCallContext. r=mrbkap 2012-06-21 16:14:49 +02:00
Bobby Holley
6e85f24e95 Bug 755255 - Remove threadsafety checking machinery. r=mrbkap 2012-06-21 16:14:49 +02:00
Bobby Holley
7fbbe863c9 Bug 755255 - Hoist Resolving* machinery into XPCJSRuntime. r=mrbkap 2012-06-21 16:14:49 +02:00
Bobby Holley
d12bcc07cc Bug 755255 - Remove Usage of XPCPerThreadData::IsMainThread. r=mrbkap 2012-06-21 16:14:49 +02:00
Bobby Holley
2ac86947b8 Bug 755255 - Hoist auto root list into XPCJSRuntime. r=mrbkap 2012-06-21 16:14:49 +02:00
Bobby Holley
e673afa8f2 Bug 755255 - Hoist pending exception junk into XPCJSRuntime. r=mrbkap 2012-06-21 16:14:49 +02:00
Bobby Holley
718b02a083 Bug 755255 - Make consumers of mCallContext go through XPCJSRuntime. r=mrbkap 2012-06-21 16:14:49 +02:00
Bobby Holley
1b1b37d7aa Bug 755255 - Hoist mCallContext into XPCJSRuntime. r=mrbkap 2012-06-21 16:14:49 +02:00
Bobby Holley
d2e4d37f1e Bug 755255 - Make consumers of GetJSContextStack go through XPCJSRuntime. r=mrbkap 2012-06-21 16:14:48 +02:00
Bobby Holley
e5ccf7ea31 Bug 755255 - Add a convenience function to grab the JS runtime. r=mrbkap
I started getting sick of typing nsXPConnect::GetXPConnect()->GetRuntime().
2012-06-21 16:14:48 +02:00
Bobby Holley
83f0362c53 Bug 755255 - Hoist mJSContextStack into XPCJSRuntime. r=mrbkap 2012-06-21 16:14:48 +02:00
Bobby Holley
824551c799 Bug 766018 - Null out the XPCWrappedNativeScope slot when scopes are deleted on shutdown. r=peterv 2012-06-21 16:14:48 +02:00
David Anderson
947b7d32c8 Merge from mozilla-central.
--HG--
rename : js/xpconnect/src/XPCThreadContext.cpp => js/xpconnect/src/XPCJSContextStack.cpp
2012-06-22 14:26:15 -07:00
David Anderson
2a32f49182 Merge from mozilla-central. 2012-06-21 14:02:16 -07:00
David Anderson
2b66c77b6a Merge from mozilla-central.
--HG--
rename : accessible/src/msaa/CAccessibleText.cpp => accessible/src/msaa/ia2AccessibleText.cpp
rename : accessible/src/msaa/CAccessibleText.h => accessible/src/msaa/ia2AccessibleText.h
2012-06-20 17:36:56 -07:00
Mike Hommey
e1f994d15f Merge last PGO green changeset from mozilla-inbound to mozilla-central 2012-06-20 10:53:31 +02:00
Fabrice Desré
7a73ff8ad0 Bug 766378 - adds a createArrayIn() call to create JS arrays in a given scope [r=mrbkap] 2012-06-19 16:54:46 -07:00
Masatoshi Kimura
0a16a56d7f Bug 764916 - Replace nsDOMClassInfo::ThrowJSException with xpc::Throw. r=mrbkap 2012-06-19 19:01:10 -04:00
Andrew McCreight
e84af3afd0 Bug 763776 - refactor nsXPConnect::Traverse. r=billm 2012-06-19 11:33:00 -07:00
David Anderson
eb9c7d8ef0 Merge from mozilla-central. 2012-06-15 15:23:58 -07:00
Mike Hommey
2536fb188a Backout changeset a81526647059 and 560c492f81ad (bug 616262) because of Windows Moth perma-orange 2012-06-15 15:50:24 +02:00
Ed Morley
9ef4312c8c Merge last PGO-green changeset of mozilla-inbound to mozilla-central 2012-06-15 13:32:55 +01:00
Bobby Holley
bb38fbaa32 Bug 764389 - Update compartment principals on inner window reuse and on document.write. r=bz 2012-06-15 08:31:27 +02:00
David Anderson
58cb46e7b5 Merge from mozilla-central.
--HG--
rename : accessible/src/html/nsHTMLTableAccessible.cpp => accessible/src/html/HTMLTableAccessible.cpp
rename : accessible/src/html/nsHTMLTableAccessible.h => accessible/src/html/HTMLTableAccessible.h
rename : accessible/src/xul/nsXULAlertAccessible.cpp => accessible/src/xul/XULAlertAccessible.cpp
rename : accessible/src/xul/nsXULAlertAccessible.h => accessible/src/xul/XULAlertAccessible.h
rename : accessible/src/xul/nsXULColorPickerAccessible.cpp => accessible/src/xul/XULColorPickerAccessible.cpp
rename : accessible/src/xul/nsXULColorPickerAccessible.h => accessible/src/xul/XULColorPickerAccessible.h
rename : accessible/src/xul/nsXULComboboxAccessible.cpp => accessible/src/xul/XULComboboxAccessible.cpp
rename : accessible/src/xul/nsXULComboboxAccessible.h => accessible/src/xul/XULComboboxAccessible.h
rename : accessible/src/xul/nsXULMenuAccessible.cpp => accessible/src/xul/XULMenuAccessible.cpp
rename : accessible/src/xul/nsXULMenuAccessible.h => accessible/src/xul/XULMenuAccessible.h
rename : accessible/src/xul/nsXULSliderAccessible.cpp => accessible/src/xul/XULSliderAccessible.cpp
rename : accessible/src/xul/nsXULSliderAccessible.h => accessible/src/xul/XULSliderAccessible.h
rename : accessible/src/xul/nsXULTabAccessible.cpp => accessible/src/xul/XULTabAccessible.cpp
rename : accessible/src/xul/nsXULTreeAccessible.cpp => accessible/src/xul/XULTreeAccessible.cpp
rename : accessible/src/xul/nsXULTreeAccessible.h => accessible/src/xul/XULTreeAccessible.h
rename : accessible/src/xul/nsXULTreeGridAccessible.cpp => accessible/src/xul/XULTreeGridAccessible.cpp
rename : accessible/src/xul/nsXULTreeGridAccessible.h => accessible/src/xul/XULTreeGridAccessible.h
2012-06-12 17:44:22 -07:00
Ehsan Akhgari
79476e0c44 Bug 758992 - Make the classes which use the XPCOM nsISupports implementation macros final, to avoid the warning about deleting using a pointer to a base class with virtual functions and no virtual dtor (more xpconnect parts); r=bholley 2012-06-19 23:33:46 -04:00
Jan de Mooij
b1b68e0f5d Merge m-c to ionmonkey
--HG--
rename : accessible/src/html/nsHTMLSelectAccessible.cpp => accessible/src/html/HTMLSelectAccessible.cpp
rename : accessible/src/html/nsHTMLSelectAccessible.h => accessible/src/html/HTMLSelectAccessible.h
rename : memory/jemalloc/jemalloc.c => memory/mozjemalloc/jemalloc.c
rename : memory/jemalloc/jemalloc.h => memory/mozjemalloc/jemalloc.h
2012-06-08 11:18:39 +02:00
Jason Orendorff
31a1022fa0 Bug 753542 - Add prefs to enable/disable E4X (javascript.options.xml.content and .chrome). r=bsmedberg, sr=jst. 2012-06-06 21:52:14 -05:00
Boris Zbarsky
31ccf86cf9 Bug 761707 part 2. Drop the vestigial jsclass argument to UnwrapDOMObject. r=bholley 2012-06-06 15:59:46 -04:00
Sean Stangl
03039d2160 Merge m-c to Ionmonkey.
--HG--
rename : accessible/src/base/nsBaseWidgetAccessible.h => accessible/src/generic/BaseAccessibles.h
rename : accessible/src/html/nsHTMLImageMapAccessible.cpp => accessible/src/html/HTMLImageMapAccessible.cpp
rename : accessible/src/html/nsHTMLLinkAccessible.cpp => accessible/src/html/HTMLLinkAccessible.cpp
rename : accessible/src/html/nsHTMLLinkAccessible.h => accessible/src/html/HTMLLinkAccessible.h
2012-06-05 16:54:36 -07:00
Sean Stangl
252166a142 Merge m-c to Ionmonkey.
--HG--
rename : accessible/src/html/nsHyperTextAccessible.cpp => accessible/src/generic/HyperTextAccessible.cpp
rename : accessible/src/html/nsHyperTextAccessible.h => accessible/src/generic/HyperTextAccessible.h
rename : accessible/src/html/nsHTMLImageAccessible.cpp => accessible/src/generic/ImageAccessible.cpp
rename : accessible/src/html/nsHTMLImageAccessible.h => accessible/src/generic/ImageAccessible.h
rename : accessible/src/msaa/nsHyperTextAccessibleWrap.cpp => accessible/src/msaa/HyperTextAccessibleWrap.cpp
rename : accessible/src/msaa/nsHyperTextAccessibleWrap.h => accessible/src/msaa/HyperTextAccessibleWrap.h
2012-06-04 13:30:29 -07:00
David Zbarsky
fd086e43bf Bug 591467 - Implement HTML5 Microdata API r=bz 2012-06-04 16:49:57 -07:00
Mike Hommey
f600664217 Bug 616262 - Avoid cycle collection participant global variables adding static initializers. r=smaug,r=mccr8,r=Waldo 2012-06-04 08:30:26 +02:00
Mike Hommey
3acf5d646d Bug 616262 - Avoid cycle collection participant global variables adding static initializers. r=smaug,r=mccr8,r=Waldo 2012-06-04 08:30:26 +02:00
Ehsan Akhgari
3513bdbdc2 Bug 758992 - Make the classes which use the XPCOM nsISupports implementation macros final, to avoid the warning about deleting using a pointer to a base class with virtual functions and no virtual dtor (xpconnect parts); r=bholley 2012-06-12 23:21:08 -04:00
Nicholas Nethercote
51b1dd666a Bug 760352 (part 2) - Treeify non-JS-compartment KIND_OTHER memory reports where appropriate. r=jlebar.
--HG--
extra : rebase_source : 886b3d40a8dc5f7092ed35ffe280814576ca021b
2012-06-11 20:32:26 -07:00
Nicholas Nethercote
d09087aa9d Bug 760352 (part 1) - Allow KIND_OTHER memory reports to be in trees. r=jlebar.
--HG--
extra : rebase_source : d28d117fbc2c91069222649741f5ef6b567b3e2a
2012-06-11 20:29:12 -07:00
Sean Stangl
39170a65fe Merge m-c onto Ionmonkey.
--HG--
rename : accessible/src/atk/nsAccessibleWrap.cpp => accessible/src/atk/AccessibleWrap.cpp
rename : accessible/src/atk/nsAccessibleWrap.h => accessible/src/atk/AccessibleWrap.h
rename : accessible/src/atk/nsDocAccessibleWrap.h => accessible/src/atk/DocAccessibleWrap.h
rename : accessible/src/base/nsAccessible.cpp => accessible/src/generic/Accessible.cpp
rename : accessible/src/base/nsAccessible.h => accessible/src/generic/Accessible.h
rename : accessible/src/base/nsDocAccessible.cpp => accessible/src/generic/DocAccessible.cpp
rename : accessible/src/base/nsDocAccessible.h => accessible/src/generic/DocAccessible.h
rename : accessible/src/mac/nsAccessibleWrap.h => accessible/src/mac/AccessibleWrap.h
rename : accessible/src/mac/nsAccessibleWrap.mm => accessible/src/mac/AccessibleWrap.mm
rename : accessible/src/mac/nsDocAccessibleWrap.h => accessible/src/mac/DocAccessibleWrap.h
rename : accessible/src/mac/nsDocAccessibleWrap.mm => accessible/src/mac/DocAccessibleWrap.mm
rename : accessible/src/msaa/nsAccessibleWrap.cpp => accessible/src/msaa/AccessibleWrap.cpp
rename : accessible/src/msaa/nsDocAccessibleWrap.cpp => accessible/src/msaa/DocAccessibleWrap.cpp
rename : accessible/src/msaa/nsTextAccessibleWrap.cpp => accessible/src/msaa/TextLeafAccessibleWrap.cpp
rename : accessible/src/msaa/nsTextAccessibleWrap.h => accessible/src/msaa/TextLeafAccessibleWrap.h
rename : netwerk/protocol/http/SpdySession.cpp => netwerk/protocol/http/SpdySession2.cpp
rename : netwerk/protocol/http/SpdySession.h => netwerk/protocol/http/SpdySession2.h
rename : netwerk/protocol/http/SpdySession.cpp => netwerk/protocol/http/SpdySession3.cpp
rename : netwerk/protocol/http/SpdySession.h => netwerk/protocol/http/SpdySession3.h
rename : netwerk/protocol/http/SpdyStream.cpp => netwerk/protocol/http/SpdyStream2.cpp
rename : netwerk/protocol/http/SpdyStream.cpp => netwerk/protocol/http/SpdyStream3.cpp
2012-05-31 17:17:52 -07:00
Doug Turner
346de6afda Bug 758273 - Device Storage - enumeration option to filter based on last modification date. r=smaug 2012-06-10 22:50:44 -07:00
Jason Orendorff
d0e13c7d3f Bug 753885 - Part 2: Add JSOPTION_ALLOW_XML, making E4X support optional per-context. r=Waldo. 2012-05-30 15:05:59 -05:00
Jason Orendorff
a03f10d77d Bug 753885 - Part 1: Rename JSOPTION_XML to JSOPTION_MOAR_XML, and other cleanups. r=Waldo. 2012-05-30 15:05:58 -05:00
L. David Baron
91859c5a28 Backout bug 754202 (all patches, rather than just patches 3-7). 2012-06-10 17:22:31 -07:00
Ryan VanderMeulen
9409d47933 Backout 90107a2a0c64 (bug 754202) for real due to orange. 2012-06-10 19:46:20 -04:00
Ryan VanderMeulen
b74e4a29db Revert c39d36167b99 due to a horribly munged backout. 2012-06-10 19:44:50 -04:00
Ryan VanderMeulen
061d4c2616 Backout the bug 754202 backout due to orange. 2012-06-10 19:37:47 -04:00