Commit Graph

847 Commits

Author SHA1 Message Date
Mina Almasry
66a49c5a39 Bug 872377 - Restore "toJSON" to list of reserved webidl keywords. r=bz
This patch makes toJSON a reserved webidl keyword, and changes the implementation of mozRTCSessionDescription to use a jsonifier.
2013-07-29 12:39:18 -04:00
Masatoshi Kimura
58a30af01e Bug 898687 - Hide XUL related classes from content. r=Jan.Varga 2013-07-29 23:45:58 +09:00
Guilherme Gonçalves
1920e4e4f3 Bug 884921 - navigator.geolocation should never be null. r=dougt 2013-07-26 16:12:12 -04:00
David Zbarsky
7837d54bf0 Bug 865998: Implement WebIDL union return values r=bz 2013-07-26 11:25:54 -07:00
Ryan VanderMeulen
cc5560c810 Merge m-c to inbound. 2013-07-26 14:20:01 -04:00
Ryan VanderMeulen
e638a92bfd Merge m-c to birch. 2013-07-26 10:48:24 -04:00
Vicamo Yang
4770f15294 Bug 891235: remove mozSms. rs=mounir 2013-07-26 18:40:27 +08:00
Ed Morley
2a40e9c35b Merge mozilla-central and birch 2013-07-24 13:37:33 +01:00
Dale Harvey
b1250887ad Bug 891884 - toBlob should support the quality parameter as toDataURL does r=joedrew sr=mrbkap
--HG--
extra : rebase_source : 6b12921bf06a2ccf4154222bf19b2779d3bc68b3
2013-07-24 12:17:00 +01:00
Ms2ger
834f814430 Merge m-c to inbound. 2013-07-24 11:53:22 +02:00
Ed Morley
8b5035083b Backed out changeset 5ce6a2000fa3 (bug 891235) for failures in test_getthreads.js 2013-07-24 10:11:57 +01:00
Ms2ger
61c9150995 Bug 878600 - Move WorkerLocation to WebIDL; r=khuey 2013-07-24 09:41:55 +02:00
Ms2ger
9e0a52fd44 Bug 878401 - Move WorkerNavigator to WebIDL; r=khuey 2013-07-24 09:38:23 +02:00
Vicamo Yang
8a338dec45 Bug 891235: remove mozSms. rs=mounir 2013-07-24 11:00:44 +08:00
Matthew Gregan
8912b984d1 Bug 895754 - Update VideoPlaybackQuality to current MSE spec (remove playbackJitter, add totalFrameDelay). r=doublec 2013-07-24 11:46:43 +12:00
Boris Zbarsky
cc0e521ed8 Bug 894448 part 1. Move IsChromeOrXBL to xpcpublic.h. r=bholley 2013-07-25 19:41:46 -07:00
Guillaume Abadie
5fe5b14264 bug 892546 - [WebGL 2.0] Instanced Rendering (GL_ARB_draw_instanced) - r=jgilbert 2013-07-25 20:38:58 -04:00
Mina Almasry
d23615e4a1 Bug 760851 - Add jsonifier WebIDL declaration and add toJSON to performance.timing. r=bz
This patch adds a jsonifier declaration to WebIDL's. The declaration adds an autogenerated method toJSON() on the given webidl. This patch also adds jsonifier and toJSON() to PerformanceTiming.webidl, and performance.timing, respectively.
2013-07-26 12:00:49 -04:00
Catalin Iordache
5b4cbd93e5 Bug 888628 - Create another field for HttpRetParams structure which keeps track of half open connections. r=valentin.gosu 2013-07-23 10:52:01 -04:00
Boris Zbarsky
0d417e5c5f Bug 895974. Implement ParentNode on document fragments and documents and move previousElementSibling and nextElementSibling to ChildNode. r=smaug 2013-07-22 08:15:43 -04:00
Carsten "Tomcat" Book
a48932bfb9 Merge m-c to inbound 2013-07-23 11:06:20 +02:00
Carsten "Tomcat" Book
2c24b18b6a Backed out changeset 1bbc7f3de64c (bug 891884) 2013-07-23 10:30:08 +02:00
Julien Wajsberg
967a03a56e Bug 891884 - toBlob should support the quality parameter as toDataURL does r=joedrew sr=mrbkap
--HG--
extra : rebase_source : 22574a2852a6147019cc787ab1a8711adca7c0b2
2013-07-19 20:19:48 +01:00
Ryan VanderMeulen
0ba0f4d6ed Merge m-c to inbound. 2013-07-22 21:48:00 -04:00
Guillaume Abadie
2f347c549e Bug 890926 - WebGL2 Min/max blend equations. r=jgilbert 2013-07-18 11:24:23 -04:00
Guillaume Abadie
96c08c069b bug 896254 - WebGL2RenderingContext WebIDL interface should be disabled on release channels - r=bjacob 2013-07-22 18:48:05 -04:00
Ryan VanderMeulen
cc66360dac Backed out changesets 0a196c0e9f96 (bug 895974) and 0d8aa14f5ed3 (bug 895009) for causing intermittent Linux32 mochitest-1 asserts on a CLOSED TREE. 2013-07-22 18:18:17 -04:00
Boris Zbarsky
efe9593f06 Bug 895974. Implement ParentNode on document fragments and documents and move previousElementSibling and nextElementSibling to ChildNode. r=smaug 2013-07-22 08:15:43 -04:00
Reuben Morais
a5a7c62045 Backed out changeset 8ea5fd72aa59 (bug 893117) 2013-07-18 20:01:55 -07:00
David Zbarsky
e5b8f5517f Bug 893117: Remove nsIDOMHTMLTableColElement r=peterv 2013-07-18 17:43:37 -07:00
Ed Morley
4a2765128e Backed out changeset eeab86551b26 (bug 891884) for reftest failures 2013-07-18 12:18:12 +01:00
Paul Adenot
cae697e35c Bug 883591 - Don't allow creating a MediaStreamDestinationNode on an OfflineAudioContext. r=ehsan 2013-07-18 11:57:38 +02:00
Julien Wajsberg
ba1fedc9cc Bug 891884 - toBlob should support the quality parameter as toDataURL does r=joedrew sr=mrbkap 2013-07-18 10:29:54 +01:00
Boris Zbarsky
9af6d565fa Bug 893004 part 2. Remove various no-longer-used XPCOM bits from Navigator, except the ones from nsIDOMNavigator. r=smaug
--HG--
rename : dom/network/interfaces/nsIDOMNavigatorNetwork.idl => dom/network/interfaces/nsIMozNavigatorNetwork.idl
2013-07-17 23:23:52 -04:00
Guillaume Abadie
7315912dd4 Bug 890379 - [WebGL 2.0] Add existing WebGL 1 extensions as WebGL 2 features. r=jgilbert 2013-07-17 12:13:38 -04:00
Guillaume Abadie
0c8ed8b0ed Bug 890311 - [WebGL 2.0] Add WebGL2Context C++ class inheriting WebGLContext. r=jgilbert 2013-07-17 09:58:09 -04:00
Masatoshi Kimura
1f7dfd8e76 Bug 899388 - Part 1: Enable WebIDL XUL interfaces on Chrome or content XBL. r=bz 2013-08-09 23:35:53 +09:00
Marcus Saad
8b4f8baa85 Bug 882743 - Make TextTrackCue setters throw. r=rillian, r=bz
From 8f5dccf7fd5f5d2a74341ead60586346e4ab3ead Mon Sep 17 00:00:00 2001
Now throwing javascript exceptions from attribute setters for TextTrack-related DOM classes.
As can be seen in http://dev.w3.org/html5/webvtt/#webvtt-api, some of the attributes require validation and throwing.
There is no validation implemented to the align property because there is a bug opened against the spec to change it to an Enum.
When cleared, it should have the IDL changed to remove the throwing.
Validation comments were removed from the properties that didn't have proper validation defined by the spec.
2013-07-24 14:18:54 -04:00
Andrea Marchesini
d0133da5a6 Bug 875289 - Remove .done() and allow undefined to be passed to .then() and .catch(), r=mounir, sr=bz 2013-07-16 15:56:24 +02:00
Boris Zbarsky
4137a245dd Bug 838146 part 8. Switch the Navigator resolve hook over to a more WebIDL-like API. r=smaug 2013-07-12 10:37:23 -04:00
Boris Zbarsky
91a8bc6360 Bug 838146 part 7. Implement the MOZ_MEDIA_NAVIGATOR WebIDL APIs on Navigator. r=smaug, sr=sicking 2013-07-12 10:37:21 -04:00
Boris Zbarsky
684d4a0f3a Bug 838146 part 6. Implement gamepad, bluetooth, time, audiochannel WebIDL APIs on Navigator. r=smaug, sr=sicking 2013-07-12 10:36:32 -04:00
Boris Zbarsky
5651b8d226 Bug 838146 part 5. Implement remaining MOZ_B2G_RIL-conditional WebIDL APIs on Navigator. r=smaug, sr=sicking 2013-07-12 10:36:22 -04:00
Boris Zbarsky
8e232248bc Bug 838146 part 4. Implement WebIDL API on Navigator for WebTelephony. r=bent, sr=sicking 2013-07-12 10:36:13 -04:00
Boris Zbarsky
b9f806fbc7 Bug 838146 part 3. Set up preprocessing of Navigator.webidl, since we want to make some stuff on Navigator build-time-conditional. r=khuey 2013-07-12 10:35:53 -04:00
Boris Zbarsky
1d61759816 Bug 838146 part 2. Implement WebIDL API on Navigator for all our nonstandard extensions that are not behind build-time flags. r=smaug, sr=peterv 2013-07-12 10:35:44 -04:00
Boris Zbarsky
8ecfecabac Bug 838146 part 1. Implement WebIDL API on Navigator for the parts that are specified or are in nsIDOMNavigator. r=smaug, sr=sicking 2013-07-12 10:35:35 -04:00
Reuben Morais
9efd2c3cb7 Bug 889503 - Move Settings API to WebIDL. r=gwagner r=bz
--HG--
extra : rebase_source : 9f858f389b71344353658d4ed49996e0d90b8b99
2013-07-15 18:17:46 -07:00
Mina Almasry
529857dfeb Bug 713564 - Add an API to declare a stylesheet obsolete. r=bz 2013-07-15 17:28:33 -04:00
Rick Eyre
0f5638b7d3 Bug 882706 - Implement TextTrackList::GetTrackById(). r=rillian
I've also added an Id attribute to the TextTrack implementation as it wasn't
there yet.
2013-07-09 11:44:35 -04:00
Randy Lin
cbc093a476 Bug 889720 - Media Recording - Implement Pause/Resume DOM API. r=roc 2013-07-14 15:31:59 +08:00
Andrea Marchesini
9d48d13bff Bug 884279 - Rename Future to Promise. r=mounir
--HG--
rename : dom/future/Makefile.in => dom/promise/Makefile.in
rename : dom/future/Future.cpp => dom/promise/Promise.cpp
rename : dom/future/Future.h => dom/promise/Promise.h
rename : dom/future/FutureCallback.cpp => dom/promise/PromiseCallback.cpp
rename : dom/future/FutureCallback.h => dom/promise/PromiseCallback.h
rename : dom/future/FutureResolver.cpp => dom/promise/PromiseResolver.cpp
rename : dom/future/FutureResolver.h => dom/promise/PromiseResolver.h
rename : dom/future/moz.build => dom/promise/moz.build
rename : dom/future/tests/Makefile.in => dom/promise/tests/Makefile.in
rename : dom/future/tests/moz.build => dom/promise/tests/moz.build
rename : dom/future/tests/test_bug883683.html => dom/promise/tests/test_bug883683.html
rename : dom/future/tests/test_future.html => dom/promise/tests/test_promise.html
rename : dom/future/tests/test_resolve.html => dom/promise/tests/test_resolve.html
rename : dom/webidl/Future.webidl => dom/webidl/Promise.webidl
2013-07-11 16:40:36 -04:00
Hsin-Yi Tsai
b6a3c06681 Bug 822210 - cdma call waiting - part1 - idl. sr=sicking, r=bent 2013-08-06 20:07:40 +08:00
Hsin-Yi Tsai
ff4cff7935 Bug 888592 - move Telephony and TelephonyCall to webidl. sr=sicking, r=bent 2013-07-15 16:27:19 +08:00
Matthew Gregan
d597606de0 Bug 889201 - Add tests for VideoPlaybackQuality. r=roc 2013-07-11 15:52:22 +12:00
Masatoshi Kimura
5a1cf4ebae Bug 885177 - Make window.ImageDocument ChromeOnly. r=bz 2013-07-11 08:15:30 +09:00
Ryan VanderMeulen
aaee3cf638 Merge m-c to inbound. 2013-07-10 09:45:16 -04:00
Anne van Kesteren
0272198601 Bug 891340 - Make Range.collapse optional and default to false 2013-07-09 18:29:38 -04:00
Ehsan Akhgari
418fc3155d Sort the WebIDL.mk entries just like a human would, no bug 2013-07-09 11:41:21 -04:00
Marc Jessome
279a1ca007 Bug 813034 - Implement table.createTBody(); r=mounir sr=smaug 2012-12-04 00:04:30 -05:00
Peter Van der Beken
9c3bffc341 Bug 734503 - Add new DOM binding for TouchList; r=jst. 2013-07-10 11:53:53 +02:00
Robert Bindar
403e1a820b Bug 888583 - Expose protocol version in about:networking. r=valentin.gosu 2013-07-08 16:35:08 -04:00
Ehsan Akhgari
e38795a37a Add comments about the origin of IDBFactory and IDBObjectStoreParameters to the Web IDL files, no bug
DONTBUILD because it's a comment only change.
2013-07-08 10:13:05 -04:00
Ryan VanderMeulen
c0d1b5ed27 Backed out changesets f9f13232e35f and 134b4feaff02 (bug 888583) for bustage. 2013-07-08 09:31:45 -04:00
Robert Bindar
d129a1c7c9 Bug 888583 - Expose protocol version in about:networking. r=mcmanus 2013-07-08 09:10:19 -04:00
Randy Lin
d2aff89854 Bug 803414 - Part 4: Audio Recording - Web API & Implementation. r=roc 2013-07-05 09:50:25 +08:00
Randy Lin
694cfec77c Bug 803414 - Part 0: Add RecordErrorEvent. r=smaug 2013-06-20 14:06:39 +08:00
Cameron McCormack
27fbbd563b Bug 569722 - Implement textLength and lengthAdjust on SVG text elements. r=longsonr 2013-07-07 17:27:51 +10:00
Phil Ringnalda
7540524e9d Backed out changeset 5ea64b6ba89b (bug 889201) for too-frequent failures 2013-07-05 14:24:50 -07:00
Ehsan Akhgari
fc8792b565 Bug 890382 - Implement a Web IDL event constructor for IDBVersionChangeEvent; r=smaug 2013-07-05 13:57:28 -04:00
Ehsan Akhgari
957dde44bf Backed out changeset 170e1863b9b6 (bug 890382) because of xpcshell test failures 2013-07-04 20:59:44 -04:00
Matthew Gregan
dbcfe9d22f Bug 889201 - Add tests for VideoPlaybackQuality. r=roc 2013-07-05 12:24:55 +12:00
Matthew Gregan
b61fe1fbac Bug 889205 - Change HTMLVideoElement.videoPlaybackQuality attribute to getVideoPlaybackAttribute method to reflect the current spec. r=roc 2013-07-05 12:24:35 +12:00
Ehsan Akhgari
dcbd7c592e Bug 890382 - Implement a Web IDL event constructor for IDBVersionChangeEvent; r=smaug 2013-07-04 18:12:39 -04:00
Ehsan Akhgari
41c4bbf2bc Bug 889016 - Part 2: Report an error in the synchronous AudioContext.createBuffer unless the legacy pref has been set; r=roc 2013-07-04 09:25:12 -04:00
Ehsan Akhgari
a8f2479515 Fix sorting on variables in WebIDL.mk, and also fix the wrong sorting order in Bindings.conf added in bug 855611
--HG--
extra : rebase_source : 87aa51d944193f73ea0a4e04c660785e6f5ddb4b
2013-07-09 10:54:05 -04:00
Johnny Stenback
7209a4a1c5 Fixing bug 855611. Convert navigator.plugins and navigator.mimeTypes to use new DOM bindings. r=peterv@propagandism.org. 2013-07-09 06:58:21 -07:00
Robert Longson
5d44648cb3 Bug 889329 - Implement deselectAll(). r=cam,sr=roc 2013-07-03 08:41:53 +01:00
Matthew Gregan
bd54a22c11 Bug 855130 - Implement URL::createObjectURL overload for
MediaSources.  Add MediaSources to HostObjectProtocolHandler.  Make
 MediaSource a real interface.  r=khuey
2013-06-21 15:15:15 +12:00
Matthew Gregan
e9b47a9dca Bug 855130 - Implement a minimal working subset of the Media Source
Extensions specification.  r=roc
2013-06-21 15:14:42 +12:00
Matthew Gregan
79e4765b62 Bug 855130 - Implement HTMLVideoElement's VideoPlaybackQuality (from
Media Source Extensions specification).  r=roc
2013-06-21 15:14:18 +12:00
Scott Johnson
b741a6aa9d Bug 878931: Add a FontSizeInflation() method to Element in order to retrieve font size inflation to use during reflow-on-zoom. [r=kats,mounir]
The reflow-on-zoom behavior needs a more robust determination of the font size inflation, so
that it can adjust its behavior depending on whether font size inflation has been
enabled for a given element's text. This patch also modifies the behavior of reflow-
on-zoom such that it will zoom in to piece of text, with reflow, if the minimum
specified font size in the font size inflation preferences is greater than the
current font size, with font size inflation, of the element.
2013-07-02 09:04:27 -05:00
Phil Ringnalda
caf26c910c Backed out 5fa1f7715c19:7a300d1d1b23 (bug 855130) for Windows build failures
CLOSED TREE
2013-07-01 21:23:37 -07:00
Matthew Gregan
2c56844ced Bug 855130 - Implement URL::createObjectURL overload for MediaSources. r=khuey
---
 content/base/public/nsHostObjectProtocolHandler.h | 26 +++++++++
 content/base/src/nsHostObjectProtocolHandler.cpp  | 65 +++++++++++++++++------
 content/base/src/nsHostObjectURI.h                |  5 +-
 content/media/mediasource/MediaSource.cpp         |  1 +
 content/media/mediasource/MediaSource.h           |  7 +++
 dom/base/URL.cpp                                  | 12 +++++
 dom/base/URL.h                                    |  7 +++
 dom/webidl/URL.webidl                             |  6 +++
 layout/build/nsLayoutModule.cpp                   |  4 ++
 9 files changed, 116 insertions(+), 17 deletions(-)
2013-07-02 15:46:49 +12:00
Matthew Gregan
4e67cd07c7 Bug 855130 - Implement a minimal working subset of the Media Source Extensions API. r=roc
---
 content/media/mediasource/AsyncEventRunner.h       |  35 ++
 content/media/mediasource/Makefile.in              |  18 +
 content/media/mediasource/MediaSource.cpp          | 395 +++++++++++++++++++++
 content/media/mediasource/MediaSource.h            | 127 +++++++
 .../media/mediasource/MediaSourceInputAdapter.cpp  | 176 +++++++++
 .../media/mediasource/MediaSourceInputAdapter.h    |  43 +++
 content/media/mediasource/SourceBuffer.cpp         | 249 +++++++++++++
 content/media/mediasource/SourceBuffer.h           | 115 ++++++
 content/media/mediasource/SourceBufferList.cpp     | 143 ++++++++
 content/media/mediasource/SourceBufferList.h       |  79 +++++
 content/media/mediasource/moz.build                |  24 ++
 content/media/moz.build                            |   2 +
 dom/bindings/Bindings.conf                         |  13 +
 dom/dom-config.mk                                  |   1 +
 dom/webidl/MediaSource.webidl                      |  38 ++
 dom/webidl/SourceBuffer.webidl                     |  44 +++
 dom/webidl/SourceBufferList.webidl                 |  17 +
 dom/webidl/WebIDL.mk                               |   3 +
 layout/build/Makefile.in                           |   4 +
 modules/libpref/src/init/all.js                    |   3 +
 20 files changed, 1529 insertions(+)
 create mode 100644 content/media/mediasource/AsyncEventRunner.h
 create mode 100644 content/media/mediasource/Makefile.in
 create mode 100644 content/media/mediasource/MediaSource.cpp
 create mode 100644 content/media/mediasource/MediaSource.h
 create mode 100644 content/media/mediasource/MediaSourceInputAdapter.cpp
 create mode 100644 content/media/mediasource/MediaSourceInputAdapter.h
 create mode 100644 content/media/mediasource/SourceBuffer.cpp
 create mode 100644 content/media/mediasource/SourceBuffer.h
 create mode 100644 content/media/mediasource/SourceBufferList.cpp
 create mode 100644 content/media/mediasource/SourceBufferList.h
 create mode 100644 content/media/mediasource/moz.build
 create mode 100644 dom/webidl/MediaSource.webidl
 create mode 100644 dom/webidl/SourceBuffer.webidl
 create mode 100644 dom/webidl/SourceBufferList.webidl
2013-07-02 15:46:48 +12:00
Matthew Gregan
acfa080650 Bug 855130 - Implement HTMLVideoElement's VideoPlaybackQuality (from Media Source Extensions spec). r=roc
---
 content/html/content/public/HTMLVideoElement.h |  4 ++
 content/html/content/src/HTMLVideoElement.cpp  | 27 ++++++++++
 content/media/MediaDecoder.h                   | 17 +++++++
 content/media/MediaDecoderStateMachine.cpp     |  6 ++-
 content/media/VideoPlaybackQuality.cpp         | 53 ++++++++++++++++++++
 content/media/VideoPlaybackQuality.h           | 68 ++++++++++++++++++++++++++
 content/media/moz.build                        |  2 +
 dom/base/moz.build                             |  2 +
 dom/bindings/Bindings.conf                     |  4 ++
 dom/webidl/HTMLVideoElement.webidl             |  6 +++
 dom/webidl/VideoPlaybackQuality.webidl         | 20 ++++++++
 dom/webidl/WebIDL.mk                           |  1 +
 12 files changed, 209 insertions(+), 1 deletion(-)
 create mode 100644 content/media/VideoPlaybackQuality.cpp
 create mode 100644 content/media/VideoPlaybackQuality.h
 create mode 100644 dom/webidl/VideoPlaybackQuality.webidl
2013-07-02 15:46:48 +12:00
Ms2ger
c477a69e4e Bug 886289 - Move SVGAnimatedNumber to WebIDL; r=dzbarsky 2013-07-01 09:03:04 +02:00
Ms2ger
6fa75b2d82 Bug 886270 - Move SVGAnimatedInteger to WebIDL; r=dzbarsky 2013-07-01 09:02:56 +02:00
Ms2ger
d2041977f8 Bug 886247 - Move SVGAnimatedEnumeration to WebIDL; r=dzbarsky 2013-07-01 09:02:46 +02:00
Ms2ger
ae221922f0 Bug 887909 - Convert IDBFileHandle to WebIDL; r=janv 2013-07-01 09:02:37 +02:00
Fernando Jiménez
88023a7889 Bug 883178 - [MMI] Implement DOMMMIResult and DOMMMIError. Part 2: DOMMMIResult and DOMMMIError. r=vicamo, sr=sicking 2013-06-30 20:21:32 +08:00
Fernando Jiménez
7bb0669cdb Bug 883178 - [MMI] Implement DOMMMIResult and DOMMMIError. Part 1: DOMError. r=sicking, sr=peterv 2013-06-30 20:21:31 +08:00
James Kitchener
7206e512a6 Bug 802895 - Implement srcdoc attribute for iframe r=bz 2013-06-28 23:13:23 -04:00
James Kitchener
33a9f769ee Bug 802895 - ns(I)document changes for iframe srcdoc implementation r=bz 2013-06-28 23:13:22 -04:00
Ed Morley
38df1ffab0 Merge latest green birch changeset and mozilla-central 2013-06-28 14:33:47 +01:00
Fernando Jiménez
b937a4c00e Bug 885701 - [DOMRequest] Implement DOMRequestService.fireDetailedError. r,sr=sicking 2013-06-28 10:53:44 +08:00
Matthew Gregan
6045ea2dc7 Backout 184ef886365d, 4c6a6ac3a9d5, and 59857a435c3b on a CLOSED TREE 2013-06-28 16:55:35 +12:00
Matthew Gregan
b96a174d39 Bug 855130 - Drop [Creator] from HTMLVideoElement.videoPlaybackQuality attribute. r=roc 2013-06-28 16:36:10 +12:00
Matthew Gregan
31eaf49a26 Bug 855130 - Implement a minimal working subset of the Media Source Extensions API. r=roc 2013-06-28 16:32:05 +12:00
Matthew Gregan
07a8149c7d Bug 855130 - Implement HTMLVideoElement's VideoPlaybackQuality (from Media Source Extensions spec). r=roc 2013-06-28 16:32:05 +12:00