Граф коммитов

1064 Коммитов

Автор SHA1 Сообщение Дата
David Anderson f6eca6c7f0 Merge from mozilla-central.
--HG--
rename : js/jsd/jsd_scpt.c => js/jsd/jsd_scpt.cpp
rename : js/jsd/jsd_stak.c => js/jsd/jsd_stak.cpp
rename : js/jsd/jsd_val.c => js/jsd/jsd_val.cpp
2012-09-05 16:18:11 -07:00
David Anderson 25cb077cb2 Merge from mozilla-central.
--HG--
rename : js/src/sharkctl.cpp => js/src/devtools/sharkctl.cpp
rename : js/src/sharkctl.h => js/src/devtools/sharkctl.h
rename : js/src/MemoryMetrics.cpp => js/src/jsmemorymetrics.cpp
2012-08-29 17:57:37 -07:00
David Anderson a77264d9fb Merge from mozilla-central.
--HG--
rename : content/base/public/nsIFrameMessageManager.idl => content/base/public/nsIMessageManager.idl
2012-08-29 17:51:24 -07:00
Fabrice Desré e0ef96f87d Bug 781620 - Bridge the DOM webapps registry with nsIPrincipal::GetStatus() - Part 3 : updating tests. [r=mounir] 2012-08-29 07:31:10 -07:00
Fabrice Desré aa62d317da Bug 781620 - Bridge the DOM webapps registry with nsIPrincipal::GetStatus() - Part 1 : nsPrincipal changes [r=mounir] 2012-08-27 19:43:57 -07:00
Phil Ringnalda 13ff1ee8f8 Back out a08d28e8a86b (bug 768868), 9b96029a9cf0 and 010b5cb3576d (bug 781620) for test failures and leaks 2012-08-27 21:34:53 -07:00
Fabrice Desré f8f5b09669 Bug 781620 - Bridge the DOM webapps registry with nsIPrincipal::GetStatus() - Part 1 : nsPrincipal changes [r=mounir] 2012-08-27 19:43:57 -07:00
David Anderson 3b9fed8952 Merge from mozilla-central. 2012-08-22 16:09:24 -07:00
David Anderson a264d0ebc8 Merge from mozilla-central. 2012-08-21 15:59:12 -07:00
Randell Jesup 65539ef89c Bug 773151: Convert nsCAutoString->nsAutoCString CLOSED TREE r=bsmedberg 2012-09-01 22:35:17 -04:00
David Anderson 317676336c Forbid JITing annotated frames (bug 763233, r=mrbkap,jandem). 2012-08-16 18:26:11 -07:00
David Anderson f427cc76fa Merge from mozilla-central. 2012-08-16 14:04:20 -07:00
David Anderson e83e82b9dd Remove JS_FrameIterator (bug 732653, r=luke,mrbkap). 2012-08-15 17:28:33 -07:00
Ryan VanderMeulen cbe189e0c0 Merge m-c to inbound. 2012-08-20 20:21:35 -04:00
Ehsan Akhgari e368dc9c85 Bug 579517 - Part 1: Automated conversion of NSPR numeric types to stdint types in Gecko; r=bsmedberg
This patch was generated by a script.  Here's the source of the script for
future reference:

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

convert PRInt8 int8_t
convert PRUint8 uint8_t
convert PRInt16 int16_t
convert PRUint16 uint16_t
convert PRInt32 int32_t
convert PRUint32 uint32_t
convert PRInt64 int64_t
convert PRUint64 uint64_t

convert PRIntn int
convert PRUintn unsigned

convert PRSize size_t

convert PROffset32 int32_t
convert PROffset64 int64_t

convert PRPtrdiff ptrdiff_t

convert PRFloat64 double
2012-08-22 11:56:38 -04:00
Blair McBride 1383c37966 Bug 758950 - Test fix, test_bug292789.html should load xpinstallConfirm.js with a newer JS version. r=dveditz 2012-08-20 15:30:29 +12:00
Gregor Wagner 4b599bd464 Bug 781355 - Hook up mozBrowser to Permission Manager. r=jlebar 2012-08-15 10:22:30 -07:00
Mounir Lamouri 13f8b46e72 Bug 777072 - 3/7 - Update nsHostTable and nsHostEntry to make them aware of new security model. r=sicking,jlebar 2012-08-23 11:47:55 -07:00
Chris Jones bb75bebb82 No bug: Merge backout on a CLOSED TREE r=bustage 2012-08-23 22:33:04 -07:00
Chris Jones da27f385d7 Back out bug 777072, bug 619236, and bug 784878 2012-08-23 22:00:14 -07:00
Ryan VanderMeulen 9ad8ca8a9d Merge the last PGO-green inbound changeset to m-c. 2012-08-23 22:06:49 -04:00
Mounir Lamouri 0e7ad1ee11 Bug 777072 - 3/7 - Update nsHostTable and nsHostEntry to make them aware of new security model. r=sicking,jlebar 2012-08-23 11:47:55 -07:00
Bobby Holley 6e5d279c63 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 b41ca730d1 Bug 784551 - remove JSSecurityCallbacks::findObjectPrincipals (r=mrbkap)
--HG--
extra : rebase_source : 8043b79eb031e4c3e196f6f693fa6a8a16099ecb
2012-08-23 09:51:09 -07:00
Luke Wagner ceb8da37c6 Bug 668558 - remove JSSecurityCallbacks::subsumePrincipals (r=mrbkap)
--HG--
extra : rebase_source : 6cb1ce1b8f2505ca98235e7ad44138ac5f42737a
2012-08-23 09:45:24 -07:00
Aryeh Gregor 4e199a1679 Bug 780618 - Move all error codes to nsError.h; r=ehsan 2012-07-27 17:03:27 +03:00
Justin Lebar f813f6360a Bug 777135 - Part 1: Add nice C++ version of nsIPrincipal::GetAppStatus. r=mounir
--HG--
extra : rebase_source : 6150a2b708faa41f1f6c7723260fc52444b7ea8d
2012-08-13 12:58:38 -04:00
Peter Van der Beken ee9eae3141 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
Ms2ger 75ab7efb95 Bug 780387 - Part b: Stop using PRIntn; r=bsmedberg 2012-08-09 09:09:40 +02:00
Ian Melven 01a802da01 Bug 341604 - modify CheckMayLoad to allow sandboxed workers to load blob and data URIs r=jst 2012-08-20 11:34:33 -07:00
Gabor Krizsanits 588eef842d Bug 777705 - Default policy for expanded principals. r=mrbkap 2012-08-20 11:22:34 -07:00
Fabrice Desré 894868aa63 Bug 781224 - Rename APP_STATUS_TRUSTED to APP_STATUS_PRIVILEGED in nsIPrincipal [r=mounir] 2012-08-08 10:21:54 -07:00
Eric Faust a2abc41ee2 Bug 775788 - Modify JSFunctionSpec to accept JSJitInfos. (r=luke) 2012-08-07 22:26:19 -07:00
Justin Lebar 53e0011130 No bug - Fix error in nsIPrincipal comment (it's nsIScriptSecurityManager::NO_APP_ID, not nsIAppsService::NO_APP_ID). r=me DONTBUILD 2012-08-06 00:31:22 -04:00
Mike Hommey 70d7c821af Bug 774032 bonus - Use @DEPTH@ and @relativesrcdir@ in Makefile.in. r=ted 2012-08-04 20:26:44 +02:00
Mounir Lamouri 69647e26b0 Bug 776824 - Add isInBrowserElement to nsIPrincipal. r=mrbkap sr=sicking 2012-07-31 17:47:20 +02:00
Aryeh Gregor d0ad5a7d0c Bug 777292 part 2 - Change all nsnull to nullptr 2012-07-30 17:20:58 +03:00
Justin Lebar a9916a6e83 Bug 772987 - Part 2: Use Static{Auto,Ref}Ptr where appropriate. r=mounir
--HG--
extra : rebase_source : 4e3e72ba53cd0177160f80231eebeb4972119eec
2012-07-26 15:33:45 -04:00
William Chen 35a4609900 Bug 777582 - Make nsPrincipal deserialize members in the order that they are serialized. r=mounir 2012-07-25 20:12:03 -04:00
Joshua Cranmer 497e7cd9bb Bug 773637 - Kill NS_SCRIPTABLE attributes, Part 2: Remove NS_SCRIPTABLE. r=ehsan
--HG--
extra : rebase_source : 83020e0a1961ed5b33d5e0599419c6b7b82caa87
2012-07-06 15:31:49 -05:00
Joshua Cranmer a1186c1020 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
Mounir Lamouri a3a4cd22bf Bug 758258 - part 6 - Change how extendedOrigin is generated. r=sicking 2012-07-21 17:37:02 -07:00
Mounir Lamouri 6f0cdcac36 Bug 758258 - Tests. r=sicking 2012-07-21 17:14:25 -07:00
Jonas Sicking 23c9838514 Bug 774585: Rename getCodebasePrincipal to getSimpleCodebasePrincipal since the behavior has semantically changed. r=mounir 2012-07-21 00:29:40 -07:00
Ed Morley 2b321c7ef8 Bug 774585 - Temporarily disable test_principal_extendedorigin_appid_appstatus.html for failures on OS X 10.7 (and possibly others); rs=mounir on a CLOSED TREE 2012-07-20 12:20:55 +01:00
Mounir Lamouri df5968efcc No bug - fix build bustage on Windows/Android and M-oth on MacOS. r=me CLOSED TREE 2012-07-20 02:14:25 -07:00
Mounir Lamouri 118be3572d No bug - Pushing on a CLOSED TREE. r=me 2012-07-20 00:32:12 -07:00
Mounir Lamouri 451cb5b27f Bug 774585 - Tests. r=sicking 2012-07-20 00:26:05 -07:00
Jonas Sicking 02bbfed9f0 Bug 774585 - Make GetChannelPrincipal get the correct app principal. r=mounir 2012-07-20 00:07:49 -07:00
Jonas Sicking c10568d0b9 Bug 774585 - Add GetDocShellCodebasePrincipal to nsIScriptSecurityManager. r=mounir 2012-07-20 00:06:24 -07:00
Mounir Lamouri 1887aa86ce Bug 758258 - part 5 - Add GetAppCodebasePrincipal and GetNoAppCodebasePrincipal to nsIScriptSecurityManager. r=mrbkap sr=sicking 2012-07-19 20:28:08 -07:00
Mounir Lamouri 72c743ad58 Bug 758258 - part 4 - Update CreateCodebasePrincipal() to take app/inbrowser info. r=sicking 2012-07-19 15:32:08 -07:00
Mounir Lamouri 99b949ad17 Bug 758258 - part 3 - Add extendedOrigin, appStatus and appId to nsIPrincipal. r=bholley sr=sicking 2012-07-19 22:44:03 -07:00
Mounir Lamouri 6422e89acc No bug - Disable failing test on a CLOSED TREE. r=me 2012-07-19 18:55:05 -07:00
Mounir Lamouri ec19a64b45 No bug - fix test bustage on a CLOSED TREE. r=me 2012-07-19 17:35:42 -07:00
Mounir Lamouri 84f86ababe 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 3c5ac44be1 Bug 758258 - Part 1 - Create skeleton for extendedOrigin tests. r=sicking 2012-07-19 16:14:11 -07:00
Steve Fink 87ba3d6565 Backed out changeset 1bafff5720a8 2012-07-19 15:22:36 -07:00
Steve Fink dfcda357cb Backed out changeset afc1cf222996 2012-07-19 15:22:32 -07:00
Mounir Lamouri 82bd7de2c9 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 41bafcaa32 Bug 758258 - Part 1 - Create skeleton for extendedOrigin tests. r=sicking 2012-07-19 10:29:21 -07:00
Mounir Lamouri 41eae831f2 Bug 775354 - Add a static method to be able to compute the origin based on nsPrincipal algorithm. r=mrbkap 2012-07-18 21:23:44 -07:00
Mounir Lamouri 61d9d40b3d Bug 327244 (2/2) - Remove nsIScriptSecurityManager::CheckLoadURI(). r=sicking,jlebar 2012-07-18 15:27:02 -07:00
Mounir Lamouri adfa6702cc Bug 327244 (1/2) - Remove nsIScriptSecurityManager::CheckLoadURIStr(). r=sicking 2012-07-19 10:49:17 -07:00
Ed Morley c2d155cb67 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 49af88332c 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 59be621600 Bug 758258 - Part 1 - Create skeleton for extendedOrigin tests. r=sicking 2012-07-18 21:26:30 -07:00
Mounir Lamouri a809017de5 Bug 775354 - Add a static method to be able to compute the origin based on nsPrincipal algorithm. r=mrbkap 2012-07-18 21:23:44 -07:00
Mounir Lamouri f293eab524 Bug 327244 (2/2) - Remove nsIScriptSecurityManager::CheckLoadURI(). r=sicking,jlebar 2012-07-18 15:27:02 -07:00
Mounir Lamouri 432f61b8f5 Bug 327244 (1/2) - Remove nsIScriptSecurityManager::CheckLoadURIStr(). r=sicking 2012-07-18 13:35:15 -07:00
Jonas Sicking 4c50ad8340 Bug 774585: Remove unused argument in nsScriptSecurityManager. r=mrbkap 2012-07-17 22:28:47 -07:00
Bobby Holley 9ecc2d4946 Bug 655649 - Recompute cross-compartment wrappers when setting document.domain. r=mrbkap 2012-07-12 10:10:15 +02:00
Nathan Froyd bfff055672 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
Makoto Kato 1e533fbd2e Bug 769533 - Part 1. Replace AppendWithConversion with others. r=jlebar 2012-07-06 18:43:28 +09:00
Bobby Holley 791b8a0a39 Bug 754202 - Check principal in IsCapabilityEnabled when there's no code on the stack. r=mrbkap 2012-06-28 23:47:55 +02:00
Bobby Holley 338e1a2a10 Bug 754202 - Remove mContextPrincipal usage from within nsScriptSecurityManager. r=mrbkap 2012-06-28 23:47:55 +02:00
Bobby Holley 83245872f0 Bug 754202 - Remove context pushing/popping API. r=mrbkap Each one of these uses grabs the principal off of an object for pushing, but also enters the compartment of that object. So we shouldn't need this anymore.
Can I get a 'hell yeah'?
2012-06-28 23:47:55 +02:00
Bobby Holley 285b2d0a7e Bug 754202 - Pull subject principals directly off the compartment. r=mrbkap It would be nice to check these principals against the principals acquired using the old mechanism. Unfortunately, they often differ. Because CAPS uses JS stack frames, any time we enter a compartment and do an operation (even throwing an Access-Denied exception) without running any JS code, we'll end up with a different principal.
Our security story is pretty darn tied to compartments at this point, so let's
just pull the trigger.
2012-06-28 23:47:55 +02:00
Bobby Holley 6def798e8f Bug 754202 - Pull object principals directly off the compartment and assert that behavior doesn't change. r=bz 2012-06-28 23:47:55 +02:00
Justin Lebar 0ba5460898 Bug 766173 - Hold a strong ref to nsScriptSecurityManager, instead of hoping that it won't get addref'ed or released. r=bsmedberg
--HG--
rename : mobile/android/base/resources/drawable/tabs_button_contracted.xml => mobile/android/base/resources/drawable/tabs_button.xml
extra : rebase_source : 8f861c2298fd053a0e1f6deb6f9945040ea8db90
2012-06-19 13:20:34 -04:00
Ehsan Akhgari 549521b5db 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 (caps parts); r=bholley 2012-06-12 23:58:27 -04:00
Ryan VanderMeulen 8d5ee1114e Merge m-c to inbound 2012-06-10 21:34:50 -04:00
L. David Baron ca009b979f Backout bug 754202 (all patches, rather than just patches 3-7). 2012-06-10 17:22:31 -07:00
Ryan VanderMeulen 0ec5784959 Backout 90107a2a0c64 (bug 754202) for real due to orange. 2012-06-10 19:46:20 -04:00
Ryan VanderMeulen 5f2a19ee6e Revert c39d36167b99 due to a horribly munged backout. 2012-06-10 19:44:50 -04:00
Ryan VanderMeulen 6d6c4efbab Backout the bug 754202 backout due to orange. 2012-06-10 19:37:47 -04:00
Bobby Holley 75ea89c874 Merge backout. 2012-06-11 00:28:30 +02:00
Bobby Holley b65e3d0fc1 Back out bug 754202. r=me 2012-06-11 00:28:05 +02:00
Ms2ger 00f2cea380 Bug 734891 - Followup: Fix build warnings in nsPrincipal.cpp. 2012-06-10 21:25:17 +02:00
Gabor Krizsanits a4d0a2ae65 Bug 734891 - part 2: Adding ExpandedPrincipal support 2012-06-09 15:19:26 -07:00
Gabor Krizsanits c33eb75fc0 Bug 734891 - part 1: Decoupling URI based logic from caps/certificate related logic of nsPrincipal 2012-06-09 15:19:26 -07:00
Gabor Krizsanits 0cf789a95d Bug 734891 - part 0: rearanging nsPrincipal methods for follow up 2012-06-09 15:19:26 -07:00
Bobby Holley 8c6bec7d49 Bug 754202 - Remove mContextPrincipal usage from within nsScriptSecurityManager. r=mrbkap 2012-06-07 14:28:22 +02:00
Bobby Holley 3065c84571 Bug 754202 - Remove context pushing/popping API. r=mrbkap
Each one of these uses grabs the principal off of an object for pushing, but also enters the compartment of that object. So we shouldn't need this anymore.

Can I get a 'hell yeah'?
2012-06-07 14:28:21 +02:00
Bobby Holley 3d5afc4e42 Bug 754202 - Pull subject principals directly off the compartment. r=mrbkap
It would be nice to check these principals against the principals acquired
using the old mechanism. Unfortunately, they often differ. Because CAPS uses
JS stack frames, any time we enter a compartment and do an operation (even
throwing an Access-Denied exception) without running any JS code, we'll end
up with a different principal.

Our security story is pretty darn tied to compartments at this point, so let's
just pull the trigger.
2012-06-07 14:28:21 +02:00
Bobby Holley ddbdb6b79b Bug 754202 - Pull object principals directly off the compartment, and assert that behavior doesn't change. r=bz 2012-06-07 14:28:21 +02:00
Boris Zbarsky 809a53856c Bug 761707 part 2. Drop the vestigial jsclass argument to UnwrapDOMObject. r=bholley 2012-06-06 15:59:46 -04:00
Gervase Markham 82ff7027aa Bug 716478 - update licence to MPL 2. 2012-05-21 12:12:37 +01:00
Brian Hackett d55ff730fa Use handles in API object hooks where possible, bug 750733. r=billm 2012-05-19 15:03:45 -07:00
Brian Hackett 66d81d0a7e Backed out changeset 5fc7462dd394 for android orange. 2012-05-19 11:52:55 -07:00