Commit Graph

397 Commits

Author SHA1 Message Date
David Anderson
7b438ddde2 Merge IonMonkey to mozilla-central. a=arewefastyet
--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-11 10:25:14 -07:00
Bobby Holley
2f472dd63b Bug 788914 - Recompute cross-compartment wrappers when UniversalXPConnect is enabled. r=mrbkap 2012-09-11 01:05:10 -07:00
David Anderson
24145fc9a1 Merge from mozilla-central. 2012-09-10 12:16:38 -07:00
David Anderson
043ddae94a 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
25c3dd55c0 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
6b403f94c2 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é
f066ff3d70 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é
e973026a8b 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
5423f5636c 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é
b2b008100b 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
188c88907e Merge from mozilla-central. 2012-08-22 16:09:24 -07:00
David Anderson
1ef4c57410 Merge from mozilla-central. 2012-08-21 15:59:12 -07:00
Randell Jesup
eedf93a21d Bug 773151: Convert nsCAutoString->nsAutoCString CLOSED TREE r=bsmedberg 2012-09-01 22:35:17 -04:00
David Anderson
3da139adc8 Forbid JITing annotated frames (bug 763233, r=mrbkap,jandem). 2012-08-16 18:26:11 -07:00
David Anderson
565400115a Merge from mozilla-central. 2012-08-16 14:04:20 -07:00
David Anderson
d52687ed20 Remove JS_FrameIterator (bug 732653, r=luke,mrbkap). 2012-08-15 17:28:33 -07:00
Ryan VanderMeulen
f12fa88179 Merge m-c to inbound. 2012-08-20 20:21:35 -04:00
Ehsan Akhgari
0fd9123eac 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
abba9ecc6b 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
f79e6cb659 Bug 781355 - Hook up mozBrowser to Permission Manager. r=jlebar 2012-08-15 10:22:30 -07:00
Mounir Lamouri
2b28512edc 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
5a380bfddb No bug: Merge backout on a CLOSED TREE r=bustage 2012-08-23 22:33:04 -07:00
Chris Jones
05b904ebae Back out bug 777072, bug 619236, and bug 784878 2012-08-23 22:00:14 -07:00
Ryan VanderMeulen
5fbfaa489f Merge the last PGO-green inbound changeset to m-c. 2012-08-23 22:06:49 -04:00
Mounir Lamouri
ede8f880d1 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
eb79b89b74 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
b275055a73 Bug 784551 - remove JSSecurityCallbacks::findObjectPrincipals (r=mrbkap)
--HG--
extra : rebase_source : 8043b79eb031e4c3e196f6f693fa6a8a16099ecb
2012-08-23 09:51:09 -07:00
Luke Wagner
4842917cc6 Bug 668558 - remove JSSecurityCallbacks::subsumePrincipals (r=mrbkap)
--HG--
extra : rebase_source : 6cb1ce1b8f2505ca98235e7ad44138ac5f42737a
2012-08-23 09:45:24 -07:00
Aryeh Gregor
0923bf00ef Bug 780618 - Move all error codes to nsError.h; r=ehsan 2012-07-27 17:03:27 +03:00
Justin Lebar
b16bf1a284 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
13f425b97c 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
3f950b5744 Bug 780387 - Part b: Stop using PRIntn; r=bsmedberg 2012-08-09 09:09:40 +02:00
Ian Melven
06019be17e 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
2c957b446e Bug 777705 - Default policy for expanded principals. r=mrbkap 2012-08-20 11:22:34 -07:00
Fabrice Desré
1ee9ee1b50 Bug 781224 - Rename APP_STATUS_TRUSTED to APP_STATUS_PRIVILEGED in nsIPrincipal [r=mounir] 2012-08-08 10:21:54 -07:00
Eric Faust
17695b5079 Bug 775788 - Modify JSFunctionSpec to accept JSJitInfos. (r=luke) 2012-08-07 22:26:19 -07:00
Justin Lebar
1e96900228 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
6173fa297f Bug 774032 bonus - Use @DEPTH@ and @relativesrcdir@ in Makefile.in. r=ted 2012-08-04 20:26:44 +02:00
Mounir Lamouri
cb250bbad5 Bug 776824 - Add isInBrowserElement to nsIPrincipal. r=mrbkap sr=sicking 2012-07-31 17:47:20 +02:00
Aryeh Gregor
e806eeab4f Bug 777292 part 2 - Change all nsnull to nullptr 2012-07-30 17:20:58 +03:00
Justin Lebar
a863832283 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
3036961c68 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
774444109e 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
4b8f318e78 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
9a18bc7db3 Bug 758258 - part 6 - Change how extendedOrigin is generated. r=sicking 2012-07-21 17:37:02 -07:00
Mounir Lamouri
56b0fd2c60 Bug 758258 - Tests. r=sicking 2012-07-21 17:14:25 -07:00
Jonas Sicking
68ce0e34aa Bug 774585: Rename getCodebasePrincipal to getSimpleCodebasePrincipal since the behavior has semantically changed. r=mounir 2012-07-21 00:29:40 -07:00
Ed Morley
797813ba1f 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
c69e3051d2 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
38f92ee6be No bug - Pushing on a CLOSED TREE. r=me 2012-07-20 00:32:12 -07:00