Commit Graph

1049 Commits

Author SHA1 Message Date
Robert O'Callahan
135656e0c4 Bug 664918. Part 7: Let the "src" attribute of HTML media elements accept a MediaStream DOM object, to make the media element play back the contents of the given stream. r=cpearce,jesup 2012-04-30 15:12:28 +12:00
Paul ADENOT
70eca6f58d Bug 480376 - Implement mozHasAudio to indicate when there's no audio track available. r=cpearce 2012-04-28 11:01:10 -04:00
Gregor Wagner
8785ab0303 Bug 743336 - Settings API: Add service. r=fabrice 2012-04-27 16:21:31 -07:00
Gijs Kruitbosch
bdf19a4af3 Bug 539095 - Expose high-res timers to web content (performance.now()). r=bz, sr=smaug
--HG--
extra : transplant_source : o%9F%061%D4%B5%7D%5C%FB%95%5D%16%27%DEKU%EC%21%3AR
2012-04-27 09:22:06 +02:00
Masayuki Nakano
0a7ff20ae3 Bug 166240 part.8 Add tests for KeyboardEvent.location (synthesized events) r=smaug, sr=jst 2012-05-03 17:35:02 +09:00
Masayuki Nakano
1ecd4d10e9 Bug 166240 part.1 Add D3E KeyboardEvent.location r=smaug, sr=jst 2012-05-03 17:35:01 +09:00
Ehsan Akhgari
55fc171cde Merge the last green PGO changeset from mozilla-inbound to mozilla-central 2012-04-25 10:06:04 -04:00
Ms2ger
af9b9b29cb Bug 731832 - Backout bug 587021 for breaking a specific web page; r=bz 2012-04-24 21:04:37 +02:00
Matthew Schranz
d4f85eab49 Bug 686913 - HTMLProgressElement should no longer be a form control. r=mounir a=mfinkle 2012-04-24 12:03:21 +02:00
Joe Drew
3019e4b61c Backout 492d12fa8b65 (bug 732016) for regressions. a=regression
--HG--
extra : rebase_source : cda0401baa2c3e5f6192f76c1cd25eca8187a9a0
2012-04-23 11:13:33 -07:00
Masayuki Nakano
eab74edd47 Bug 630811 part.7 Add getModifierState() to DOM KeyboardEvent and DOM MouseEvent r=smaug, sr=jst 2012-04-25 12:00:02 +09:00
Masayuki Nakano
cea6824fb9 Bug 630811 part.3 Improve nsDOMWindowUtils::send*Event() for new modifiers r=smaug 2012-04-25 12:00:02 +09:00
Masayuki Nakano
faa22dcf29 Bug 731878 part.2 Implement D3E MouseEvent.buttons attribute r=smaug, sr=jst 2012-04-25 12:00:01 +09:00
Timothy Nikkel
b9a7468478 Bug 732016 Allow override of the scroll port size used for clamping scroll positions. r=roc 2012-04-24 13:52:35 -05:00
Boris Zbarsky
224115946f Bug 742217. Reduce the use of nested namespaces in our binding code. r=peterv,bent
In the new setup, all per-interface DOM binding files are exported into
mozilla/dom.  General files not specific to an interface are also exported into
mozilla/dom.

In terms of namespaces, most things now live in mozilla::dom.  Each interface
Foo that has generated code has a mozilla::dom::FooBinding namespace for said
generated code (and possibly a mozilla::bindings::FooBinding_workers if there's
separate codegen for workers).

IDL enums are a bit weird: since the name of the enum and the names of its
entries all end up in the same namespace, we still generate a C++ namespace
with the name of the IDL enum type with "Values" appended to it, with a
::valuelist inside for the actual C++ enum.  We then typedef
EnumFooValues::valuelist to EnumFoo.  That makes it a bit more difficult to
refer to the values, but means that values from different enums don't collide
with each other.

The enums with the proto and constructor IDs in them now live under the
mozilla::dom::prototypes and mozilla::dom::constructors namespaces respectively.
Again, this lets us deal sanely with the whole "enum value names are flattened
into the namespace the enum is in" deal.

The main benefit of this setup (and the reason "Binding" got appended to the
per-interface namespaces) is that this way "using mozilla::dom" should Just
Work for consumers and still allow C++ code to sanely use the IDL interface
names for concrete classes, which is fairly desirable.

--HG--
rename : dom/bindings/Utils.cpp => dom/bindings/BindingUtils.cpp
rename : dom/bindings/Utils.h => dom/bindings/BindingUtils.h
2012-05-03 00:35:38 -04:00
Tom Schuster
0fe26d128c Bug 711843 - Update JSAPI for typed arrays, remove uses of jstypedarray.h outside the engine [r=Waldo,bz,Ms2ger,bholley,bjacob,philikon,evilpie,bent,yourmama] [a=mfinkle thanks to gkw] 2012-01-14 09:43:00 -08:00
Ryan VanderMeulen
748a97a1ee Back out 149a80dafcb8 (bug 686913) due to build failures. a=YUNoTry? 2012-04-21 17:48:31 -04:00
Matthew Schranz
6d3d2ebee0 Bug 686913 - HTMLProgressElement and HTMLMeterElement should not be form controls. r=mounir, a=mfinkle 2012-04-21 17:35:42 -04:00
Timothy Nikkel
e472248f52 Bug 732016 Allow override of the scroll port size used for clamping scroll positions. r=roc 2012-04-19 20:54:54 -05:00
Olli Pettay
2547761e2e Bug 731875 - Geolocation doorhanger might cause a zombie compartment, GeoPositionOptions part, r=dougt 2012-04-16 22:08:48 +03:00
Ms2ger
f9cec820ad Bug 732708 - Part b: Devirtualize BroadcastChangeNotification and remove a dead implementation; r=honzab 2012-04-14 15:06:30 +02:00
Ms2ger
b8ae2456b2 Backing out bf0a78471e5e:dc7022e2d807 for inexplicable windows crashes. 2012-04-14 17:52:34 +02:00
Ms2ger
4baa902d14 Bug 743573 - Fix a number of build warnings in dom/; r=volkmar 2012-04-14 15:09:47 +02:00
Ms2ger
82c52d6ef5 Bug 732708 - Part b: Devirtualize BroadcastChangeNotification and remove a dead implementation; r=honzab 2012-04-14 15:06:30 +02:00
Mark Finkle
06836e9d32 Bug 737050 - Add support for the WEBAPP intent r=blassey r=bnicholson r=gavin 2012-04-13 22:45:25 -04:00
Gregory Szorc
24ce7aadaf Merge mozilla-central into inbound 2012-04-11 18:51:10 -07:00
Olli Pettay
9e236a1d43 Bug 742482 - Add support for MutationObserver.takeRecords(), r=sicking 2012-04-11 08:24:18 +03:00
David Humphrey (:humph)
5f9892f336 Bug 633602 - Implement Pointer Lock (Mouse Lock) API. r=roc,smaug 2012-04-11 17:55:21 -04:00
Aryeh Gregor
ce926d8719 Bug 742261 - Remove useless queryCommandText/execCommandShowHelp methods; r=ehsan 2012-04-04 15:30:33 +03:00
Boris Zbarsky
a25922d009 Bug 742549. Add a .crossOrigin IDL property. r=sicking
Note that the content attribute is crossorigin (lowercase) in SVG, hence the need to have different
content and IDL property names in the test.
2012-04-05 22:24:42 -04:00
Brad Lassey
d0e11c8d01 backout b51259905d85 because it needs sr 2012-04-05 02:02:52 -04:00
Brad Lassey
4a02ab3916 bug 738528 - still photo support for getUserMedia r=dougt 2012-04-04 23:32:38 -04:00
Nathan Froyd
648b4d2f3d Bug 732708 - remove nsIDOMStorageList; r=honzab 2012-03-28 12:33:41 -04:00
Kan-Ru Chen
bcddd7d2c9 Bug 710135 - Move screen.enabled/brightness to mozPower. r=jlebar,mounir sr=cjones,sicking 2012-04-03 01:51:00 -04:00
Ms2ger
baf72711e7 Bug 740771 - Stringify null for Storage.getItem/setItem/removeItem; r=mayhemer 2012-04-03 09:25:39 +02:00
Gregor Wagner
bee86ad93d Bug 734198 - Contacts API: Add Sorting. r=bent 2012-04-02 16:39:57 -07:00
Ed Morley
651aa424a1 Merge last PGO-green changeset of mozilla-inbound to mozilla-central 2012-03-31 22:41:59 +01:00
Olli Pettay
f198500ad9 Bug 641821, MutationObserver, r=sicking
--HG--
extra : rebase_source : a680c883b22976edf38eea23fb516215e081084f
2012-03-31 09:30:13 -07:00
Ed Morley
c7a3740e33 Merge mozilla-central to mozilla-inbound 2012-03-31 15:28:55 +01:00
Peter Van der Beken
09128a75d3 Fix for bug 740069 (Generate JS bindings in C++ with a python script for DOM objects on the main thread and in workers. Infrastructure and new bindings for XMLHttpRequest). Patch by bent/bz/bholley/jst/khuey/peterv, r=bent/bz/bholley/jlebar/khuey/peterv/sicking/smaug.
--HG--
rename : js/xpconnect/tests/mochitest/test_bug462428.html => dom/bindings/test/test_lookupGetter.html
2012-03-30 21:42:20 -07:00
Mounir Lamouri
d8342fc658 Bug 740188 - Screen Orientation API locking (1/3): DOM/HAL boilerplate. r=smaug sr=sicking 2012-03-29 12:43:16 -07:00
Ms2ger
a7ad2e10a7 Bug 738647 - DOMStorageImpl::GetKey shouldn't throw; r=honzab 2012-03-29 23:09:09 +02:00
Phil Ringnalda
b4da60b42d Back out 0cb85ff0f764 (bug 738568), 9949bb092303 (bug 730209), 095fd525afa7 (bug 729924), dcf8929a8115 (bug 633602) because of widely scattered and unclear bustage on a CLOSED TREE 2012-03-28 22:37:46 -07:00
David Humphrey
03dc4eeeee Bug 633602 - Implement Pointer Lock (Mouse Lock) API. r=roc, smaug 2012-03-28 21:00:14 -04:00
Justin Lebar
3be96b596d Bug 736688 - Part 5: Remove window.{top,parent,frameElement} mozbrowser changes in nsGlobalWindow (undoes changes from bug 725796). r=smaug
--HG--
extra : rebase_source : fdeccb7e995229cdbc6ebd945109fe8441f9f525
2012-03-28 11:36:49 -07:00
Jared Wein
642a4f48c0 Bug 730318 - Implement a way for chrome js to enumerate the plugin objects on a page for activation. r=khuey 2012-03-28 08:53:56 -07:00
Jared Wein
e34baf2131 Backed out changeset 8e42ba558f07 (bug 730318) CLOSED TREE 2012-03-27 15:23:53 -07:00
Matt Brubeck
fbe5dd5a57 Bug 743325 - Back out 554ab0a2f470 (bug 734503) because it broke touch events in XUL Fennec [r=peterv] 2012-04-24 07:51:56 -07:00
Jared Wein
5c1c03e064 Bug 730318 - Implement a way for chrome js to enumerate the plugin objects on a page for activation. r=khuey 2012-03-27 13:50:50 -07:00
Gregor Wagner
746c6fda8d Bug 678695 - Settings API. r=sicking, fabrice, smaug 2012-03-26 14:49:38 -07:00
Diogo Golovanevsky Monteiro
5b721c04cf Bug 735031 - Make Fullscreen API work with DOMElements rather than only HTML Elements. r=cpearce,smaug 2012-03-24 17:37:04 +13:00
Jared Wein
4920fd9f8d Backed out changeset 5f79a3dd45ff (bug 730318) r=bustage 2012-03-23 11:46:12 -07:00
Marco Bonardo
d525c9e71e Merge last green PGO from inbound to central 2012-03-23 12:49:57 +01:00
Jared Wein
589f9135f9 Bug 730318 - Implement a way for chrome js to enumerate the plugin objects on a page for activation. r=khuey 2012-03-22 13:53:59 -07:00
Masayuki Nakano
445d98cb9e Bug 672175 part.16 Implement nsIWidget::SynthesizeNativeMouseScrollEvent() on Windows r=jimm 2012-03-22 09:59:12 +09:00
Masayuki Nakano
6ca839eb6c Bug 672175 part.15 Add new API nsIDOMWindowUtils.sendNativeMouseScrollEvent() r=roc, sr=smaug 2012-03-22 09:59:12 +09:00
Ms2ger
16bb75fefb Bug 736752 - Compartment mismatch in JetPack 'test-content-proxy.testTypedArrays', r=bholley 2012-03-20 13:57:00 -07:00
Neil Deakin
6c9d8bc0e7 Bug 605991, prevent drops on a parent content page from a child frame from a different domain, r=smaug 2012-03-20 11:21:41 -04:00
Mounir Lamouri
e1b61ee6bf Bug 720794 - Part 2 (DOM) - Implement reading and event parts of Screen Orientation API. r=jst sr=sicking 2012-03-14 11:10:48 +01:00
Mark Finkle
2f256bcc57 Backout 7e28d1a2c648, 330b210f503d, 2421d39e0ab3, aa978ffa44bc, 38a71ae7e06d, b94319584a7a, 7e8278f5e814, 0b4e3c7608ab, 329c07609ca8, 0d61a0d8dba4, Due to Ts regression on Android 2012-03-17 21:51:39 -04:00
Mounir Lamouri
db3fd2663b Bug 720794 - Part 2 (DOM) - Implement reading and event parts of Screen Orientation API. r=jst sr=sicking 2012-03-14 11:10:48 +01:00
Ms2ger
a494664e3f Bug 722154 - Part f: Remove custom quickstubs for vertexAttrib[1-4]fv; r=bjacob 2012-03-16 10:53:41 +01:00
Ms2ger
3456d2d5e4 Bug 722154 - Part e: Remove custom quickstubs for uniform[1-4][i,f]v and uniformMatrix[2-4]fv; r=bjacob 2012-03-16 10:52:42 +01:00
Ms2ger
d5d2b74974 Bug 722154 - Part d: Remove custom quickstub for readPixels; r=bjacob 2012-03-16 10:50:51 +01:00
Ms2ger
58d4fde71b Bug 722154 - Part c: Remove custom quickstubs for compressedTexImage2D and compressedTexSubImage2D; r=bjacob 2012-03-16 10:50:33 +01:00
Ms2ger
3850828e22 Bug 722154 - Part b: Remove custom quickstub for bufferSubData; r=bjacob 2012-03-16 10:50:18 +01:00
Ms2ger
b3ff1e4405 Bug 722154 - Part a: Remove custom quickstub for bufferData; r=bjacob 2012-03-16 10:50:00 +01:00
Ms2ger
090a26ea3d Bug 550309 - Part e: Remove custom quickstub for getImageData and return an actual ImageData; r=bz 2012-03-16 10:48:55 +01:00
Ms2ger
7ea9d494ee Bug 550309 - Part c: Implement ImageData; r=bz 2012-03-16 10:44:08 +01:00
Aryeh Gregor
1e80f34bd3 Bug 735059 - Second and third execCommand() parameters should be optional; r=ehsan 2012-03-12 18:12:19 -04:00
Kartikaya Gupta
4e638d7d12 Bug 725095 - Merge off-main-thread compositor from Maple. IGNORE BAD COMMIT MESSAGES 2012-03-14 11:18:15 -04:00
Benoit Girard
32745d1cc3 Merge mc->Maple 2012-03-13 11:05:28 -04:00
Masatoshi Kimura
c76813f196 Bug 721569 - Implement nullable types. r=khuey 2012-03-12 21:44:51 -07:00
Masatoshi Kimura
9105b69daf Bug 721569 - Support default values for Web IDL dictionaries. r=khuey CLOBBER BUILD 2012-03-12 21:44:48 -07:00
Ali Juma
42a0e56158 Bug 732091 - Part 2: Add {set,get}IsFirstPaint to nsIDOMWindowUtils and nsIPresShell. r=ehsan 2012-03-12 11:50:11 -04:00
Ms2ger
d93f9661f5 Bug 730554 - Part c: Unwrap to nsGenericElement in TexImage2DImageDataOrElement; r=bz 2012-03-11 09:54:24 +01:00
Johnny Stenback
398d2cd68c backout Bug 679971 - remove Navigator.taintEnabled() 2012-01-05 18:24:10 +02:00
Doug Turner
fb1156258d Bug 733652 - Remove geolocation address handling (v2). Little adoption, costly implementation r=jdm 2012-03-08 22:16:25 -08:00
Ed Morley
72b4537851 Backout 8b74d5ae78c3 & c619bbb2951f (bug 734391), 772c994fa869 (bug 734324), fd23ff0f9dd1 (bug 734325), d1e037a9390e (bug 733653), 3a7bf79b5b2d (bug 733650) & 9d9392fce538 (bug 733652) for OS X M1 & M3 orange 2012-03-13 22:29:29 +00:00
Doug Turner
4668d637d1 Bug 733652 - Remove geolocation address handling (v2). Little adoption, costly implementation r=jdm 2012-03-08 22:16:25 -08:00
Peter Van der Beken
1fa35e65ac Add new DOM binding for SVG list classes. r=jst.
--HG--
extra : rebase_source : ce84f9457d7b9a14a0a65db5c643938d0e0e05bc
2011-08-22 11:14:13 +02:00
Peter Van der Beken
24c158b037 Fix for bug 734503 (Add new DOM binding for TouchList). r=jst.
--HG--
extra : rebase_source : 701eb8d9a60ffa981ebcd24f426109bd70cc5cbf
2011-08-22 11:14:13 +02:00
Peter Van der Beken
38d1d644ce Fix for bug 734499 (Add new DOM binding for PaintRequestList). r=jst.
--HG--
extra : rebase_source : 37f4a1ea723db150abc07d66c6f167c27fd9c354
2011-08-22 11:14:13 +02:00
Peter Van der Beken
b0f18cd351 Fix for new bug 734497 (Add new DOM binding for ClientRectList). r=jst.
--HG--
extra : rebase_source : 1cc96b94d21940ac1ed75ec6d46d9c2964fc54a0
2011-08-22 11:14:13 +02:00
Olli Pettay
d0605c95d6 Bug 730891, event ctor for StorageEvent, r=sicking,kyle 2012-03-08 23:27:05 +02:00
Kan-Ru Chen
3ec5d137a8 Bug 697132 - Implement wakelock interfaces. r=jlebar 2012-03-07 12:03:25 +01:00
Fabrice Desré
5c35eda77e Bug 720415 - update navigator.mozApps m-c implementation - IDL [r=jst] 2012-03-06 11:50:58 -08:00
Justin Lebar
3e68e04f09 Bug 725796 - Make window.{top,parent,frameElement} respect <iframe mozbrowser>. r=bz 2012-03-04 11:02:00 -05:00
Aryeh Gregor
88c8133b31 Bug 711047 Part 2 - Remove RangeException in favor of DOMException. r=sicking 2012-03-01 13:35:48 -05:00
Aryeh Gregor
9bb9053585 Bug 711047 Part 1 - Remove raises() from nsIDOMRange. r=sicking 2012-03-01 13:35:13 -05:00
Matheus Kerschbaum
51254c73d0 Bug 687579 part 1: Remove globalStorage implementation. r=jst
Bug 687579 part 1: Remove globalStorage implementation. r=jst
2011-10-09 22:14:00 -04:00
Peter Van der Beken
615a5bd90d Fix for bug 717013 (Add new DOM binding for DOMTokenList). r=jst.
--HG--
extra : rebase_source : 6ae0abe3bbe33a140c62c193685e23529d44e6d4
2011-08-22 11:14:13 +02:00
Gregor Wagner
1526b400d5 Bug 674720 - WebContacts (or Contacts+). r=fabrice, jonas, bent, tantek 2012-02-28 14:01:48 -08:00
Florian Boesch
9650d0e848 Bug 728354 - WebGL EXT_texture_filter_anisotropic: added the EXT suffix and adjusted conformance test - r=bjacob 2012-02-26 12:06:18 -05:00
L. David Baron
1162620b35 Remove the CSS2Properties aliases for MozOutline* and MozOpacity for CSS properties whose CSS aliases were removed long ago (but temporarily readded in the previous changeset). (Bug 730532, patch 2) r=bzbarsky 2012-02-24 21:23:14 -08:00
Ben Turner
309e628042 Backed out changeset 1f3643b7de2d 2012-02-23 07:09:11 -08:00
Ben Turner
8310316245 Bug 717414 - 'Telephony: Make calls array live'. r=sicking. 2012-02-23 03:48:35 -08:00
Florian Boesch
ada0d9ea9e Bug 728354 - Implement WebGL EXT_texture_filter_anisotropic extension *proposal* - r=bjacob
The spec proposal for this extension is at
  https://cvs.khronos.org/svn/repos/registry/trunk/public/webgl/extensions/proposals/EXT_texture_filter_anisotropic/index.html

This adds a conformance test as well, that will have to be merged upstream.
2012-02-23 08:43:57 -05:00
Matthew Schranz
62d6dff935 Bug 698381 - Make Node.cloneNode aDeep argument optional, default to true. r=smaug 2012-02-23 14:23:30 +01:00
Jesse Ruderman
4e269b7008 Fix typo (no bug, DONTBUILD) 2012-02-22 20:16:29 -08:00
Masatoshi Kimura
d99288b6cc Bug 720208 - Implement DOM4 DOMException types and codes. r=smaug,ms2ger 2012-02-23 01:34:14 +01:00
Nathan Froyd
1d08ee8010 Bug 729267 - nsIDOMGeoGeolocation shouldn't be marked [function]; r=jdm 2012-02-21 13:03:00 -08:00
Nathan Froyd
584d826355 Bug 729276 - nsIContentPermissionRequest shouldn't be marked [function]; r=khuey 2012-02-21 13:17:52 -08:00
Bill McCloskey
6b3aa0565d Bug 641025 - Incremental GC (r=igor,smaug,roc,cdleary,gregor) 2012-02-17 14:35:20 -08:00
Neil Deakin
36ff9c0df5 Bug 499008, part 3, remove nsIDOMNSEvent::tmpRealOriginalTarget, r=smaug 2012-02-17 09:16:59 -05:00
Aryeh Gregor
77160ffd5a Bug 655478 - CSSStyleDeclaration.setProperty shouldn't require the third parameter to be set; r=bzbarsky
--HG--
extra : rebase_source : 131b879a0190c1979ee563cc102b5a548bf6986d
2012-02-15 16:31:40 -05:00
Neil Deakin
a104105bd5 Bug 670317, add a focus manager flag to restrict tab navigation to the same frame, r=smaug 2012-02-13 14:24:28 -05:00
Ed Morley
1bdae85d94 Backout 1ca8d5a931ac (bug 720799), e4781b684008 (bug 720795), 8a4e12d93a23 & 1fc8123a2ea4 (bug 720794) for bustage 2012-02-09 16:42:07 +00:00
Mounir Lamouri
bf9d0c1f93 Bug 720794 - Part 2 (DOM) - Implement reading and event parts of Screen Orientation API. r=jst sr=sicking 2012-02-09 16:55:54 +01:00
Ed Morley
16fb8f0845 Backout 79121553f728 (bug 720799), 4a763183482f (bug 720795), e965486f4b50 & 4a7c7c6b9b11 (bug 720794) for failing to build on any platform 2012-02-09 12:06:50 +00:00
Mounir Lamouri
6212b3ee0e Bug 720794 - Part 2 (DOM) - Implement reading and event parts of Screen Orientation API. r=jst sr=sicking 2012-02-09 11:29:09 +01:00
Neil Deakin
6125e0566b Bug 707382, merge nsIDOMDataTransfer and nsIDOMNSDataTransfer, r=jonas 2012-02-07 13:02:32 -05:00
Tim Taubert
456b0bba2b merge m-c to fx-team 2012-02-02 10:03:01 +01:00
Tim Taubert
36e10603d3 Bug 720697 - Provide internal API to get canvas image data as nsIInputStream; r=khuey 2012-02-01 01:13:44 +01:00
Olli Pettay
e297be8544 Bug 721543 - Call forgetSkippable before CC, r=mccr8
--HG--
extra : rebase_source : 4be50f8bcab1418c563394379abb6b4f074697b3
2012-01-30 22:06:18 +02:00
Jon Buckley
ae7d4a9222 Bug 721230 - Implement a compressed texture support stub for WebGL conformance. r=bjacob 2012-01-28 16:15:27 -05:00
Jonathan Watt
b71af22516 Bug 711958 - Add a 'length' property to DOMSVGStringList. r=dholbert. 2012-01-28 10:43:34 +00:00
Kan-Ru Chen
dcd32d8e56 Bug 709585 - Part 3, Plug mozPower into navigator object. r=sicking
--HG--
extra : rebase_source : 8382e9c044feca9b2e511e022a3bb4fe64ca0d4b
2012-01-19 22:24:00 -05:00
Jon Buckley
a1ada7a67d Bug 682299 - Implement CORS support for the <video> tag. r=roc 2012-01-25 17:31:30 -05:00
Matthew Schranz
75edd6c796 Bug 698384 - Make document.createNodeIterator's 2nd and 3rd parameters optional. r=smaug 2012-01-25 13:47:50 +01:00
Ms2ger
c35015ccf5 Bug 689337 - Desktop notification interfaces should not be marked 'function'; r=khuey 2012-01-25 08:50:04 +01:00
Ben Turner
1cd415db8f Bug 705640 - Implement DOMError as defined in DOM 4, r=mounir.
--HG--
extra : transplant_source : %15%98Xx%C3%F3%89%95%94%5Eu%99%B0%CC%8B%E0V%3A4%C6
2012-01-24 02:13:41 -08:00
Ed Morley
86d3c4e599 Backout 143f01714f2b (bug 705640) for build failures 2012-01-23 14:25:47 +00:00
Ben Turner
186eb76b2e Bug 705640 - 'Implement DOMError as defined in DOM 4'. r=mounir. 2012-01-23 03:02:54 -08:00
Ed Morley
2fa2d9037f Backout fcb3a7884fa9 (bug 705640) for build failures 2012-01-23 11:48:35 +00:00
Ben Turner
1d8744671b Bug 705640 - 'Implement DOMError as defined in DOM 4'. r=mounir. 2012-01-23 03:02:54 -08:00
Justin Lebar
235e524f0e Bug 710231 - Part 3: Add mozbrowserloadstart, mozbrowserloadend, mozbrowserlocationchange events to <iframe mozbrowser>. r=smaug
--HG--
extra : rebase_source : 01d82c02f56afd6aebf94443f223bc537536cc57
2012-01-20 12:02:48 -05:00
Justin Lebar
ff743fa577 Bug 710231 - Part 1: Back out bug 708176 part 2 (rev 1bdcd84ae727). r=smaug
--HG--
extra : rebase_source : 1c5768b85524a2c7ad63901e7d1f7acdbc075dcb
2012-01-20 12:02:28 -05:00
Wes Johnston
72f42280fd Bug 603008 - Platform support for multitouch events. r=smaug
* * *
Bug 603008 - Platform support for multitouch events.
* * *
ifdefandroid
2011-12-16 16:24:11 -08:00
Markus Stange
3a55ce2e20 Bug 598482 part 4 - Remove unused nsIDOMWindowUtils::processUpdates. r=roc 2011-12-23 22:52:21 -05:00
Simon Montagu
3ca7ecdbcb Implement text-align-last. Bug 536557, r=dbaron 2012-01-12 19:52:21 +02:00
Ed Morley
2099bb7e42 Backout 6605cc311ec5 & 9217303c2e5c (bug 536557) for M4 orange 2012-01-12 15:33:00 +00:00
Simon Montagu
dec2df3fe1 Implement text-align-last. Bug 536557, r=dbaron 2012-01-12 16:29:20 +02:00
Justin Lebar
e79f17be95 Bug 708176 - Part 2: Add {i,}frame.queryInnerState(), which allows privileged pages to peer into an iframe's state. r=smaug
--HG--
extra : rebase_source : dfd89eb7d451bac9ae4e4eb05d090c767f42ab8e
2012-01-10 12:57:40 -05:00
David Zbarsky
785e84c27d Bug 682611 - Part 2: Remove nsIRange; r=smaug 2012-01-10 15:19:54 +01:00
David Zbarsky
3484fe1ebe Bug 682611 - Part 1: Merge nsIDOMRange and nsIDOMNSRange; r=Ms2ger r=smaug 2012-01-10 15:19:54 +01:00
Jeff Muizelaar
b0d5f83aad Bug 696398. Add an api to analyse frame rate. r=ajuma
This adds a startFrameTimeRecording() and stopFrameTimeRecording()
to DOMWindowUtils. stopFrameTimeRecording() returns an array of frame times in milliseconds.
2012-01-05 17:40:35 -05:00
Patrick Walton
7040745c7e Bug 709492 - Part 1: Add a paintingSuppressed getter to nsIDOMWindowUtils. r=bz 2012-01-03 22:52:20 -08:00
Robert Longson
48d9142be8 Bug 607854 - implement SVGTests interface. r=jwatt 2011-12-31 09:44:03 +00:00
Scott Johnson
31e988481d Bug 695222 - Implement column-fill part of CSS3 multicol spec. r=roc,dbaron 2011-12-25 23:25:59 -06:00
Ms2ger
e696a7d909 Bug 687134 - Get at the JSContext through IDL for pccount methods; r=bholley 2011-12-24 09:21:26 +01:00
William Chen
95cab2faf0 Bug 497995: Part 1 - Implement border-image revisions in latest css3-background spec. r=dbaron
--HG--
extra : rebase_source : 5a6cdac6a4b1353170f23f39dd2a209374e72531
2011-12-22 18:34:45 -05:00
Scott Johnson
485a62e28c Backout changeset 93f523345fb6. 2011-12-20 00:01:32 -06:00
Scott Johnson
9a5c2bc549 Bug 695222 - Implement column-fill part of CSS3 multicol spec. r=roc,dbaron 2011-12-19 23:11:54 -06:00
Scott Johnson
d02cda6d85 Backed out changeset 74555805376d 2011-12-19 23:08:52 -06:00
Scott Johnson
5493265dc2 Bug 695222 - Implement column-fill part of CSS3 multicol spec. r=roc,dbaron 2011-12-19 22:25:19 -06:00
Ed Morley
2e0d6da8de Bug 704056 - Remove countryCode from nsIDOMGeoPositionAddress since it's not in the spec; r=dougt 2011-12-20 02:21:52 +00:00
Ms2ger
c480d4db80 Bug 707576 - Remove nsIDOMNSElement; r=smaug 2011-12-18 11:06:23 +01:00
Doug Sherk
797ba840ff Bug 708207: implement WebGL's getShaderPrecisionFormat r=bjacob 2011-12-16 13:11:59 -08:00
Brian Hackett
3983e0f31e Add interface for accessing PC counter information from chrome code, bug 687134. r=sfink,waldo 2011-12-16 13:11:08 -08:00
Jan Varga
152a98864a Bug 661877 - Enable storing files in IndexedDB. r=bent 2011-12-16 08:34:24 +01:00
Andrew Quartey
e782621700 Bug 706731: Support for defaultMuted DOM attribute on media elements. r=kinetik,bzbarsky 2011-12-15 14:36:46 -05:00
Fabrice Desré
7ec249e79d Bug 709875 - add enumerateAll to navigator.mozApps API [r=gal] 2011-12-15 09:20:57 -08:00
Justin Lebar
84241e428f Bug 679966, part 2: Add mozVibrator() for "playing" a vibration pattern. r=bz 2011-11-10 16:26:36 -05:00
Boris Zbarsky
e3decbb3a4 Bug 710981. Add the new name for cancelAnimationFrame. r=roc 2011-12-15 08:53:06 -05:00
Boris Zbarsky
8415f57767 Bug 708169. Warn when null or no argument is passed to mozRequestAnimationFrame. r=roc 2011-12-15 08:53:06 -05:00
Olli Pettay
50e93e9d3d Bug 709127 - Implement MouseEvent and UIEvent ctors, r=jst, a=sheriff 2011-12-14 22:36:46 +02:00
Olli Pettay
ddddb0b2e3 Bug 708701 - Implement HTML event ctors, r=jst
--HG--
extra : rebase_source : 4abb0185ea790c29ff7f2df0f032045777c898e0
2011-12-14 21:55:32 +02:00
Olli Pettay
0ab08dac00 Bug 675884 - Implement Event constructors, part1, r=jst
--HG--
extra : rebase_source : 109d9cb22b810fbff71c637b6e15965eafdd61fe
2011-12-14 21:53:48 +02:00
Boris Zbarsky
bd8d6674cc Bug 647518 part 2. Allow canceling requestAnimationFrame requests. r=roc 2011-12-06 23:43:18 -05:00
Boris Zbarsky
83bd6bb9a4 Bug 647518 part 1. Make requestAnimationFrame return handles for animation frame requests. r=roc 2011-12-06 23:43:18 -05:00
Justin Lebar
15f78c78bd Bug 702256 - "[Gonk] Add DOM API for turning screen on/off and adjusting the screen's brightness" r=cjones,mounir 2011-12-05 01:07:00 +08:00
Marco Bonardo
72eaf234fe Backout 407fba8cbd5a (bug 702256) for build failure on Windows. 2011-12-05 13:48:59 +01:00
Justin Lebar
e33d8ba71a Bug 702256 - "[Gonk] Add DOM API for turning screen on/off and adjusting the screen's brightness" r=cjones,mounir
--HG--
extra : rebase_source : 6c1f1b49d911e749da524266695e2f05d52900b2
2011-12-05 01:07:00 +08:00
Ms2ger
73f85244e0 Bug 705443 - Use IDL for nsIDOMWindowUtils::GetClassName; r=khuey 2011-12-03 22:50:16 +01:00
Fabrice Desré
0643904ad9 Bug 697383 - implement navigator.mozApps - Part 1 : mozApps DOM API [r=mfinkle] 2011-11-28 12:13:26 -08:00
Marco Bonardo
c86ca0cbd3 Backout af0a7f54f483 (bug 704691), 17b4093b5ec5, 23f26ba05f1a (bug 697383) for various failures 2011-11-28 23:53:22 +01:00
Fabrice Desré
95f8c3872a Bug 697383 - implement navigator.mozApps - Part 1 : mozApps DOM API [r=mfinkle] 2011-11-28 12:13:26 -08:00
Boris Zbarsky
6c0d48e059 Bug 704171 part 2. Remove the no-argument form of mozRequestAnimationFrame. r=roc 2011-11-28 07:49:53 -05:00
Boris Zbarsky
736d324733 Bug 704175 part 2. Rename nsIAnimationFrameListener to nsIFrameRequestCallback. r=roc
--HG--
rename : dom/interfaces/base/nsIAnimationFrameListener.idl => dom/interfaces/base/nsIFrameRequestCallback.idl
2011-11-28 07:48:30 -05:00
Boris Zbarsky
425c3fb061 Bug 704175 part 1. Rename onBeforePaint to sample for animation frame callbacks. r=roc 2011-11-28 07:48:27 -05:00
Ms2ger
8aec725418 Bug 704593 - Remove JS-specific nsGlobalWindow::ClearTimeoutOrInterval(); r=jst 2011-11-26 11:23:25 +01:00
Ms2ger
f7fcfc9401 Bug 702583 - Part b: Use IDL for nsIJSON.encode*; r=bz 2011-11-26 11:21:47 +01:00
Ms2ger
686423a746 Bug 702583 - Part a: Use IDL for nsIJSON.decode*; r=bz 2011-11-26 11:21:29 +01:00
Masayuki Nakano
435f4bcaac Bug 703150 Cannot drag scrollbar thumb if stopPropagation() of mousedown event is called r+sr=smaug 2011-11-25 10:09:58 +09:00
L. David Baron
f34af4cd8d Add support for -moz-text-size-adjust CSS property. (Bug 627842, patch 1) r=bzbarsky
This property is analogous to the -webkit-text-size-adjust property (and
*maybe* also the -ms-text-size-adjust property).  It allows pages to opt
out of text size adjustments performed on mobile devices by specifying
-moz-text-size-adjust: none.
2011-11-23 18:48:23 -08:00
Matthew Gregan
37527f99d1 Bug 449157 - Implement loop attribute on media elements. r=roc 2011-11-21 11:59:01 +13:00
Ms2ger
ec1244448e Bug 702118 - Use IDL for nsIDOMWindowUtils::GetParent; r=bz 2011-11-16 08:50:19 +01:00
Eitan Isaacson
3815853319 Bug 700741 - Add and implement nsIFocusManager.elementIsFocusable r=Enn 2011-11-10 08:20:47 -08:00
Henri Sivonen
3e51b8fc49 Bug 92264 - Implement outerHTML. Part of the patch by Ms2ger. r=smaug. 2011-11-10 14:02:22 +02:00
Henri Sivonen
59ec018765 Back out changeset 0fb81504b0aa due to Windows build breaking. 2011-11-10 14:49:54 +02:00
Henri Sivonen
00241c62cd Bug 92264 - Implement outerHTML. Part of the patch by Ms2ger. r=smaug. 2011-11-10 14:02:22 +02:00
Ed Morley
6c0b453345 Bug 700166 - Hg rm dom/interfaces/threads/ since it's no longer built; r=bent 2011-11-07 15:44:11 +00:00
Matheus Kerschbaum
4813247daf Bug 698630 - Remove --disable-smil build option; r=dholbert 2011-11-05 10:32:52 +00:00
Olli Pettay
fdb741699d Bug 698929 - Implement event.stopImmediatePropagation, r=jst
--HG--
extra : rebase_source : 76d19175a58a4ac8113b144a19f9d7679ad54dd0
2011-11-04 19:17:19 +02:00
Chris Pearce
5210c8bcb2 Bug 688648 - Dispatch mozfullscreenerror event when requests for full-screen are denied. r=smaug 2011-11-02 13:02:47 +13:00
Jeff Gilbert
244f51369c Bug 697168 - Removes WebGL overloads for untyped ArrayBuffers where disallowed - r=bjacob 2011-10-31 16:55:00 -07:00
Olli Pettay
e4fe236060 Bug 698061 - document.importNode's deep attribute should be optional, r=sicking 2011-10-30 23:17:53 +02:00
Ms2ger
731edba0b8 Bug 684821 - Remove nsIDOMNSHTMLElement; r=peterv 2011-10-29 22:03:55 +02:00
Jonas Sicking
ac8b04fb20 Bug 687400: Kill Node.isSameNode. r=smaug 2011-10-28 19:52:27 -07:00
Doug Sherk
63e6006511 Bug 656824: Implemented ARB_robustness to detect driver resets in WebGL, only on GLX for now - r=bjacob
This patch implements ARB_robustness on GLX and allows scripts to handle driver resets
through events. The changes in this patch are very sweeping; they hit almost
every NS_IMETHODIMP function within WebGLContextGL.cpp and WebGLContext.cpp.
More work must be done on this to support EGL_CONTEXT_LOST.
2011-10-26 16:00:44 -04:00
Matt Woodrow
4fec733686 Bug 695275 - Add CheckAndClearPaintedState to test painting. r=roc 2011-10-26 16:23:26 +13:00
Yazen Ghannam
03ce28c74a Bug 677085 - Merge "nsIDOMNSHTMLFrameElement" into "nsIDOMHTMLFrameElement"; r=bz 2011-10-15 09:34:31 +02:00
Ms2ger
aaf97be2ff Bug 693162 - Remove Document.xmlVersion; r=sicking 2011-10-15 09:30:07 +02:00
Ms2ger
28324aa66d Bug 687422 - Remove Text.isElementContentWhitespace; r=sicking 2011-10-15 09:29:16 +02:00
Ms2ger
7994f114f3 Bug 693154 - Remove Document.xmlStandalone; r=sicking 2011-10-15 09:28:44 +02:00
Ms2ger
58b2ac48ed Bug 675287 - Make Document.documentURI readonly; r=sicking 2011-10-15 09:27:47 +02:00
Benoit Jacob
a9b2e70434 Bug 638328 - use builtinclass and remove do_QueryInterface - r=peterv 2011-10-13 08:09:22 -04:00
Boris Zbarsky
31d91ff3a9 Bug 690056. Implement a vendor-prefixed version of the visibility API. r=sicking
The idea is to fire the visibilitychange event synchronously during pageshow and pagehide, since we're
already running script there for the pageshow/pagehide events.  For docshell active state changes, we
fire the event asynchronously.  In all cases, the actual state changes just before the event fires.
2011-10-11 17:29:12 -04:00
Olli Pettay
820e58a527 Bug 691059, don't throw when setting interface.prototype.onmouseenter/leave, r=bz
--HG--
extra : rebase_source : 0bbc272f1389cda424334a9f5c804c9c70fe7815
2011-10-10 14:42:17 +03:00
Peter Van der Beken
2315871db3 Bug 648801 (new DOM list bindings) - Add new dom binding for nsHTMLOptionCollection. r=bz/jst/mrbkap.
--HG--
extra : rebase_source : 2d2f6177031958b61b01f819cb28a4c56861a815
2011-08-20 15:53:34 +02:00
Peter Van der Beken
98d8129201 Bug 648801 (new DOM list bindings) - Generate new DOM bindings. r=bz/jst/mrbkap.
--HG--
extra : rebase_source : 6b34182856cbb4ba3fba8d3001de648b10157a29
2011-08-20 15:53:33 +02:00
Ms2ger
2f93d04a35 Bug 687486 - Throw INVALID_STATE_ERR when dispatching uninitialized events; r=smaug 2011-10-09 20:23:13 +02:00
Olli Pettay
5138297d6e Bug 681387: backout bug 654352 (caretPositionFromPoint), r=ehsan 2011-10-08 13:49:51 +03:00
Jared Wein
85daa266bc Bug 689058 - Implement document.mozFullScreenEnabled (part 2: Updating UUIDs). r=roc 2011-10-04 12:37:34 -07:00
Jared Wein
f6d7b55743 Bug 689058 - Implement document.mozFullScreenEnabled r=cpearce sr=roc 2011-10-03 16:57:23 -07:00
Ms2ger
eacbc5f7f3 Bug 688531 - Remove NameList; r=jst 2011-10-01 18:14:40 +02:00
Ms2ger
bd3d754000 Bug 687426 - Remove Document.xmlEncoding; r=sicking 2011-10-01 18:14:40 +02:00
Matheus Kerschbaum
f79d315393 Bug 683482 - Remove replaceWholeText() r=sicking 2011-10-01 18:12:30 +02:00
Doug Sherk
5b5702d6a4 Bug 684853: implement OES_standard_derivatives
Implemented OES_standard_derivatives and fallbacks if it isn't available. Exposes dFdx, dFdy, and fwidth functions to WebGL scripts.
2011-10-01 00:45:50 -04:00
Matt Woodrow
bc10d9cf93 Bug 505115 - Part 21 - Enable 3D transforms by default. r=roc 2011-09-30 14:39:40 +13:00
Michael Wu
d8e503c38b Bug 675553 - Switch from PRBool to bool on a CLOSED TREE , r=bsmedberg,khuey,bz,cjones
--HG--
rename : tools/trace-malloc/bloatblame.c => tools/trace-malloc/bloatblame.cpp
2011-09-28 23:19:26 -07:00
Fabrice Desré
ae10c795b7 Bug 593891 - Part 1 : Wrap an nsIFile in an nsIDOMFile [r=sicking] 2011-09-26 17:25:41 -07:00
Brian Birtles
d658bef1a5 Bug 602759 part 6 - Refactor nsSVGTransformList into SVGTransformList and DOMSVGTransformList; r=jwatt
--HG--
rename : content/svg/content/src/nsSVGTransformList.cpp => content/svg/content/src/DOMSVGTransformList.cpp
rename : content/svg/content/src/nsSVGTransformList.h => content/svg/content/src/DOMSVGTransformList.h
2011-09-25 22:04:31 +01:00
Masayuki Nakano
54e3afdd66 Bug 543789 part.7 Dispatch compositionupdate event and set data value of compositionend event in all IME handling tests r=smaug, sr=roc 2011-09-22 18:17:41 +09:00
Masayuki Nakano
46636681cc Bug 543789 part.1 Add DOM3 composition events r=smaug, sr=roc 2011-09-22 18:17:40 +09:00
Ehsan Akhgari
41c2a18909 Merge the last green changeset of mozilla-inbound to mozilla-central 2011-09-20 10:22:17 -04:00
Olli Pettay
12f3b41155 Bug 686449 - Make ProcessingInstruction inherit from CharacterData, r=sicking 2011-09-20 08:08:00 +03:00
Olli Pettay
7dfe430f16 Bug 432698 - mouseenter and mouseleave, r=masayuki
--HG--
extra : rebase_source : 2664d2655546602edc88bcadc7dd981b01d76820
2011-09-18 02:45:14 -05:00
Olli Pettay
586e545839 Bug 685798 - Node.parentElement, r=bz 2011-09-11 16:05:19 -07:00
Olli Pettay
9efa44eaaa Bug 685798 - Node.parentElement, r=bz 2011-09-11 15:45:39 -07:00
Boris Zbarsky
d9ab900089 Bug 682554. Move onreadystatechange to live on Document only. r=smaug 2011-09-19 22:56:45 -04:00
Justin Lebar
dc2fd37a91 Bug 629535 - Add navigator.doNotTrack. r=sicking
--HG--
extra : rebase_source : 48631ff375196045de1c2865ab4ee9b9c219c736
2011-09-19 15:59:22 -04:00
Masatoshi Kimura
b568eebe2a Bug 685774 - Implement document.scripts. r=bz 2011-09-09 19:18:03 +02:00
Ed Morley
59e8ad1ced Merge mozilla-central to mozilla-inbound 2011-09-05 01:18:16 +01:00
Chris Pearce
c782ba7555 Bug 545812 - Implement iframe.mozallowfullscreen. r=jst 2011-09-05 08:40:17 +12:00
Chris Pearce
0ae15dea93 Bug 545812 - Dispatch mozfullscreenchange event when we change full-screen mode. r=smaug 2011-09-05 08:40:11 +12:00
Chris Pearce
7c1b965126 Bug 545812 - DOM/content changes required for DOM full-screen API. r=jst 2011-09-05 08:39:05 +12:00
Justin Wood
7130d2f9b7 Backed out changeset 97216ae0fc04 due to accidentally landing to m-c rather than try. 2011-09-03 03:15:21 -04:00
Atul Aggarwal
a4698e8d6e Bug 668819 - HTMLTableColElement span should be unsigned long try: -b do -p linux,linux64,win32 -u all -t all 2011-09-03 12:15:03 +05:30
Olli Pettay
926e572e15 Bug 683852 - Implement Node.contains(node), r=bz
--HG--
extra : rebase_source : 192368ed31e612ad078a3d71a7ea2913e8a95532
2011-09-02 23:15:53 +03:00
Benoit Jacob
4e7482058c Bug 658856 - implement drawingbufferWidth/Height - r=jmuizelaar
These are new WebGLRenderingContext attributes exposing the actual drawing buffer size
2011-09-01 15:28:34 -04:00
Matt Woodrow
2d0f18b12d Bug 677173 - Remove 3D transforms IDL properties because they are disabled. r=dbaron 2011-09-01 11:35:10 +12:00
Ed Morley
974a0ec8a8 Merge last green (and non Ts-regressing) changeset from m-i to m-c 2011-08-30 12:09:51 +01:00
Brian Hackett
604519588f Merge MC -> JM 2011-08-29 12:34:59 -07:00
Marco Bonardo
40c1e206de Merge mozilla-central and mozilla-inbound 2011-08-27 10:40:12 +02:00
Matt Woodrow
312e8b4031 Bug 505115 - Part 14a - Add -moz-transform-style css property. r=dbaron 2011-08-27 12:01:06 +12:00
Brian Hackett
045638a1ea Merge MC -> JM 2011-08-26 11:23:35 -07:00
Ms2ger
6aeeb50315 Bug 672054 - Part b: Remove nsIDOMNSMouseEvent; r=smaug 2011-08-26 09:43:56 +02:00
Ms2ger
b12351fbda Bug 672054 - Part a: Remove nsIDOMNSUIEvent; r=smaug 2011-08-26 09:43:49 +02:00
Brian Hackett
72f29e4500 Merge MC -> JM 2011-08-23 07:08:50 -07:00
Michael Ventnor
8af7fc4898 Bug 446569 - Implement prefixed CSS3 columns shorthand r=dbaron 2011-08-23 14:18:22 +10:00
Ralph Giles
0eaebaa413 Bug 682750 - Fix a comment typo in nsIDOMHTMLSourceElement.idl; r=chris.double DONTBUILD 2011-08-29 13:47:06 +01:00
Brian Hackett
45b8a69877 Merge MC -> JM 2011-08-21 16:00:26 -07:00
Chris Double
1e5e4609a1 Bug 648595 - Part 1/2: Implement temporal dimension portion of Media Fragments URI specification for video/audio - r=cpearce
--HG--
extra : rebase_source : f9b5986e739a091c37caeb882904434f21fb6d81
2011-08-25 11:42:23 +12:00
Matheus Kerschbaum
b2c6a99601 Bug 679971 - Remove Navigator.taintEnabled(); r=gal 2011-08-21 09:27:29 +01:00
Ed Morley
8e6ef572c5 Bug 667021 - Remove nsIDOMDocumentCSS.idl from the tree; r=roc 2011-08-20 13:42:39 +02:00
Bobby Holley
f01798cf65 Bug 679494 - Wrap value returned from nsDOMMessageEvent::GetData. r=mrbkap 2011-08-18 12:10:00 -07:00
Bobby Holley
80af2b391f Bug 679494 - UUID rev followup. r=khuey 2011-08-22 12:22:49 -07:00
Brian Hackett
06268c9f02 Merge MC -> JM 2011-08-14 19:51:16 -07:00