Doug Turner
e5c86fcd42
Merging with mozilla-central. Manually merged: content/canvas/src/nsCanvasRenderingContext2D.cpp ipc/ipdl/Makefile.in toolkit/toolkit-tiers.mk toolkit/xre/nsEmbedFunctions.cpp
...
--HG--
rename : gfx/thebes/src/gfxSharedImageSurface.cpp => gfx/thebes/gfxSharedImageSurface.cpp
rename : gfx/thebes/public/gfxSharedImageSurface.h => gfx/thebes/gfxSharedImageSurface.h
2010-06-28 16:33:19 -07:00
Oleg Romashin
39a0145aea
Auto-merge with m-c b51803f3fdef
2010-06-25 08:30:40 -04:00
Doug Turner
9c89be497e
Automerge w mozilla-central
2010-06-24 14:06:13 -07:00
Saint Wesonga
770c665f0d
Bug 512447 - JSON.stringify does not correct handle replacer functions. r=sayrer
2010-06-24 13:32:07 -07:00
Jason Duell
386a098a89
Merge from m-c.
...
Fair amount of merge conflicts.
Biggest item was changes to nsHttpChannel from web sockets changes.
Other likely suspects if things are borken:
nsFrameLoader.cpp:
- nsFrameLoader::EnsureMessageManager: pass "this" (orig e10s code) or
nsnull (m-c) to local process call to new nsFrameMessageManager(),
callback arg? Smaug said null.
- only calling SetCallBackData for local case. also +r smaug.
nsPrefBranch.cpp had fairly extensive merge conflicts.
nsChromeRegistry had lots of changes.
Dougt did most of the non-necko changes (thanks).
--HG--
rename : netwerk/protocol/http/nsHttpChannel.cpp => netwerk/protocol/http/nsHttpChannelAuthProvider.cpp
rename : netwerk/protocol/http/nsHttpChannel.h => netwerk/protocol/http/nsHttpChannelAuthProvider.h
2010-06-22 17:33:57 -07:00
Josh Matthews
a896ac2531
Bug 564382 - Remove CPOWs from PContentProcess tree. r=olli
2010-06-17 14:10:14 -07:00
Doug Turner
b2c88178e3
Merging with M-C.
...
Hand merged the following files:
U chrome/src/nsChromeRegistry.cpp
U chrome/src/nsChromeRegistry.h
U content/base/src/nsFrameLoader.cpp
U content/base/src/nsFrameLoader.h
U dom/src/geolocation/nsGeolocation.cpp
U dom/src/geolocation/nsGeolocation.h
U netwerk/build/Makefile.in
U netwerk/cookie/nsCookieService.cpp
U netwerk/cookie/nsCookieService.h
--HG--
rename : extensions/cookie/test/unit/test_cookies.js => extensions/cookie/test/unit/test_cookies_thirdparty.js
rename : netwerk/cookie/src/nsCookieService.cpp => netwerk/cookie/nsCookieService.cpp
rename : netwerk/cookie/src/nsCookieService.h => netwerk/cookie/nsCookieService.h
rename : netwerk/dns/src/nsIDNKitInterface.h => netwerk/dns/nsIDNKitInterface.h
rename : netwerk/protocol/http/src/nsHttp.h => netwerk/protocol/http/nsHttp.h
rename : netwerk/protocol/http/src/nsHttpChannel.cpp => netwerk/protocol/http/nsHttpChannel.cpp
rename : netwerk/protocol/http/src/nsHttpChannel.h => netwerk/protocol/http/nsHttpChannel.h
rename : netwerk/protocol/http/src/nsHttpChunkedDecoder.h => netwerk/protocol/http/nsHttpChunkedDecoder.h
rename : netwerk/protocol/http/src/nsHttpHandler.cpp => netwerk/protocol/http/nsHttpHandler.cpp
rename : netwerk/protocol/http/src/nsHttpHeaderArray.h => netwerk/protocol/http/nsHttpHeaderArray.h
rename : netwerk/protocol/http/src/nsHttpRequestHead.h => netwerk/protocol/http/nsHttpRequestHead.h
rename : netwerk/protocol/http/src/nsHttpResponseHead.h => netwerk/protocol/http/nsHttpResponseHead.h
rename : netwerk/protocol/http/src/nsHttpTransaction.cpp => netwerk/protocol/http/nsHttpTransaction.cpp
rename : netwerk/protocol/res/src/nsResProtocolHandler.cpp => netwerk/protocol/res/nsResProtocolHandler.cpp
rename : netwerk/protocol/res/src/nsResProtocolHandler.h => netwerk/protocol/res/nsResProtocolHandler.h
2010-06-07 13:38:02 -07:00
Robert Sayre
c1d57c9e55
Merge.
2010-06-06 14:56:31 -04:00
Robert Sayre
899c142ca3
Merge tracemonkey to mozilla-central.
2010-06-06 14:55:52 -04:00
Robert Sayre
cecd0f18ee
Merge mozilla-central to tracemonkey.
2010-06-06 11:28:04 -04:00
Nicholas Nethercote
0f7c36fac7
Update nanojit-import-rev stamp.
2010-06-05 20:15:51 -07:00
Jacob Bramley
f977ca1e42
Remove stack-size limitations in asm_spill for ARM. [Bug 561977] [r=rreitmai]
2010-06-05 20:12:54 -07:00
Robert Sayre
5a3f306961
Merge mozilla-central to tracemonkey.
2010-06-05 19:13:45 -04:00
Igor Bukanov
06ddfe2226
bug 566836 - eliminating JSObjectOps::dropProperty. r=gal
...
--HG--
extra : rebase_source : cdffca0a863d8a3dddbc77335fc3cdac2eff9f4b
2010-06-05 23:24:54 +02:00
Robert Sayre
c5199de06b
Merge backout.
2010-06-05 11:43:27 -04:00
Robert Sayre
878aca6218
Backed out changeset 52be13ea0488. Bug 556277 - Compute this eagerly in more cases. r=brendan. Suspected of performance regression on SunSpider unpack-code. 80ms -> 135ms.
2010-06-05 11:42:59 -04:00
Vladimir Vukicevic
2bf724adbb
b=570025; don't use JS_ConstructObjectWithArguments in typed arrays; r=gal
2010-06-04 12:03:43 -07:00
Jason Orendorff
5bf5fbc4e7
Bug 556277 - Compute this eagerly in more cases. r=brendan.
...
--HG--
extra : rebase_source : b295b576f019a95b55d12b86077aaef295e3eec8
2010-06-04 00:34:57 -07:00
Luke Wagner
3242a1c4d5
Fix misnamed js_DumpStackFrameChain (r=me)
...
--HG--
extra : rebase_source : c8d4e523cea0909dc190eac3c368d207d9c6abbb
2010-06-04 11:15:23 -07:00
Jason Orendorff
fc6b177f0b
Fix up the tests from bug 555246 to pass in the browser.
...
--HG--
extra : rebase_source : 7402ef86dc51523e55013345eba02a2e95122478
2010-06-03 23:33:40 -07:00
Andreas Gal
c3f36f58a1
Suppress deleted properties during iteration (569735, r=brendan).
2010-06-03 21:41:01 -07:00
Nicholas Nethercote
864fd5ca21
Backout the last NJ-to-TM merge (TM revisions b44daa2c0503 to b3167f8f9459, inclusive) because it caused lots of oranges. r=me.
2010-06-03 21:28:18 -07:00
Peter Van der Beken
3c3a5c3f7f
Backout 0f6b3c305e16 and 590f2dd5a293 to fix bustage
2010-06-04 15:26:26 +02:00
Peter Van der Beken
3692c2402a
Bustage fix.
2010-06-04 14:48:52 +02:00
Andreas Gal
b89b4107c3
Don't allow proxies to be fixed while handler traps execute (568473, r=igor).
2010-06-03 18:12:01 -07:00
Nicholas Nethercote
2e54f1ddb1
Update nanojit-import-rev stamp.
2010-06-03 17:53:33 -07:00
William Maddox
a4204a3095
Bug 555345 - Add profiling capability for JIT-generated code (vprof changes only) (r=rreitmai+)
...
An earlier patch to tamarin-redux included vprof patches as well as a coordinated set of changes
to other files in TR. The vprof directory is imported from nanojit-central, and the vprof changes
were overwritten. This patch separates the initialization of new profile records from the logging
of data therein, which facilitates the use of the profiling infrastructure from JIT-generated code.
--HG--
extra : convert_revision : 10b865fa5d413277c2e11c211302f75d87029f06
2010-06-03 16:02:28 -07:00
Steven Johnson
3b080ba357
Bug 527512 - ExprFilter missing trivial optimizations for ugt, ult (r=edwsmith,nnethercote)
...
--HG--
extra : convert_revision : 9bdc25ecdb1b5b3b6a81705df3ae573b812bc990
2010-06-03 10:35:26 -07:00
Jeff Walden
3661a5c498
Bug 548671 - Stop using shared-permanent properties "inherited" from the prototype to represent (function(){}).length and [].length. r=jorendorff
...
--HG--
extra : rebase_source : c5d48e4fe489f9e350798b49bed70f763e3abf37
2010-06-02 23:44:24 -07:00
Andreas Gal
8c624148c6
Add an API for compartments (570040, r=jorendorff).
2010-06-04 16:32:10 -07:00
Taras Glek
080da9a0bd
Bug 570195 - Object.prototype.hasOwnProperty doesn't set the JSRESOLVE_DETECTING flag. r=jorendorff, test by jorendorff.
...
--HG--
extra : rebase_source : 20ef8f345efc18887c296059aff94e8d4e754cc9
2010-06-04 14:20:53 -07:00
Leon Sha
cd0826d88d
http://www.dancertheband.com/ does not work correct with flash player 10.1 beta for solaris sparc. r=edwsmith
...
--HG--
extra : convert_revision : ccfc1e56c6f7dcf68719329cf1615aa5bfc4e3a5
2010-06-02 13:13:24 +08:00
Peter Van der Beken
5db3486c6d
Fix for bug 560462 (Use fast unwrapping for more quickstubs), part 3j - use fast unwrapping for nsIDOMElement_. r=jst.
...
--HG--
extra : rebase_source : f4cbf4af1213028818e48cd8c3c4200dab2b6c5e
2010-05-31 22:49:44 +02:00
Peter Van der Beken
33dbe5ebb2
Fix for bug 560462 (Use fast unwrapping for more quickstubs), part 3i - use fast unwrapping for nsIDOMDocument_, nsIDOMNSDocument_, nsIDOM3Document_. r=jst.
2010-05-31 22:46:56 +02:00
Peter Van der Beken
62bf49d8fa
Fix for bug 560462 (Use fast unwrapping for more quickstubs), part 3i - use fast unwrapping for nsIDOMDocument_, nsIDOMNSDocument_, nsIDOM3Document_. r=jst.
2010-05-31 22:46:56 +02:00
Peter Van der Beken
5458c8f217
Fix for bug 560462 (Use fast unwrapping for more quickstubs), part 3h - use fast unwrapping for nsIDOMNSHTMLElement_. r=jst.
2010-05-31 22:40:42 +02:00
William Maddox
b48e4f458f
Support arithmetic with branch on overflow on MIPS -- bug 560926 (r=rreitmai+)
...
Adds support for MIPS target lacking in earlier patch.
Bug 560926 - Add support for arithmetic with branch on overflow
We simply extend the existing logic for exit-on-overflow in the
manner done for other targets. There appear to other issues
with oveflow detection in general that are not dealt with here.
--HG--
extra : convert_revision : 3a62ee8cc7d6caf63cbd594f71814c8e8f3d4f7a
2010-05-27 18:00:45 -07:00
William Maddox
ae8740c74b
Fix missed renaming in NativeMIPS.cpp in patch for bug 560926 (r=rreitmai+)
...
Bug 560926 - Add support for arithmetic with branch on overflow
--HG--
extra : convert_revision : 8c6a61c935172f56eb7c660b476a5516cd3f04ab
2010-05-27 12:53:35 -07:00
Rick Reitmaier
303174277f
Fix winmo macro madness breakage
...
Extra parenthesis needed in order to correctly resolve macros;
NativeARM.cpp(2040) : error C2105: '--' needs l-value
--HG--
extra : convert_revision : 6f625518afb60a49717b27ba482ace08309cff12
2010-05-27 11:29:47 -07:00
Rick Reitmaier
9cc43411be
Bug 568393 - msvc 2008 compiler generates bad code for CallInfo static initializer (r+wmaddox)
...
ugh
--HG--
extra : convert_revision : f7c07b8ca96fc2ef1179171f05e69b841ac2865f
2010-05-26 18:02:31 -07:00
William Maddox
8964b34f79
Bug 560639 - Reinstate CodeAlloc::size(const CodeList*) recently removed as "dead" (r=edwsmith+ nnethercote+)
...
--HG--
extra : convert_revision : aec5028a49e90c4be18de667a2807896e3b689ad
2010-05-26 17:29:16 -07:00
Rick Reitmaier
f3647e34bc
Bug 567900 - Enable JIT verbose output for release debugger builds (r+stejohns)
...
Somewhere along the line -Dverbose=jit was disabled for all non-debug builds.
This means that we can no longer see jit generated verbose output unless we
build a debug build, which is very inconvenient.
Also, the define NJ_VERBOSE_DISABLED was introduced without a corresponding
ifdef around the JIT verbose flags of the shell which leads one to erroneously
assume that methods are not being JIT'd (no output visible).
As the verbose mechanism in the JIT adds less than 2% to overall size (measured
on xcode built x86-32 shell) , recommend adding it back.
--HG--
extra : convert_revision : 367041a278adc74f7db6c9a13166f1700b133ec7
2010-05-26 11:08:55 -07:00
Edwin Smith
7e2cdf62e7
Bug 560926 - Add support for arithmetic with branch on overflow (r=nnethercote+ edwsmith+ wmaddox+)
...
Patch to add 'j' (branch) variants of the exit-on-overflow instructions,
plus a few dependents:
32-bit:
LIR_addjovi
LIR_subjovi
LIR_muljovi
64-bit:
LIR_subq
LIR_addjovq
LIR_subjovq
--HG--
extra : convert_revision : 68023362b0833433a0bc0c3b5af8994894488f33
2010-05-26 14:03:14 -04:00
Doug Turner
3b935d5b7c
Merge with mc
2010-05-25 13:48:25 -07:00
Oleg Romashin
2538039097
Merge with latest mozilla central r 42802:ffbc3baf03ae
2010-05-25 15:19:33 -04:00
Olli Pettay
5331145f44
Use mozilla::void_t, so that CPOW compiles
2010-05-25 10:51:33 +03:00
Olli Pettay
93984b6736
m-c to e10 merge
2010-05-24 17:45:59 +03:00
Edwin Smith
cdbe76e6b6
Constant folding for LIR_i2q and ui2uq (bug 560106 r=gal+)
...
Helps x64 and ppc64.
--HG--
extra : convert_revision : e6ce59a07d5fd363fadc242a93a2677f6fc69989
2010-05-24 09:13:11 -04:00
Jacob Bramley
3a802dd334
Remove stack-size limitations in asm_spill for ARM. [Bug 561977] [r=rreitmai]
...
--HG--
extra : convert_revision : 09f682eb3100993e4f15758f209601c033d5ca3c
2010-05-24 11:30:06 +01:00
Jeff Walden
44e735af21
Split up DST tests a bit more. r=time
2010-06-03 15:48:26 -07:00