Commit Graph

8209 Commits

Author SHA1 Message Date
Doug Turner
ba5d48b7ab merge with mc 2010-06-30 10:50:45 -07:00
Neil Rashbrook
84258324f3 Bug 572996 Compiler dependencies don't work for debug-only includes r=ted 2010-06-30 12:44:18 +01:00
Doug Turner
cc747845de Merge with mozilla-central 2010-06-28 21:10:55 -07:00
Nick Thomas
59d3d880aa Bug 570022, bump Firefox/Gecko version to 4.0b2pre/2.0b2pre after 4.0b1 tagging, r=jhford, a=beltzner, CLOSED TREE 2010-06-29 15:09:55 +12:00
Doug Turner
901e02b2de 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
Ben Turner
1d8ac7be25 Bug 575399 - 'IndexedDB: Remove XPConnect slow paths from some IndexedDB methods'. r=sdwilsh 2010-06-28 15:22:41 -07:00
Ben Turner
8c6da83b49 Bug 574872 - 'Allow XPConnect to pass the JSContext through XPIDL when requested'. r=jst 2010-06-28 15:22:39 -07:00
Shawn Wilsher
57685bdd35 Bug 574811 - Rename IDBCursorRequest to IDBCursor
Updating interface names per recent specification changes.
r=bent

--HG--
rename : dom/indexedDB/IDBCursorRequest.cpp => dom/indexedDB/IDBCursor.cpp
rename : dom/indexedDB/IDBCursorRequest.h => dom/indexedDB/IDBCursor.h
2010-06-28 11:51:06 -07:00
Shawn Wilsher
aff7e85a3b Bug 574811 - Rename IDBIndexRequest to IDBIndex
Updating interface names per recent specification changes.
r=bent

--HG--
rename : dom/indexedDB/IDBIndexRequest.cpp => dom/indexedDB/IDBIndex.cpp
rename : dom/indexedDB/IDBIndexRequest.h => dom/indexedDB/IDBIndex.h
2010-06-28 11:51:06 -07:00
Shawn Wilsher
ad8dc5eaf7 Bug 574811 - Rename IDBObjectStoreRequest to IDBObjectStore
Updating interface names per recent specification changes.
r=bent

--HG--
rename : dom/indexedDB/IDBObjectStoreRequest.cpp => dom/indexedDB/IDBObjectStore.cpp
rename : dom/indexedDB/IDBObjectStoreRequest.h => dom/indexedDB/IDBObjectStore.h
2010-06-28 11:51:06 -07:00
Oleg Romashin
b8ab8239cd Auto-merge with m-c b51803f3fdef 2010-06-25 08:30:40 -04:00
Doug Turner
4719dd0705 Automerge w mozilla-central 2010-06-24 14:06:13 -07:00
Saint Wesonga
15c5e882f9 Bug 512447 - JSON.stringify does not correct handle replacer functions. r=sayrer 2010-06-24 13:32:07 -07:00
Jason Duell
d194b9d486 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
Doug Turner
ded51c1c5f 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
27b081a100 Merge. 2010-06-06 14:56:31 -04:00
Robert Sayre
5ca2a43d0d Merge tracemonkey to mozilla-central. 2010-06-06 14:55:52 -04:00
Robert Sayre
09e6a02419 Merge mozilla-central to tracemonkey. 2010-06-06 11:28:04 -04:00
Nicholas Nethercote
1a5f1be426 Update nanojit-import-rev stamp. 2010-06-05 20:15:51 -07:00
Jacob Bramley
bd578c73f1 Remove stack-size limitations in asm_spill for ARM. [Bug 561977] [r=rreitmai] 2010-06-05 20:12:54 -07:00
Robert Sayre
d9e86770e3 Merge mozilla-central to tracemonkey. 2010-06-05 19:13:45 -04:00
Igor Bukanov
02fc618d59 bug 566836 - eliminating JSObjectOps::dropProperty. r=gal
--HG--
extra : rebase_source : cdffca0a863d8a3dddbc77335fc3cdac2eff9f4b
2010-06-05 23:24:54 +02:00
Robert Sayre
37d6a810f7 Merge backout. 2010-06-05 11:43:27 -04:00
Robert Sayre
3a10b5449b 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
Dão Gottwald
b314909c2e Backed out changeset db6f8068e9a5 2010-06-29 17:49:21 +02:00
Saint Wesonga
c3669d7e9c Bug 562387 - Convert NS_NEWXPCOM/NS_DELETEXPCOM to new/delete. r=bsmedgerg 2010-06-29 17:14:36 +02:00
Zack Weinberg
cdb43c9602 Bug 571989 part 1: Move the contents of gfx/src/psshared into widget/src/gtk2, which is the sole user.
--HG--
rename : gfx/src/psshared/nsCUPSShim.cpp => widget/src/gtk2/nsCUPSShim.cpp
rename : gfx/src/psshared/nsCUPSShim.h => widget/src/gtk2/nsCUPSShim.h
rename : gfx/src/psshared/nsPSPrinters.cpp => widget/src/gtk2/nsPSPrinters.cpp
rename : gfx/src/psshared/nsPSPrinters.h => widget/src/gtk2/nsPSPrinters.h
rename : gfx/src/psshared/nsPaperPS.cpp => widget/src/gtk2/nsPaperPS.cpp
rename : gfx/src/psshared/nsPaperPS.h => widget/src/gtk2/nsPaperPS.h
2010-06-28 10:36:17 -07:00
Shawn Wilsher
1dd26b5f02 Bug 574811 - Rename IDBDatabaseRequest to IDBDatabase
Updating interface names per recent specification changes.
r=bent

--HG--
rename : dom/indexedDB/IDBDatabaseRequest.cpp => dom/indexedDB/IDBDatabase.cpp
rename : dom/indexedDB/IDBDatabaseRequest.h => dom/indexedDB/IDBDatabase.h
2010-06-28 09:46:49 -07:00
Shawn Wilsher
7efa6fa6f7 Bug 574811 - Rename IDBTransactionRequest to IDBTransaction
Updating interface names per recent specification changes.
r=bent

--HG--
rename : dom/indexedDB/IDBTransactionRequest.cpp => dom/indexedDB/IDBTransaction.cpp
rename : dom/indexedDB/IDBTransactionRequest.h => dom/indexedDB/IDBTransaction.h
2010-06-28 09:46:21 -07:00
Shawn Wilsher
8f3f92a5f4 Bug 574740 - Rename nsIIndexedDatabaseRequest to nsIIDBFactory
Update interface names per specification.
r=bent

--HG--
rename : dom/indexedDB/IndexedDatabaseRequest.cpp => dom/indexedDB/IDBFactory.cpp
rename : dom/indexedDB/IndexedDatabaseRequest.h => dom/indexedDB/IDBFactory.h
rename : dom/indexedDB/nsIIndexedDatabaseRequest.idl => dom/indexedDB/nsIIDBFactory.idl
2010-06-28 09:44:30 -07:00
timeless
5a386eb050 Bug 568007 - js_GetReservedSlot is too friendly to api abusers r=jorendorff 2010-06-28 12:00:07 +02:00
Masatoshi Kimura
cb1273c655 Bug 570365 - Remove -MANIFESTUAC:NO linker flag from configure r=ted.mielczarek
--HG--
extra : rebase_source : 75eb9e70e04abac7e61e835f62f0aef82c085cec
2010-06-27 01:33:17 +02:00
Jacek Caban
07bde20ee7 Bug 573341 - Wrong AVMPLUS_ALIGN16 declaration on mingw r=dvander
--HG--
extra : rebase_source : 1ae22e8abd799137e661f34b0c8346006a511617
2010-06-27 01:28:10 +02:00
Jacek Caban
119d3d97b4 Bug 569821 - js compilation failure on mingw-w64 r=dvander
--HG--
extra : rebase_source : 849d0c26e909917d6bdf7643928978cf59ed61b5
2010-06-27 01:27:18 +02:00
Daniel Holbert
fd37dc44c5 Bug 557566 followup: disable FAIL_ON_WARNINGS on Android. r=mwu 2010-06-26 15:15:35 -07:00
Ginn Chen
38f134ccbc Bug 574639 fix a typo in last commit 2010-06-27 01:09:34 +08:00
Ginn Chen
313e182b81 Bug 574639 Several fixes for configure.in and rules.mk for Solaris r=bsmedberg 2010-06-27 00:56:07 +08:00
Vladimir Vukicevic
8527f694f4 b=570025; don't use JS_ConstructObjectWithArguments in typed arrays; r=gal 2010-06-04 12:03:43 -07:00
Jason Orendorff
2ab131a259 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
6950cf8510 Fix misnamed js_DumpStackFrameChain (r=me)
--HG--
extra : rebase_source : c8d4e523cea0909dc190eac3c368d207d9c6abbb
2010-06-04 11:15:23 -07:00
Jason Orendorff
6e799da354 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
64497c9a69 Suppress deleted properties during iteration (569735, r=brendan). 2010-06-03 21:41:01 -07:00
Nicholas Nethercote
3c1d859013 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
4192845ce5 Backout 0f6b3c305e16 and 590f2dd5a293 to fix bustage 2010-06-04 15:26:26 +02:00
Peter Van der Beken
bbcaeb8ff9 Bustage fix. 2010-06-04 14:48:52 +02:00
Andreas Gal
3a5ff09808 Don't allow proxies to be fixed while handler traps execute (568473, r=igor). 2010-06-03 18:12:01 -07:00
Nicholas Nethercote
d3f076e3b3 Update nanojit-import-rev stamp. 2010-06-03 17:53:33 -07:00
William Maddox
714929c4de 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
1f9d87d23f 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
2a8187e20b 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