Doug Turner
611fabe87f
Bug 570945 - Qt is not compiling. r=me. Slightly modifed based on chris.jones comments
2010-06-09 16:02:38 -07:00
Doug Turner
217acab227
Fixup to http after the necko-file-move
...
--HG--
rename : netwerk/protocol/http/src/HttpBaseChannel.cpp => netwerk/protocol/http/HttpBaseChannel.cpp
rename : netwerk/protocol/http/src/HttpBaseChannel.h => netwerk/protocol/http/HttpBaseChannel.h
rename : netwerk/protocol/http/src/HttpChannelChild.cpp => netwerk/protocol/http/HttpChannelChild.cpp
rename : netwerk/protocol/http/src/HttpChannelChild.h => netwerk/protocol/http/HttpChannelChild.h
rename : netwerk/protocol/http/src/HttpChannelParent.cpp => netwerk/protocol/http/HttpChannelParent.cpp
rename : netwerk/protocol/http/src/HttpChannelParent.h => netwerk/protocol/http/HttpChannelParent.h
rename : netwerk/protocol/http/src/PHttpChannel.ipdl => netwerk/protocol/http/PHttpChannel.ipdl
rename : netwerk/protocol/http/src/PHttpChannelParams.h => netwerk/protocol/http/PHttpChannelParams.h
rename : netwerk/protocol/http/src/ipdl.mk => netwerk/protocol/http/ipdl.mk
2010-06-07 14:40:08 -07:00
Doug Turner
7f7c2c6b10
Moving cookie ipc source to the right place.
2010-06-07 14:19:20 -07:00
Doug Turner
6e5944e4fe
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
Oleg Romashin
91d5a62423
Merge with latest mozilla central r 42802:ffbc3baf03ae
2010-05-25 15:19:33 -04:00
Olli Pettay
3fed591ba3
m-c to e10 merge
2010-05-24 17:45:59 +03:00
Doug Turner
6f853bbfda
Merged with MC. Hand merged netwerk/protocol/http/src/nsHttpHandler.cpp
...
also removed modules/plugin/default*
2010-05-17 08:59:15 -07:00
Chris Jones
93323859a7
Merge missed nsChromeRegistry change from m-c and fix busted content-process XPCOM/chromium event loop.
2010-05-14 01:41:14 -05:00
Chris Jones
fea6936df1
Merged m-c
2010-05-13 18:04:53 -05:00
Chris Jones
0b2a3d2985
No bug: Reduce IPDL-compiler spew and stop logging to stderr. irc-r=bsmedberg
2010-05-13 17:25:20 -05:00
Doug Turner
b2b1085458
Bug 552822 - IPC remoting of geolocation prompt. r=olli/r=jdm
2010-05-13 10:44:51 -07:00
Ben Newman
14294cc97f
Bug 565078 - Move js/src/ipc to js/ipc. r=bsmedberg
...
--HG--
rename : js/src/ipc/CPOWTypes.h => js/ipc/CPOWTypes.h
rename : js/src/ipc/ContextWrapperChild.h => js/ipc/ContextWrapperChild.h
rename : js/src/ipc/ContextWrapperParent.h => js/ipc/ContextWrapperParent.h
rename : js/src/ipc/Makefile.in => js/ipc/Makefile.in
rename : js/src/ipc/ObjectWrapperChild.cpp => js/ipc/ObjectWrapperChild.cpp
rename : js/src/ipc/ObjectWrapperChild.h => js/ipc/ObjectWrapperChild.h
rename : js/src/ipc/ObjectWrapperParent.cpp => js/ipc/ObjectWrapperParent.cpp
rename : js/src/ipc/ObjectWrapperParent.h => js/ipc/ObjectWrapperParent.h
rename : js/src/ipc/PContextWrapper.ipdl => js/ipc/PContextWrapper.ipdl
rename : js/src/ipc/PObjectWrapper.ipdl => js/ipc/PObjectWrapper.ipdl
rename : js/src/ipc/ipdl.mk => js/ipc/ipdl.mk
rename : js/src/ipc/jar.mn => js/ipc/jar.mn
rename : js/src/ipc/tests/Makefile.in => js/ipc/tests/Makefile.in
rename : js/src/ipc/tests/adhoc/child.html => js/ipc/tests/adhoc/child.html
rename : js/src/ipc/tests/adhoc/test.xul => js/ipc/tests/adhoc/test.xul
rename : js/src/ipc/tests/unit/cpow_child.js => js/ipc/tests/unit/cpow_child.js
rename : js/src/ipc/tests/unit/test_cpow.js => js/ipc/tests/unit/test_cpow.js
2010-05-11 10:44:42 -07:00
Doug Turner
7492065872
merge with m-c. resolved conflicts in:
...
U chrome/src/nsChromeRegistry.cpp
U content/base/src/Makefile.in
U dom/base/nsDOMClassInfo.cpp
U toolkit/toolkit-tiers.mk
--HG--
rename : toolkit/mozapps/extensions/test/unit/test_bug541420.js => toolkit/mozapps/extensions/test/xpcshell/test_bug541420.js
2010-05-11 11:09:54 -07:00
Benoit Girard
7c3b2bbde3
Bug 528146: Run plug-in code on the thread that starts in main(). r=cjones
...
--HG--
rename : dom/plugins/PluginThreadChild.cpp => dom/plugins/PluginProcessChild.cpp
rename : dom/plugins/PluginThreadChild.h => dom/plugins/PluginProcessChild.h
rename : ipc/ipdl/test/cxx/IPDLUnitTestThreadChild.cpp => ipc/ipdl/test/cxx/IPDLUnitTestProcessChild.cpp
rename : ipc/ipdl/test/cxx/IPDLUnitTestThreadChild.h => ipc/ipdl/test/cxx/IPDLUnitTestProcessChild.h
2010-05-10 23:18:00 -05:00
Chris Jones
9a9c6b5800
Bug 565462: Implement operator== for IPDL structs and unions. r=bsmedberg
2010-05-22 14:35:42 -05:00
Chris Jones
7b752496f2
Tests for bug 560000
2010-05-22 14:35:40 -05:00
Chris Jones
91c7c512cc
Bug 560000: Allow IPDL unions and structs to be recursively defined. r=benjamn
2010-05-22 14:35:38 -05:00
Chris Jones
5a179e6412
Tests for bug 553846.
...
--HG--
rename : ipc/ipdl/test/cxx/PTestArrays.ipdl => ipc/ipdl/test/cxx/PTestDataStructures.ipdl
rename : ipc/ipdl/test/cxx/PTestArraysSub.ipdl => ipc/ipdl/test/cxx/PTestDataStructuresSub.ipdl
rename : ipc/ipdl/test/cxx/TestArrays.cpp => ipc/ipdl/test/cxx/TestDataStructures.cpp
rename : ipc/ipdl/test/cxx/TestArrays.h => ipc/ipdl/test/cxx/TestDataStructures.h
2010-05-22 14:35:37 -05:00
Chris Jones
3e08fa01c3
Bug 553846: Implement an IPDL "struct" type. r=benjamn
2010-05-22 14:35:35 -05:00
Chris Jones
34baacd79e
Bug 522547: Serialize/deserialize IPC messages in a "streaming" style. r=bent
2010-05-22 14:35:34 -05:00
Chris Jones
2c7ffd5131
Bug 562741: Allow |Shmem|s to be shared across different protocol trees. r=bent
2010-05-22 14:35:33 -05:00
Chris Jones
834a27d892
Bug 562741: Refcount |SharedMemory|s. r=joedrew
2010-05-22 14:35:32 -05:00
Chris Jones
c55a427970
Bug 564086: Frontend support for IPDL process graphs and Bridge()ing processes. r=benjamn
2010-05-22 14:35:31 -05:00
Chris Jones
e530ee8961
Bug 565844: Distinguish between illegal-value and couldn't-process errors in IPDL error messages. r=bent
2010-05-22 14:35:29 -05:00
Chris Jones
c2a0ffd0a2
Bug 563747: Allow building ipc/chromium on PPC, enable MOZ_IPC for mac/ppc. r=bsmedberg
2010-05-04 19:22:34 -05:00
Doug Turner
ddd12dbe18
Merge with m-c. no hand edits
2010-04-29 21:04:50 -07:00
Mike Hommey
059f669403
Bug 561971 - Cleanup ipdl generated code and compiled python on make clean [r=benjamin]
...
--HG--
extra : rebase_source : d4ab3ddde23f3b98521756f8362376fef6b76764
2010-04-29 07:21:14 +00:00
Jim Mathies
fe1ee01716
Bug 558986 - detect and resolve races between MS-COM RPC and IPDL RPC by implementing IMessageFilter and processing pending IPDL RPC calls while waiting for MS-COM RPC responses. Original patch by bsmedberg, r=cjones/jimm/ehsan with followup fixes by Jim Mathies, r=bsmedberg
...
--HG--
extra : rebase_source : 214029d3188f8aa00948e0dcdc3c11cd279d1569
2010-05-21 11:48:34 -04:00
Masatoshi Kimura
b7b0adac59
Bug 567497 - "Files executed via download manager cause Win7 compatibility mode to permanently apply to firefox.exe and not downloaded file" [r=ted]
...
(transplanted from 63b89b3114614929b80a358163a2d1ae9feea91b)
--HG--
extra : transplant_source : c%B8%9B1%14aI%29%B8%0A5%81c%A2%D1%AE%9F%EE%A9%1B
2010-05-24 09:55:00 -04:00
Chris Jones
70959e98d5
Bug 551071: Suppress valgrind-reported "mismatched free()" (false alarm) of chromium objects by using mozalloc there (complements STL wrappers). Add a gross hack to prevent mozalloc macros from conflicting with methods in jscntxt.h. r=bent r=bsmedberg dependent-r=brendan
2010-06-04 18:16:34 -05:00
Jim Mathies
10cc88a617
Bug 558986 - Backout of fix for crashes in TSF with Flash/Silverlight on tablets. CLOSED TREE
2010-05-17 14:36:43 -05:00
Benjamin Smedberg
8a66748579
Bug 558986 - Fix for crashes in TSF with Flash/Silverlight on tablets (OLE/COM nested event loops). r=cjones, jimm, ehsan.
2010-05-17 11:33:34 -05:00
Chris Jones
4b51cdc5bd
Followup to bug 559898: fix cycle checker to allow self-loop special case.
2010-04-27 02:12:39 -05:00
Chris Jones
e1e4a9c4d4
Followup to bug 541131: update |include protocol "PFoo.ipdl"| usages in e10s.
2010-04-27 02:12:38 -05:00
Chris Jones
63ca8b65c6
Merged m-c
2010-04-27 01:53:06 -05:00
Chris Jones
3853bf3560
Bug 518881: Fix unused-result warnings in IPDL/C++ unit tests.
2010-04-27 00:43:01 -05:00
Chris Jones
784888920c
Bug 518881: Make Send/Call*() methods for IPDL parent actors warn_unused_result. r=bent
2010-04-27 00:43:00 -05:00
Chris Jones
30361f401e
Bug 545733: |const|-ify some *Channel methods. r=bent
2010-04-27 00:42:59 -05:00
Chris Jones
a09ef25b0d
Bug 559898: Allow (sub-)protocols to manage themselves. r=bsmedberg
2010-04-26 20:11:48 -05:00
Chris Jones
993273dd4c
Bug 559953: Add a |const nsTArray<Subactor*>& ManagedFoo();| accessor. r=bent
2010-04-26 20:11:47 -05:00
Thomas Lee
724a5a9e20
Bug 541131: Include IPDL headers as |include protocol PFoo;|. r=cjones
2010-04-26 20:11:46 -05:00
Chris Jones
ee58a6e501
Bug 554244: Get the right loc info for message declarations. r=bent
2010-04-26 20:11:44 -05:00
Chris Jones
3f29d383ad
Bug 555276: Top-level protocols should handle shmem messages if any subprotocol uses it. r=bent
2010-04-26 20:11:43 -05:00
Chris Jones
fc9a2571ad
Bug 555275: Clean up shared memory segments when the top-level actor dies. r=bent
2010-04-26 20:11:42 -05:00
Chris Jones
9edec1c173
Bug 555275: Implement a DeallocShmem() interface. r=bent
2010-04-26 20:11:40 -05:00
Doug Turner
6126049649
merge with m-c.
2010-04-26 23:17:51 -07:00
Benjamin Smedberg
6f96eb277f
Bug 561871 part B: don't use Windows events to enter/exit a nested event loop within an RPC stack frame, because delivery of those events isn't always associated with the correct stack frame, and also because the events can be lost if they race with an incoming RPC reply message. Instead, keep a linked list (on the stack) of RPC frames globally and per-channel, to associate requests to enter a nested event loop with the correct frame, r=jimm
...
--HG--
extra : rebase_source : 694186dde4643904752c67e0c6eb7a6ad1dd2082
2010-04-28 11:01:09 -04:00
Benjamin Smedberg
6c8be0b618
Bug 561871, part A: IPDL changes to expose ProcessNativeEventsInRPCCall from the toplevel actor, r=cjones
...
--HG--
extra : rebase_source : 3c5a7516aa43ba17b796b8e8757d74d634689a09
2010-04-28 11:00:13 -04:00
Oleg Romashin
2a96eab718
Bug 553904 - Child tab process crashes on attempt to initialize child plugin process. r=bent.mozilla
2010-04-20 21:43:51 +03:00
Doug Turner
5350023988
Automerge with mc. no manual changes
2010-04-21 03:31:13 -07:00
Mike Hommey
64be11b35e
Bug 558789 - Allow to build against system libevent [r=benjamin, r=cjones]
...
--HG--
extra : rebase_source : cd964ba40277ebd89dda8392c8a842ca9ef01bf8
2010-04-20 09:06:55 +02:00
Chris Jones
2918f2e692
Merge mozilla-central
2010-04-16 01:34:35 -05:00
Chris Jones
ff5a2f66b5
Bug 548437: Test SysV shmem.
2010-04-16 00:29:17 -05:00
Joe Drew ext:(%20and%20Chris%20Jones%20%3Cjones.chris.g%40gmail.com%3E)
c706584d5f
Bug 548437: Add a SysV shmem subtype of SharedMemory. r=dougt
2010-04-16 00:29:16 -05:00
Jonathan Kew
c7cf7577e5
bug 558489 - prevent cocoa object autorelease-leakage during ipc startup. r=josh
2010-04-15 09:31:10 +01:00
Josh Matthews
c8fc5f9966
b=539406 retain existing listener in AyncChannel for GeckoChildProcessHost::OnChannelConnected r=cjones
2010-04-12 12:13:00 +12:00
Oleg Romashin
f3e3834d75
Merged with mozilla-central
2010-04-07 06:59:04 -04:00
Ben Newman
0efa26c6fe
Bug 554942 - [E10s] Sort out what object TabParent::GetGlobalJSObject should return and how. r=smaug
2010-03-30 21:41:44 -07:00
Olli Pettay
c007495e7a
Bug 555573 - [e10s] IPDL generates code which may not compile on Windows, r=cjones
2010-03-29 23:29:07 +03:00
Doug Turner
55aabe42b5
merge from m-c. manually merging modules/plugin/test/testplugin/nptest.cpp dom/plugins/PluginModuleChild.cpp.
2010-03-26 14:22:48 -07:00
Dan Witte
5cfc06daae
Bug 537156 - [e10s] Implement cookies. r=jduell,sdwilsh; sr=bz
2010-03-25 16:02:28 -07:00
Chris Jones
e865231f39
Bug 557011: Ensure OOP crashreporter has been initialized on mac. r=bsmedberg
2010-04-12 15:47:47 -05:00
Jim Mathies
5fe1aa1267
Bug 558503 - [OOPP] Watching netflix video: Silverlight crashes the plugin helper. r=bsmedberg.
2010-04-12 15:25:57 -05:00
Doug Turner
6a88bb855c
Bug 570945 - Qt is not compiling. r=me. Slightly modifed based on chris.jones comments
2010-06-09 16:02:38 -07:00
Gavin Sharp
54eaa18186
Bug 552889: avoid spamming stderr in release builds, r=cjones
2010-05-06 15:17:08 -04:00
Dão Gottwald
f15f398c69
Backed out changeset 48e202424e35
2010-05-13 18:26:36 +02:00
Martin Stránský
6acba6095d
Bug 562029 - ipc fails to build with gcc version 4.1.2. r=chris.jones
2010-05-13 17:38:19 +02:00
Oleg Romashin
7135ac8e96
Bug 562285 - Rewrite gfxSharedImageSurface class to be compatible with IPC Shmem.r=jones.chris.g, sr=vladimir
...
--HG--
extra : rebase_source : 245e4c8ee52856bcf8900a049132b9f5b4a53bbb
2010-05-13 11:52:59 -04:00
Jim Mathies
4e3abdc37b
Bug 545338 - RPCChannel should use events rather than thread messages for NotifyWokerThread. r=bent.
2010-03-25 16:53:10 -05:00
Mike Hommey
3487aea406
Bug 542460 - Remove executable permission on source files [r=ted.mielczarek]
2010-05-06 09:32:50 +02:00
Mike Hommey
c00a04c907
Bug 563294 - Include memory.h instead of memory to avoid failure to build in gcc C++0x mode [r=benjamin]
2010-05-06 09:16:54 +02:00
Chris Jones
664ac3f4df
Bug 563747: Allow building ipc/chromium on PPC, enable MOZ_IPC for mac/ppc. r=bsmedberg
2010-05-05 16:35:09 -05:00
Kai Engert
9b1b0e240d
Bug 560615, XPCOM fails to build because of incorrect IPC code
...
r=jones.chris.g
2010-05-03 13:35:19 +02:00
Chris Jones
450e526b0a
Followup to bug 544936: Open child process handles with more privileges. r=bsmedberg
2010-03-24 19:12:31 -05:00
Chris Jones
484bf7cef6
Bug 554262 - [OOPP] Silverlight context menu hangs the browser. r=bent, jmathies.
2010-03-24 16:49:54 -05:00
Jim Mathies
5b1f0953f8
Bug 553606 - [OOPP] Limit spin loop to a call depth of one. r=bent.
2010-03-24 16:49:05 -05:00
Chris Jones
2e38d1fe43
Bug 544936, part 4: Move some common code for dealing with minidumps and .extra files into nsExceptionHandler. r=ted
2010-03-24 16:22:01 -05:00
Ben Turner
b75898abc2
Bug 521118 - '[OOPP] Need NPAPI threadsafety checks in plugin process'. r=cjones, a=dbaron for CLOSED TREE
2010-03-24 12:30:45 -07:00
Doug Turner
c5f8387c1e
Bug 547881 - Made a mistake when fixing a nit. r=me
2010-03-24 09:20:36 -07:00
Chris Jones
25b99b72ca
Bug 554466: Only EnqueuePending when there's been an rpc out-call. r=bent
2010-03-24 00:52:47 -05:00
Oleg Romashin
1dbe3f967c
Bug 564997 - _state is not initialized in QT-MessagePumpForUI ctor. r=dougt
...
--HG--
extra : rebase_source : 07e186531ad8b4d3bd71778d2a0b3d613b8ddc17
2010-05-12 05:46:33 -04:00
Chris Jones
35629f37dd
Bug 544518: Send Messages directly through the Transport on the IO thread rather than through a no-added-value AsyncChannel indirection. r=bent
2010-04-22 18:53:30 -05:00
Oleg Romashin
c5e09b6795
Bug 553904 - Child tab process crashes on attempt to initialize child plugin process. r=bent.mozilla
...
--HG--
extra : rebase_source : 2a018b5f9c74a713e493643e611b330e08e1afd8
2010-04-20 21:43:51 +03:00
Ben Turner
febd314390
Bug 558190 - 'Plugin container process name needs to be more appropriate'. r=bsmedberg
...
--HG--
rename : ipc/app/mozilla-runtime.exe.manifest => ipc/app/plugin-container.exe.manifest
2010-04-09 15:40:14 -07:00
Ben Turner
7646c9d84c
Backed out changeset 25879ce33e7a
2010-04-09 20:57:30 -07:00
Ben Turner
2389c11903
Bug 558190 - 'Plugin container process name needs to be more appropriate'. r=bsmedberg
...
--HG--
rename : ipc/app/mozilla-runtime.exe.manifest => ipc/app/plugin-container.exe.manifest
2010-04-09 15:40:14 -07:00
Martin Stránský
429576844b
Make ipc/ build with gcc 4.1.2. r=cjones
2010-05-24 09:36:49 +12:00
Ben Newman
c10469b486
Bug 540126 - CPOW: Let PObjectWrapper actors use ContentProcessParent::RequestRunToCompletion(). r=mrbkap sr=jst
2010-01-20 18:24:14 -08:00
Chris Jones
0fd083fad2
Second followup to bug 542053; missed a spot.
2010-04-09 15:24:41 -05:00
Chris Jones
03de1e6736
Bustage followup to bug 542053.
2010-04-09 15:21:08 -05:00
Chris Jones
d3f8ba7999
Bug 542053: Set LD_LIBRARY_PATH=[GRE dir] for mozilla-runtime on linux. r=bsmedberg
2010-04-09 15:03:08 -05:00
Jim Mathies
60b7d64908
Bug 563381 - Sync AppUserModelID with plugin-container. r=bsmedberg.
2010-05-14 19:25:10 -05:00
Chris Jones
16949a575d
Bug 566054: Add missing error message case, tighten up UNREACHED guard. r=bent
2010-05-14 21:05:34 -05:00
Ben Newman
8543260519
Bug 516522 - CPOW: Cross-Process (JavaScript) Object Wrapper. r=mrbkap r=bent sr=jst
2009-11-06 12:43:39 -08:00
Jason Duell
6ffab16dcf
Bug 536279 (send request headers to chrome channel) and bug 536283 (send full nsHttpResponseHead in OnStartRequest) a=jae-seong r=dwitte,jduell
2010-03-23 08:14:36 -07:00
Doug Turner
8dfa93be1c
today is two merge monday
2010-03-22 22:05:25 -07:00
Chris Jones
be45a8cce8
Bug 544623 - IPDL: Shmem buffers should be shared across actor tree. r=bent
2010-03-22 22:02:16 -07:00
Chris Jones
e093207105
Bug 544623 - IPDL: Shmem buffers should be shared across actor tree. r=bent
2010-03-22 21:56:42 -07:00
Joe Drew
71a6fe1619
Bug 544607 - Add Shmem::IsWriteable/Shmem::IsReadable r=cjones
...
--HG--
extra : rebase_source : 25a2ef756c682bc6a74797025e223fbbc3aaf4d3
2010-03-22 13:33:43 -07:00
Doug Turner
0a1d6a724c
merge from mozilla-central. no merges required
2010-03-23 02:53:35 -07:00