Kyle Huey
e3dadea704
Bug 683290: Discard images that are not in the DOM. r=bz
2012-08-13 15:11:50 -07:00
David Anderson
7ef28ac5ac
Merge from mozilla-central.
2012-08-13 13:40:42 -07:00
Kyle Huey
adc77cb365
Bug 685516: Instead of decoding small images synchronously and large images asynchronously, always decode synchronously for some time, and post the remainder to the event loop if necessary. r=joe
2012-08-13 11:12:15 -07:00
Mark Capella
7e0b8d3bac
Bug 772272 - Remove do_load_httpd_js from xpcshell tests, Misc Folders, r=ted
...
Content, DOM, Image, JS, RDF, and URILoader folders
2012-08-14 10:06:17 -04:00
Masayuki Nakano
933a9ad01b
Bug 782181 Remove unused method nsMouseWheelTransaction::IsAccelerationEnabled() r=smaug
2012-08-13 21:11:20 +09:00
Mounir Lamouri
1077929b19
Bug 782227 - Add a todo() when there is no invalid form submission observer (content/ tests). r=Ms2ger
2012-08-13 12:14:34 +02:00
Matt Woodrow
41a9a1a13c
Bug 539356 - Part 31 - Call Azure canvas DidTransactionCallback even when painting from DrawWindow(). r=roc
2012-08-13 22:10:57 +12:00
Aryeh Gregor
6a9cec29c8
Bug 626472 part 3 - Remove nsnull for good; r=ehsan
2012-08-12 13:43:47 +03:00
Chris Pearce
e847557147
Bug 775965 - Ensure presentation persists across nsSubDocumentFrame reframes. r=roc
2012-08-14 16:06:44 +12:00
Alexander Boldyrev
45a38ebb0b
Bug 738866 - Implement WEBGL_depth_texture extension - r=jgilbert
2012-08-13 18:17:55 -07:00
Ryan VanderMeulen
902d64ba8e
Merge m-c to inbound.
2012-08-11 23:34:26 -04:00
Masayuki Nakano
539ddd3a14
Bug 719320 fix bustage r=no
2012-08-12 12:32:30 +09:00
Ryan VanderMeulen
870142e530
Merge inbound to m-c.
2012-08-11 22:33:42 -04:00
Masayuki Nakano
dc168c0fe1
Bug 719320 part.18 Clean up legacy mouse scroll event r=smaug
2012-08-12 10:42:37 +09:00
Masayuki Nakano
fef53e910a
Bug 719320 part.11 Fix new test failures r=smaug
2012-08-12 10:42:36 +09:00
Masayuki Nakano
054c5d328e
Bug 719320 part.10 Add new tests and remove tests for old ESM's legacy mouse scroll event handler r=smaug
2012-08-12 10:42:36 +09:00
Masayuki Nakano
d3e3af5edb
Bug 719320 part.8-11 Cancel applying delta multipliers from overflowDelta r=smaug
2012-08-12 10:42:36 +09:00
Masayuki Nakano
53c900db7e
Bug 719320 part.8-9 Handle WheelEvent.deltaZ in ESM r=smaug
2012-08-12 10:42:36 +09:00
Masayuki Nakano
737ff36abf
Bug 719320 part.8-8 widget should be able to speicify the scroll type r=smaug
2012-08-12 10:42:36 +09:00
Masayuki Nakano
3cdce54608
Bug 719320 part.8-7 Implement the other default actions of WheelEvent r=smaug
2012-08-12 10:42:36 +09:00
Masayuki Nakano
aa2205d526
Bug 719320 part.8-6 Init lineOrPageDeltaX and lineOrPageDeltaY from accumulated delta values if the wheel event is caused by pixel scroll only device or the delta values have been modified with prefs r=smaug
2012-08-12 10:42:36 +09:00
Masayuki Nakano
5ef8537b0b
Bug 719320 part.8-5 Dispatch legacy mouse scroll events before dispatching wheel event into system group if the wheel event isn't consumed r=smaug
2012-08-12 10:42:35 +09:00
Masayuki Nakano
cee821b532
Bug 719320 part.8-4 Implement D3E WheelEvent handler for scroll r=smaug
2012-08-12 10:42:35 +09:00
Masayuki Nakano
e828866df7
Bug 719320 part.8-3 Redesign nsMouseWheelTransaction for D3E WheelEvent r=smaug
2012-08-12 10:42:35 +09:00
Masayuki Nakano
1bc02406f9
Bug 719320 part.8-2 GetScrollAmount() should return both width and height for oblique wheel event r=smaug
2012-08-12 10:42:35 +09:00
Masayuki Nakano
92d1e07e69
Bug 719320 part.8-1 Drop legacy mouse scroll events from IPC r=smaug
2012-08-12 10:42:35 +09:00
Masayuki Nakano
a2e667b6b9
Bug 719320 part.7 Drop NS_QUERY_SCROLL_TARGET_INFO handler from ESM r=smaug
2012-08-12 10:42:35 +09:00
Masayuki Nakano
a418ba8a35
Bug 719320 part.6 Separate pixel delta value accumulation code r=smaug
2012-08-12 10:42:35 +09:00
Masayuki Nakano
1818fe2fb2
Bug 719320 part.5 Redesign mouse wheel action prefs r=smaug
2012-08-12 10:42:35 +09:00
Masayuki Nakano
d26b327f14
Bug 719320 part.4 Remove mousewheel.*.*numlines and add mousewheel.*.delta_multiplier_* r=smaug
2012-08-12 10:42:34 +09:00
Masayuki Nakano
785b73e21d
Bug 719320 part.3 Use ComputeScrollTarget() for deciding detail value of legacy mouse scroll events r=smaug
2012-08-12 10:42:34 +09:00
Masayuki Nakano
06c7f1baf6
Bug 719320 part.2 Separate code for deciding scroll target from nsEventStateManager::DoScrollText() r=smaug
2012-08-12 10:42:34 +09:00
Masayuki Nakano
c748a0f833
Bug 719320 part.1 Add DOM3 WheelEvent r=smaug, sr=jst
2012-08-12 10:42:34 +09:00
Honza Bambas
541453729c
Bug 215450: Allow uploading of files greater than 2gb in size. Involves making input streams 64-bit capable. Significant work done by Makoto Kato, finished by Honza Bambas. r=hbambas,bsmedberg,jdrew,sicking
2012-08-10 22:44:11 -04:00
David Anderson
efd9a9feee
Merge from mozilla-central.
2012-08-10 14:50:20 -07:00
David Zbarsky
b462ec011a
Bug 773842 - Fix build warnings under content/ r=mounir
2012-08-10 14:01:16 -04:00
Alexandros Chronopoulos
b42d0e9db4
Bug 748144 - Support multichannel Opus files. r=rillian
...
The Opus audio format supports multichannel (surround) audio, but our initial implementation used a simpler API which only supported mono and stereo output.
To handle these files gracefully, this patch uses the multichannel api and downmixes the output, if possible, to stereo, since we don't currently support surround sound playback.
2012-08-09 15:53:23 -07:00
David Anderson
b620fb6c5c
Merge from mozilla-central.
2012-08-09 13:41:13 -07:00
Ed Morley
61bd42dc2d
Merge last PGO-green changeset of mozilla-inbound to mozilla-central
2012-08-09 12:46:05 +01:00
Ms2ger
eb0692aef8
Bug 727547 - Add test.
2012-08-09 09:10:43 +02:00
Ms2ger
e2573fe71e
Bug 780993 - Reinstate support for setting indexed properties on HTMLSelectElement to null; r=bz
2012-08-09 09:10:21 +02:00
Ms2ger
26217245c9
Bug 780387 - Part f: Stop using PRBool & PRPackedBool; r=bsmedberg
2012-08-09 09:10:13 +02:00
Ms2ger
17e25febb8
Bug 780387 - Part d: Stop using PRFloat64; r=bsmedberg
2012-08-09 09:09:42 +02:00
Ms2ger
3f950b5744
Bug 780387 - Part b: Stop using PRIntn; r=bsmedberg
2012-08-09 09:09:40 +02:00
Justin Lebar
1994f4ebb3
Bug 780761 - Fix race condition in initialization of message manager for popups from <iframe mozbrowser>. r=smaug
...
Calling show() causes EnsureMessageManager() to SetCallbackData() on the message manager. If we don't do this, then the message manager will throw when we try to send a message.
2012-08-13 15:19:09 -04:00
Justin Lebar
0d4822afe2
Bug 777135 - Part 2: Stop using nsDOMWindowUtils::GetIsApp and friends, and instead use the relevant methods on the principal. r=mounir
...
--HG--
extra : rebase_source : fa8a153a1edc8f64b230b67f121ba5eaaf1098e6
2012-08-13 12:58:38 -04:00
Masayuki Nakano
b88a7758de
Bug 659071 DoScrollZoom() should check if the event target is under XUL document rather than checking if it's XUL element r=smaug
2012-08-13 23:20:13 +09:00
David Anderson
c9ca5124db
Merge from mozilla-central.
2012-08-08 15:09:49 -07:00
Ehsan Akhgari
5b76a146bc
Bug 579517 - Part 5: Add missing StandardInteger.h #includes where needed; r=bsmedberg
...
Landing on a CLOSED TREE
2012-08-08 17:08:17 -04:00
Ehsan Akhgari
0fd9123eac
Bug 579517 - Part 1: Automated conversion of NSPR numeric types to stdint types in Gecko; r=bsmedberg
...
This patch was generated by a script. Here's the source of the script for
future reference:
function convert() {
echo "Converting $1 to $2..."
find . ! -wholename "*nsprpub*" \
! -wholename "*security/nss*" \
! -wholename "*/.hg*" \
! -wholename "obj-ff-dbg*" \
! -name nsXPCOMCID.h \
! -name prtypes.h \
-type f \
\( -iname "*.cpp" \
-o -iname "*.h" \
-o -iname "*.c" \
-o -iname "*.cc" \
-o -iname "*.idl" \
-o -iname "*.ipdl" \
-o -iname "*.ipdlh" \
-o -iname "*.mm" \) | \
xargs -n 1 sed -i -e "s/\b$1\b/$2/g"
}
convert PRInt8 int8_t
convert PRUint8 uint8_t
convert PRInt16 int16_t
convert PRUint16 uint16_t
convert PRInt32 int32_t
convert PRUint32 uint32_t
convert PRInt64 int64_t
convert PRUint64 uint64_t
convert PRIntn int
convert PRUintn unsigned
convert PRSize size_t
convert PROffset32 int32_t
convert PROffset64 int64_t
convert PRPtrdiff ptrdiff_t
convert PRFloat64 double
2012-08-22 11:56:38 -04:00
John Schoenick
74460aef8f
Bug 782644 - Prevent against nsObjectLoadingContent re-entry from content policy. r=josh
2012-08-21 16:42:48 -07:00
John Schoenick
871b82e6f9
Bug 781482 - Fix rebase error in nsObjectLoadingContent. r=josh
2012-08-21 16:42:48 -07:00
Jeff Gilbert
d394179aac
Bug 782785 - Use temp surfaces to ReadPixels with correct stride - r=bjacob
2012-08-21 16:13:26 -07:00
Paul Adenot
15058d402d
Bug 730765 - Media cache shouldn't be used when loading from blob: urls. r=biesi
2012-08-21 16:00:23 -07:00
Ehsan Akhgari
7a743fcc5b
Bug 784536 - Use the name of the enum value directly as opposed to access it from the enum's scope; r=dzbarsky
2012-08-21 19:06:50 -04:00
Ryan VanderMeulen
351d01c8ff
Backout 3ce94808577b, 56f288230d5a, and 18ff170ecb1f (bug 730765) for bustage. r=fail
2012-08-21 18:45:54 -04:00
Paul Adenot
7751daec1e
Bug 730765 - Media cache shouldn't be used when loading from blob: urls. r=biesi
2012-08-15 10:36:12 -07:00
David Keeler
8c1cb54acb
Bug 767636 - expose plugin fallback type to extensions. r=jaws
2012-08-21 12:40:07 -07:00
Bobby Holley
625511572e
Bug 784233 - Relax __exposedProps__ check for sandboxes until we can repack AMO addons. r=gal
2012-08-21 10:27:08 -07:00
Paul Adenot
9670c86dc2
Bug 775319 - Determine the sample format at compile time for all media code. r=kinetik
2012-08-16 18:10:36 -07:00
Kan-Ru Chen (陳侃如)
cd9d182e06
Bug 767480 - Gralloc backed video buffer. r=roc
2012-08-21 18:22:58 +08:00
Kan-Ru Chen (陳侃如)
f5e3f3d680
Bug 767480 - PlanarYCbCrImage Refactoring. r=roc
2012-08-21 18:18:20 +08:00
Kan-Ru Chen (陳侃如)
22db9a8e93
Back out c8f7bace9cf9, 17ec4e01c126 (bug 767480) r=bustage
2012-08-21 17:55:02 +08:00
Kan-Ru Chen (陳侃如)
2225b447e6
Bug 767480 - Gralloc backed video buffer. r=roc
2012-08-21 14:59:42 +08:00
Kan-Ru Chen (陳侃如)
4787af5685
Bug 767480 - PlanarYCbCrImage refactoring. r=roc
2012-08-21 17:31:36 +08:00
Ed Morley
969a047a7e
Merge last PGO-green changeset of mozilla-inbound to mozilla-central
2012-08-08 17:18:26 +01:00
David Anderson
3ffd33a2cb
Merge from mozilla-central.
2012-08-07 15:13:28 -07:00
Kyle Huey
ed6c22b7cd
Bug 754759: Unannotate tests now that Bug 774770 is fixed.
2012-08-07 13:54:46 -07:00
Ed Morley
2d0ee22719
Backout 2b5b8baa5816 (bug 767636) for causing bug 783836
2012-08-19 02:08:13 +01:00
Chris Jones
d0eff0d38b
Bug 776069: Disable remote audio for gonk. Sigh. r=kinetik
2012-08-18 16:14:37 -07:00
Ed Morley
46062461e7
Bug 608634 - Disable test_error_in_video_document.html for too many intermittent failures; r=philor
2012-08-18 23:59:34 +01:00
Ed Morley
70e369a460
Backout 41722f2e0c33 (bug 422132), 69da5f098237 (bug 782903), 5c601428c70b (bug 422132) for bug 782903
2012-08-18 23:29:13 +01:00
Chris Jones
b565a218be
Bug 783736: Load in-gecko controls for media-plugin types. r=roc
2012-08-18 14:48:25 -07:00
Ms2ger
5cd10c6422
Merge m-c to m-i.
2012-08-07 10:30:48 +02:00
Ms2ger
a45a0051cf
Bug 743573 - Fix a number of build warnings in dom/; r=mounir
2012-08-07 09:06:29 +02:00
Matthew Gregan
4a8b47119c
Bug 770945 - Back out unnecessary change. r=backout
2012-08-17 16:52:08 +12:00
Chris Pearce
274d465a14
Bug 775965 - Ensure presentation persists across nsSubDocumentFrame reframes. r=roc
2012-08-14 16:06:44 +12:00
Matthew Gregan
25a5e3ddb3
Bug 782876 - Remove unnecessary returns from event handlers in media tests. r=doublec
2012-08-15 16:41:24 +12:00
Matthew Gregan
2c8e9d8fe6
Bug 770945 - Simple media events shouldn't be cancelable. r=roc
2012-08-14 15:26:43 +12:00
David Anderson
9c45c01c55
Merge from mozilla-central.
...
--HG--
rename : layout/base/nsFrameTraversal.cpp => layout/base/nsFrameIterator.cpp
rename : layout/base/nsFrameTraversal.h => layout/base/nsFrameIterator.h
rename : browser/modules/WebappsInstaller.jsm => toolkit/webapps/WebappsInstaller.jsm
2012-08-06 12:44:06 -07:00
David Anderson
ac219f63e6
Merge from mozilla-central.
2012-08-03 18:58:30 -07:00
Bobby Holley
ef3a2ff757
Bug 781521 - Fix Message Manager blob test. r=Ms2ger
2012-08-14 20:54:33 -07:00
Masayuki Nakano
74f755bd54
Bug 782552 Set overflow delta values even if there is no scroll target for the wheel event r=smaug
2012-08-15 09:52:07 +09:00
Masayuki Nakano
a2e9895dca
Bug 422132 Store unused fractional scroll amount for later wheel events r=smaug
2012-08-15 09:52:07 +09:00
Alexandre D'Eschambeault
7d7c542db1
Bug 751452 - Prevent DNT modification in unprivileged mode + test case. r=khuey
2012-08-13 22:47:19 -04:00
Andrew McCreight
6c0ec6c6e5
Bug 779669 - Return error in GetMozDash. r=peterv
2012-08-06 08:12:06 -07:00
Ed Morley
f55d9d2db2
Bug 760770 - Mark test_timeupdate_small_files.html's "got unexpected stalled after ended" as todo for seek.webm, for frequent intermittent failures; r=cpearce
2012-08-03 11:28:12 +01:00
Ed Morley
1175eb7c52
Bug 620598, Bug 661076 & Bug 687972 - Disable frequently intermittent media tests on Linux; r=cpearce
2012-08-03 11:28:12 +01:00
Ehsan Akhgari
65c5e19c37
Bug 579517 follow-up: Remove NSPR types that crept in
...
--HG--
extra : rebase_source : 3fc28d51fcb5c63e417b0fe2b90fb6e1eb0cac63
2012-09-06 10:11:28 -04:00
Ed Morley
6c2f1a70b4
Merge mozilla-central to mozilla-inbound
2012-09-06 12:18:37 +01:00
Ed Morley
c6d2c20860
Merge last PGO-green changeset of mozilla-inbound to mozilla-central
2012-09-06 10:19:16 +01:00
Ms2ger
d653d11db3
Bug 787412 - HTMLOptionElement.prototype.text should use do a deep tree traversal; r=mounir
2012-09-06 09:25:05 +02:00
Ms2ger
a56d5a2aa5
Bug 782915 - Outparamdel nsHTMLTableRowElement getters; r=mounir
2012-09-06 09:14:49 +02:00
Ms2ger
c4de34fb6b
Bug 784768 - Remove nsresult return value of nsMappedAttributes::SetAndTakeAttr; r=khuey
2012-09-06 09:14:49 +02:00
Ms2ger
358f7a91f3
Bug 782040 - Move ProgressEvent to event impl codegen; r=smaug
2012-09-06 09:14:49 +02:00
Ms2ger
5649aa41c5
Bug 788218 - Don't allow a null argument to nsEventStateManager::GetRegisteredAccessKey; r=smaug
2012-09-06 09:14:49 +02:00
Makoto Kato
c28c020a8f
Bug 784912 - nsIStreamListener.onDataAvailable should handle 64-bit offset. r=honza
2012-09-06 11:41:02 +09:00
Ryan VanderMeulen
227e691e39
Backout 013743bb609e (bug 591358) for Windows orange.
2012-09-05 19:53:43 -04:00
Ryan VanderMeulen
564bdb74b5
Merge m-c to inbound.
2012-09-05 23:03:09 -04:00
Paul Adenot
227e7a96df
Bug 567077 - Fix an assertion failure when the decoder is cloned. r=cpearce
2012-09-04 16:25:02 -07:00
Paul Adenot
1b75b131ca
Bug 567077 - Tests for sniffing the types of media files that are served with no Content-Type. r=cpearce
2012-09-04 16:24:34 -07:00
Paul Adenot
1328b09819
Bug 567077 - Avoid sniffing when recreating a channel. r=cpearce
2012-09-04 17:49:46 -07:00
Paul Adenot
2719cc62de
Bug 567077 - Sniff types of media files that are served with no Content-Type. r=cpearce
2012-09-04 16:22:34 -07:00
Ryan VanderMeulen
07a63bd067
Backout bug 567077 for bustage.
2012-09-05 18:36:38 -04:00
Paul Adenot
0abfc46448
Bug 567077 - Fix an assertion failure when the decoder is cloned. r=cpearce
2012-09-04 16:25:02 -07:00
Paul Adenot
fe4b12cd7c
Bug 567077 - Tests for sniffing the types of media files that are served with no Content-Type. r=cpearce
2012-09-04 16:24:34 -07:00
Paul Adenot
bdab14e35c
Bug 567077 - Avoid sniffing when recreating a channel. r=cpearce
2012-09-04 16:24:12 -07:00
Paul Adenot
cce500079e
Bug 567077 - Sniff types of media files that are served with no Content-Type. r=cpearce
2012-09-04 16:22:34 -07:00
John Schoenick
6c657c7493
Backout a6f040934c99 (Bug 548133) for reftest orange
2012-09-05 14:58:17 -07:00
Paul Adenot
a8a6b828f5
Bug 730765 - Media cache shouldn't be used when loading from blob: urls. r=biesi
2012-09-04 14:53:52 -07:00
Cameron McCormack
34d323057c
Bug 655877 - Part 45: Note a crashtest that involves XBL as triggering assertions. r=longsonr
2012-09-06 16:07:53 +10:00
Edwin Flores
06c8be815b
Bug 719286 - Include SVG glyphs when calculating glyph extents r=jfkthame
2012-09-06 16:58:46 +12:00
Edwin Flores
43c1f6c245
Bug 719286 - Setup gfxTextObjectPaint wrapper for SVG glyphs to inherit outer text object paint r=roc
2012-09-06 16:58:46 +12:00
Edwin Flores
67581ebf40
Bug 719286 - Add new gfxTextObjectPaint paint wrapper for use with SVG glyphs r=roc
2012-09-06 16:58:46 +12:00
Edwin Flores
9840b20db1
Bug 719286 - Add -moz-is-glyph media feature for setting default values for SVG glyphs in the browser SVG style sheet r=dbaron
2012-09-06 16:58:44 +12:00
Edwin Flores
fe9a9803ab
Bug 719286 - Basic OpenType SVG functionality r=roc
2012-09-06 16:57:54 +12:00
Ben Turner
51792b2d7b
Bug 778968 - 'Avoid stat-ing remote blobs on the main thread'. r=janv.
...
--HG--
extra : transplant_source : %90%87%047%07BA%97%E0%F1n%1DY%08D%7C%E39%20%0F
2012-08-02 23:25:30 -07:00
Ben Turner
7f1e8a99aa
Backed out changeset 46653198caac
2012-08-02 21:53:03 -07:00
Aryeh Gregor
f41637535d
Bug 780469 - Reduce unnecessary includes in some content/ header files; r=bz
2012-08-06 15:02:08 +03:00
Aryeh Gregor
4d1aebd934
Bug 780070 - Remove unnecessary includes from FragmentOrElement.h; r=bz
2012-08-05 12:11:24 +03:00
Joe Drew
13c7575b24
Bug 773097 - Don't create our surface from GetCanvasLayer. It's called while painting, and doing so will destroy the layer manager that we're painting with. r=roc,mattwoodrow
...
Canvases use the "persistent" layer manager, which is only used after 5
seconds has elapsed on Windows. So if we start up to a site that uses canvas,
we risk switching to the persistent layer manager while drawing using the
temporary layer manager. Because layer managers are singletons, they're not
refcounted, and so we end up holding a dead pointer and corrupting the heap.
2012-08-10 12:13:09 -04:00
Nicolas Silva
d0d69183bb
Bug 773469 - Remove unnecessary layer transactions when using async-video. r=roc
2012-08-10 11:42:53 -04:00
Ed Morley
10b5d6d4ac
Backout 5d77941eba28 (bug 772726), df597d36bcbb (bug 383026), c9c7e1b9aed9 (bug 779399) for failures in meter-native-style.html
2012-08-10 14:50:43 +01:00
Robert O'Callahan
1fd3d80a86
Bug 383026. Centralize code that converts DOM scroll offsets to/from layout scroll positions. r=dbaron
...
--HG--
extra : rebase_source : eceb07d8d35e0dd5dd31d065cb04eec12d69a283
2012-08-10 23:17:06 +12:00
Chris Double
716e968bbd
Bug 759945 - Part 6: Respect media.plugins.enabled preference - r=cpearce
...
--HG--
extra : rebase_source : e10d292ea2a90eb4b3796e630f67d5aab5fa5654
2012-08-10 20:15:31 +12:00
Chris Double
a398908995
Bug 759945 - Part 4: MP4 test file - r=cpearce
...
--HG--
extra : rebase_source : 0aa155c4ebc60ddc8afe720161af345c555897a8
2012-08-10 20:15:24 +12:00
Chris Double
4e22a0f0ae
Bug 759945 - Part 3: Android OS headers and stub files for software decoding using libstagefright on Android - r=cpearce
...
--HG--
extra : rebase_source : 0f5b9fed7dac3040a98af6dcc324407c4f8a9772
2012-08-10 20:15:20 +12:00
Chris Double
2e4abce09a
Backed out changeset dcb9299974a0 due to audio issues on android and b2g
...
--HG--
extra : rebase_source : 7e2b937487c3df9a40406eadf250e6596b89664f
2012-08-10 17:30:01 +12:00
David Anderson
ef13f46623
Merge from mozilla-central.
2012-08-02 13:47:20 -07:00
Ben Turner
56da575b73
Bug 778968 - 'Avoid stat-ing remote blobs on the main thread'. r=janv.
2012-08-02 13:42:30 -07:00
Robert O'Callahan
84ab035abb
Bug 646331. Specify correct duration for 320x240.ogv. r=cpearce
2012-08-03 15:22:24 +12:00
Ed Morley
66bb79039e
Backout ec46cfa51bf8, 4a54f06efee8, de811fbd27b0 & 67ea1314c777 (bug 567077) for causing bug 781141
2012-08-08 13:11:34 +01:00
Cameron McCormack
202576322f
Bug 655877 - Part 31a: Atom for new frame class nsSVGTextFrame2. r=roc
2012-08-08 21:37:13 +10:00
Ed Morley
1b0ed1cf7a
Merge last PGO-green changeset of mozilla-inbound to mozilla-central
2012-08-02 14:19:18 +01:00
Olli Pettay
a896bb3def
Bug 772966 - force XBL parameter names to be non-zero, r=sicking
2012-08-02 09:12:34 +03:00
Ben Turner
0010e82b08
Bug 759427 - 'Multiprocess blob support for MessageManager and IndexedDB'. r=smaug+janv+khuey (rs=sicking for nsBlobURI changes).
...
--HG--
extra : transplant_source : %95%B5y%11%C5%AB%D9%CF%FF%7C%5E%BB%E5%DA%F5j%83o%29%EB
2012-08-01 23:02:29 -07:00
David Anderson
bee6a61001
Merge.
...
--HG--
rename : content/base/src/nsGenericElement.h => content/base/public/FragmentOrElement.h
rename : content/base/src/nsGenericElement.cpp => content/base/src/FragmentOrElement.cpp
rename : gfx/thebes/nsCoreAnimationSupport.mm => gfx/2d/QuartzSupport.mm
2012-08-01 11:30:00 -07:00
Ed Morley
b5c712e1ca
Merge last PGO-green changeset of mozilla-inbound to mozilla-central
2012-08-01 18:36:33 +01:00
Olli Pettay
4c2811f3c2
Bug 777278 - Implement nsIDOMStorageEvent using event implementation codegen, r=mayhemer
2012-08-01 19:17:19 +03:00
Olli Pettay
3083c0bdec
Bug 777285 - Autogenerate SettingsEvent implementation, r=anygregor
...
--HG--
extra : rebase_source : 038f38a4f9efae15a3fbf4236c4456bf9cfa4577
2012-08-01 12:48:35 +03:00
Matthew Gregan
54b084c615
Bug 779416 - Shrink some unnecessarily large char arrays used for codec types. r=cpearce
2012-08-01 18:15:27 +12:00
Matthew Gregan
fc44cc213c
Bug 779412 - Iterate over correct test array in test_info_leak. r=cpearce
2012-08-01 17:58:09 +12:00
Ryan VanderMeulen
45d1e5a186
Bustage fix for bug 779535 follow-up.
2012-08-01 18:40:24 -04:00
Oleg Romashin
b82742bece
Bug 779535 - readability followup. r=jgilbert
2012-08-01 15:13:49 -07:00
Eric Faust
4f1dd6602a
Bug 749535 - Part 2: Rewrite dom::TypedArray to use JS_UnwrapObjectAs*Array(). (r=bz)
2012-07-31 20:45:20 -07:00
Eric Faust
e8671110a6
Backout changesets 6e78bc0145ee, 97a1463cde9c, and 9097d0b3acc6 (Bug 749535) for
...
erroneous bug number (r=me).
2012-07-31 20:24:32 -07:00
Eric Faust
a7fa8d3129
Bug 747935 - Part 2: Rewrite dom::TypedArray to use JS_UnwrapObjectAs*Array(). (r=bz)
2012-07-31 20:06:35 -07:00
Chris Pearce
1448181589
Bug 778105 - Fix an nsOggReader::GetBuffered() return value type mismatch. r=doublec
2012-08-01 13:24:25 +12:00
David Anderson
9929d37fcc
Merge from mozilla-central.
2012-07-31 17:19:41 -07:00
Matthew Gregan
f9ae5a3992
Bug 768333 - Follow up: remove redundant call to GetPositionInFrames. r=cpearce
2012-07-31 21:11:52 +12:00
Aryeh Gregor
e9d849fa17
Bug 563659 part 6 - Remove #if 0'd code; r=bz
2012-07-31 18:36:21 +03:00
Nicholas Cameron
5763a6c405
Merge backout, a=bustage fix
2012-07-31 18:17:53 +12:00
Nicholas Cameron
db90500fee
Back out bug 779001, bug 746883, bug 778595, bug 776803, bug 7118849
2012-07-31 18:17:23 +12:00
Nicholas Cameron
12480ec1e9
Bug 776802; Give better info about Azure. r=Bas
2012-07-31 13:45:59 +12:00
David Anderson
644c651c3e
Merge from mozilla-central.
2012-07-30 13:15:39 -07:00
Mark Finkle
70a01196ec
Backout 169ff207ed19, a34baed70c1b, f9ccdd490bd7, 39550ed860e6, 2194a2dd66b2, 908eb2e26843, a76e0a267f26 due to mobile viewport bustage (bug 778580)
2012-07-30 14:36:12 -04:00
Ed Morley
4c9a339aa1
Merge mozilla-central to mozilla-inbound
2012-08-08 19:13:29 +01:00
Aryeh Gregor
e806eeab4f
Bug 777292 part 2 - Change all nsnull to nullptr
2012-07-30 17:20:58 +03:00
Phil Ringnalda
cf09173698
Backout 5439489dc320, 983f76488e59, 7a92558a8dec (Bug 714358) for debug build assertions and leaks
2012-08-07 22:18:27 -07:00
Jonathan Watt
e5a6a757ae
Bug 776747 - Talos Regression :( SVG, Opacity Row Major increase 4.54%. r=roc.
2012-07-30 01:35:26 +01:00
David Anderson
88ed1ce560
Merge from mozilla-central.
2012-07-26 18:19:02 -07:00
Mark Capella
a4e84ebc03
Bug 730925 - XHR.getAllResponseHeaders should use CRLF, not LF per spec, r=jst, r=jonas, f=ms2ger
2012-07-26 11:55:23 -04:00
David Anderson
83c5be4f84
Merge from mozilla-central.
2012-07-25 14:30:08 -07:00
David Anderson
5fc5a16b63
Merge from mozilla-central.
2012-07-24 16:32:08 -07:00
Olli Pettay
8d25c299d6
Bug 776929 - Let event implementation codegen to generate MozContactChangeEvent, r=gwagner
2012-07-24 22:28:26 +03:00
Aryeh Gregor
3881decf87
Bug 563659 part 5 - Move things from FragmentOrElement to nsGenericElement; r=bz
2012-07-24 11:10:25 +03:00
Matt Brubeck
2e41f92cb5
Back out f4f5189b1d0c, 3b4f0606c547, b8a5a1ab8a5f, 5078933d6954, 7e0260c45de9 (bug 768440, bug 755084, bug 706179) because of reftest failures
2012-07-23 20:25:51 -07:00
Makoto Kato
b64403c744
Bug 776488 - content/base/src/nsFrameLoader.cpp(1987) : warning C4305: 'return' : truncation from 'nsresult' to 'bool'. r=jlebar
2012-07-24 11:56:50 +09:00
Oleg Romashin
bf0a78292f
Bug 779535 - defaultNoAlpha preference is not used in case if nsIPropertyBag argument is 0. r=vlad
2012-08-01 11:58:44 -07:00
Nicholas Cameron
9f4ddcf0fb
Bug 776802; Give better info about Azure. r=Bas
2012-07-31 18:30:10 +12:00
David Anderson
10352157a6
Merge from mozilla-central.
2012-07-23 12:37:49 -07:00
Ed Morley
1368da883d
Backout b4a63a0b90c2 (bug 778420), b849f1b3859a (bug 778420), d522b5a13b27 (bug 72964), 3a12c64bf53a (bug 778420), c07148142675 (bug 726053) for failures in test_bug435425.html on a CLOSED TREE
2012-08-07 00:57:27 +01:00
Kyle Huey
d3aa5ece64
Bug 689328: Ensure that lengthComputable is always the same for a given series of progress events by claiming that it is false even if all the data has been received. r=sicking
2012-08-06 13:56:28 -07:00
John Schoenick
73657f644a
Bug 745030 - Followup, consider capabilities when checking content policy. r=josh
2012-08-06 13:48:26 -07:00
John Schoenick
43c6e623e2
Bug 745030 - Refactor nsObjectLoadingContent fallback paths. r=josh,sr=jst
2012-08-06 13:48:26 -07:00
John Schoenick
b47165349e
Bug 745030 - Refactor nsObjectLoadingContent loading paths. r=josh,sr=jst
2012-08-06 13:48:25 -07:00
Bobby Holley
1138ef9062
Bug 778420 - Fix up tests that don't like the new enablePrivilege, r=jmaher.
...
--HG--
extra : rebase_source : 07565c66b279ba5a58b5902b697110f940c255fd
2012-08-06 22:38:19 +02:00
William Chen
aa4917eef9
Bug 778420 - Initial stab at the tests. v2 r=bholley
...
--HG--
extra : rebase_source : e014ba90baa75ba3146f4e3fb5c447b87a8e83c0
2012-08-06 22:15:49 +02:00
Gijs Kruitbosch
e382a1a5d5
Bug 778420 - Fix test_bug372964. v1 r=bholley
...
--HG--
extra : rebase_source : 1c2e55604e0cd8dc0476463ed58346a1e326d7e4
2012-08-06 22:15:28 +02:00
Camilo Viecco
b0baf98f91
Bug 726053 This patch removes all forms of 'obj instanceof Components.interfaces' for the new specialpowersAPI call. r=bholley
...
--HG--
extra : rebase_source : 8a246ed35698c4da3f8a4a5202dcce949121d722
2012-08-06 22:13:46 +02:00
Jim Mathies
378c4cc0b3
Bug 780511 - Pipe additional debug output to the Windows debugger, r=neil.
2012-08-06 15:41:40 -05:00
Patrick McManus
69378be6f2
bug 767005 backout bug 235853 r=jduell
...
--HG--
extra : rebase_source : c5aee6699ad20b85c11d52ca70365d6adebaec7c
2012-07-24 22:40:34 -04:00
David Anderson
7b87cb9a76
Merge from mozilla-central.
2012-07-20 12:02:04 -07:00
David Zbarsky
3c4a102656
Bug 768440 Part 2: Animate CSS Transitions on the compositor r=roc,dbaron
2012-07-23 17:34:49 -07:00
David Zbarsky
5deebe2e9b
Bug 755084 Part 2: Perform CSS animations of transform and opacity on the compositor r=roc, dbaron
2012-07-23 17:34:46 -07:00
Benjamin Peterson
5775e05fb8
Bug 776317 - Separate the body of a constructed function from its braces with newlines. r=luke
2012-07-23 17:03:41 -07:00
Jonas Sicking
c3bf967163
Bug 774585 - Make GetChannelPrincipal get the correct app principal. r=mounir
2012-07-20 00:07:49 -07:00
David Anderson
180cbd4d9d
Merge from mozilla-central.
2012-07-19 14:34:36 -07:00
Ed Morley
c7736aea1d
Merge last PGO-green changeset of mozilla-inbound to mozilla-central
2012-07-19 13:25:37 +01:00
Olli Pettay
9590583311
Bug 773945, remove nsXULElement::mPrototype, part 6, r=bz
2012-07-19 12:21:40 +03:00
Olli Pettay
d0359571b1
Bug 773945, remove nsXULElement::mPrototype, part 5, r=bz
2012-07-19 12:18:01 +03:00
Olli Pettay
e84fb0914b
Bug 773945, remove nsXULElement::mPrototype, part 4, r=bz
2012-07-19 12:14:27 +03:00
David Anderson
921bd834c9
Merge from mozilla-central.
...
--HG--
rename : js/xpconnect/wrappers/CrossOriginWrapper.cpp => js/xpconnect/wrappers/WaiveXrayWrapper.cpp
rename : js/xpconnect/wrappers/CrossOriginWrapper.h => js/xpconnect/wrappers/WaiveXrayWrapper.h
2012-07-18 19:02:32 -07:00
Chris Jones
149887977b
Bug 776649, part 2: Refactor content-process/browser creation to use mozIApplication for passing app info. r=jlebar
2012-08-08 19:58:06 -07:00
Chris Jones
7867ac451f
Back out bug 776649. r=bustage
2012-08-08 20:13:12 -07:00
Chris Jones
eec2b983ed
Bug 776649, part 2: Refactor content-process/browser creation to use mozIApplication for passing app info. r=jlebar
2012-08-08 19:58:06 -07:00
Bobby Holley
364da93593
Bug 778420 - Fix up tests that don't like the new enablePrivilege. r=jmaher
...
--HG--
extra : rebase_source : 1158df4a4eb917074204e649efd8f2b8e699f115
2012-08-03 22:19:54 +02:00
William Chen
7a0429e652
Bug 778420 - Initial stab at the tests. v2 r=bholley
...
--HG--
extra : rebase_source : c24abc031c82a87f2f669e4b708f8ee364a9682b
2012-08-06 22:15:49 +02:00
Gijs Kruitbosch
373fda679f
Bug 778420 - Fix test_bug372964. r=bholley
...
--HG--
extra : rebase_source : 7d87cacdf187e743f40b6d56741e7d71101b58ec
2012-08-03 22:19:54 +02:00
Nicholas Cameron
a5d03b307c
Bug 780392. Crashtest. r=bas
...
--HG--
extra : rebase_source : b2761827d90ceb99818b7beda5bcc596de90d7a3
2012-08-09 08:17:03 +12:00
Jared Wein
d20b6112aa
Bug 756419 - White standalone image background flashes into view when switching tabs. r=roc,bholley
2012-08-08 12:42:37 -07:00
Masayuki Nakano
7a210f7746
Bug 751749 part.2 Support Win key for a modifier of shortcut key and access key r=smaug, enn
2012-07-19 10:28:16 +09:00
Wes Johnston
0ab42df208
Bug 775162 - Turn on touch events tests for all platforms. r=smaug
2012-07-19 16:37:19 -07:00
Mounir Lamouri
ed3e904642
Bug 770831 - Make nsIDocShell carry the app id. r=jlebar sr=sicking
2012-07-19 10:32:49 -07:00
Mounir Lamouri
397bc64735
Bug 774957 - Update nsDocShell jazz so distinction between browser and app frame is clearer. r=jlebar sr=sicking
2012-07-18 22:26:21 -07:00
Steve Fink
3b5b986d0b
Backed out changeset 060a9d9fc1c6 from a CLOSED TREE since it seems to depend on afc1cf222996 or 1bafff5720a8 that I just backed out
2012-07-19 15:45:27 -07:00
Steve Fink
29dc82d8e8
Backed out changeset c2ffcbf39231 from a CLOSED TREE since it seems to depend on afc1cf222996 or 1bafff5720a8 that I just backed out
2012-07-19 15:45:19 -07:00
Ed Morley
ab4a6323cd
Merge last PGO-green changeset of mozilla-inbound to mozilla-central
2012-07-18 13:32:24 +01:00
Ms2ger
9855466146
Bug 579638 - Reinstate Range.intersectsNode; r=smaug
2012-07-18 12:36:08 +02:00
Ms2ger
7dc6caf2a7
Bug 763323 - Use .forget(I**) in a few places; r=longsonr
2012-07-18 12:36:08 +02:00
Ms2ger
1a4b2fb61b
Bug 756397 - Enable FAIL_ON_WARNINGS in content/media; r=cpearce
2012-07-18 12:36:08 +02:00
Ms2ger
53b7edc708
Bug 771933 - Make nsDOMEvent::SetEventType return void; r=smaug
2012-07-18 12:36:08 +02:00
Jonas Sicking
3563d90909
Back out 44f8cae1dcf0, part of bug 769594, due to orange
2012-07-18 16:18:42 -07:00
Andrew McCreight
aa60136d0a
Bug 770218 - null check mAList during unlink of DOMSVG{Length,Number,Transform}List. r=jwatt
2012-07-18 15:44:22 -07:00
David Zbarsky
b6548ad674
[Bug 774751] Use nsRefPtr in nsIDocument r=bz
2012-07-18 12:47:37 -04:00
David Zbarsky
88371b030a
[Bug 774505] Don't include Layers.h everywhere r=cjones
2012-07-18 12:31:40 -04:00
Matthew Gregan
9ae4b13c59
Bug 761274 - Work around buffer sizing bug in PulseAudio ALSA plugin. r=doublec
2012-07-16 17:15:24 -04:00
Matthew Gregan
0d47132a00
Bug 768333 - nsBufferedAudioStream::GetPositionInFrames miscompiled with Win32 PGO. r=cpearce
2012-07-16 17:21:04 -04:00
Luqman A.
f71f7ae597
Bug 775049 - DeCOMtaminate nsIRadioGroupContainer; f=Ms2ger r=mounir
2012-08-03 12:38:52 +02:00
Paul Adenot
54bd98e36a
Bug 774357 - Fix a crash in nsHTMLMediaElement::EndMediaStreamPlayback r=roc
2012-07-18 18:27:43 -04:00
Matthew Gregan
e274db737a
Bug 779187 - Fix nsBufferedAudioStream's sample format selection for big endian machines. r=doublec
2012-08-06 15:26:41 +12:00
David Zbarsky
72cd4190b0
[Bug 780439] Kill off the remains of nsIBox r=roc
2012-08-05 23:00:57 -04:00
David Zbarsky
d50e4a7565
[Bug 780428] Don't include nsIFrame.h in places where it's not necessary r=roc
2012-08-05 23:00:56 -04:00
David Zbarsky
0039e134c7
Bug 779684: Create a stack-based nsFrameIterator class out of nsIFrameTraversal and nsIFrameEnumerator r=roc
...
--HG--
rename : layout/base/nsFrameTraversal.cpp => layout/base/nsFrameIterator.cpp
rename : layout/base/nsFrameTraversal.h => layout/base/nsFrameIterator.h
2012-08-05 23:00:55 -04:00
Andrew McCreight
ea0bad742e
Bug 777806 - rename RootResultArrayBuffer to RootJSResultObjects. r=bz
2012-08-05 08:41:13 -07:00
Olli Pettay
1561080c51
Bug 773945, remove nsXULElement::mPrototype, part 3, r=bz
2012-07-14 18:28:54 +03:00
Olli Pettay
c50f03fc47
Bug 773945, remove nsXULElement::mPrototype, part 2, r=bz
2012-07-19 11:31:47 +03:00
Olli Pettay
bca8bf5697
Bug 773945, remove nsXULElement::mPrototype, part 1, r=bz
2012-07-14 14:28:35 +03:00
Oleg Romashin
999917220b
Bug 775257 - Gstreamer backend on Meego N9 produce extra noise in audio playback.r=giles
2012-07-18 22:46:11 -04:00
Benoit Jacob
f391d5b89f
Bug 617453 - lose the least-recently-used WebGL context when a certain limit is exceeded - r=vladv
...
The current limits are:
#ifdef MOZ_GFX_OPTIMIZE_MOBILE
// some mobile devices can't have more than 8 GL contexts overall
const size_t kMaxWebGLContextsPerPrincipal = 2;
const size_t kMaxWebGLContexts = 4;
#else
const size_t kMaxWebGLContextsPerPrincipal = 8;
const size_t kMaxWebGLContexts = 16;
#endif
2012-08-02 17:28:02 -04:00
Benoit Jacob
bb0ac80d76
Bug 749678 - re-add missing MakeCurrent call in certain WebGL uniform setters - r=jgilbert
2012-08-02 17:28:02 -04:00
David Anderson
c36e0f89e0
Merge from mozilla-central.
2012-07-13 19:50:02 -07:00
Olli Pettay
b064b2c26e
Bug 773606 - XBL fastload creates XUL element before feeding proto attributes to the protoelement, r=enndeakin
2012-07-14 00:25:01 +03:00
Boris Zbarsky
8b318ef3f7
Bug 761278. Remove the non-standard uploadprogress event on XMLHttpRequest. r=sicking
2012-07-21 22:28:26 -04:00
Jason Duell
00135ee99f
Backout f142f32a98a3 (Bug 775317) and ef14686c31d0 (Bug 761278). r=bustage
2012-07-21 20:05:37 -07:00
Boris Zbarsky
eb0d24fee5
Bug 761278. Remove the non-standard uploadprogress event on XMLHttpRequest. r=sicking
2012-07-21 22:28:26 -04:00
Jonathan Watt
bba15f0a70
Bug 776250 - Rename nsISVGChildFrame::UpdateBounds to nsISVGChildFrame::ReflowSVG to make it easier for non-SVG devs to understand the SVG code. r=roc.
...
--HG--
extra : rebase_source : 9c2d8f3d76dab1a842d6cc5607a13a49703061d6
2012-07-21 20:01:44 -04:00
Mounir Lamouri
f47d0639b2
Bug 770532 - Make new nsIPrincipal and nsIDocShell attributes work in content process. r=jlebar
2012-07-21 17:16:11 -07:00
Mounir Lamouri
7935452e46
Bug 775408 - Rename nsIDocShell::SetIsBrowser() to SetIsBrowserElement(). r=jlebar
2012-07-21 17:39:41 -07:00
Jonas Sicking
7b45d4a7a3
Bug 769594: Make nsObjectLoadingContent use principals when calling into permission manager. r=josh
2012-07-21 00:29:40 -07:00
Jonas Sicking
68ce0e34aa
Bug 774585: Rename getCodebasePrincipal to getSimpleCodebasePrincipal since the behavior has semantically changed. r=mounir
2012-07-21 00:29:40 -07:00
Ryan VanderMeulen
a2282bd7e8
Merge m-c to inbound.
2012-07-20 20:19:31 -04:00
Olli Pettay
cf203e6e6c
Bug 775972 - crash in nsGenericElement::BindToTree, r=bz
2012-07-21 00:55:19 +03:00
Olli Pettay
d4c22e1e8d
Bug 765766 - Convert more event interface implementations to be autogenerated, r=jst
2012-07-20 19:58:28 +03:00
Olli Pettay
e9cea4305c
Bug 765163 - Implement code generator for simple DOM events, r=jst,khuey
2012-07-20 19:42:08 +03:00
Robert O'Callahan
0be0d048a2
Bug 774597. Avoid accessing MediaStreamGraphImpl members after the graph object may have been cleaned up by the main thread. r=jesup
...
--HG--
extra : rebase_source : 5f6c34855ad5df629c25d4b11f008b03cf2266ae
2012-07-18 01:02:06 -04:00
David Anderson
b93d6b9c04
Merge from mozilla-central.
2012-07-12 13:23:26 -07:00
Anant Narayanan
e91b26162f
Bug 691234: Part 2/3: Implement WebRTC backend for MediaEngine on Desktop; r=jesup, r=roc
2012-07-12 04:53:08 -07:00
Ehsan Akhgari
2aa2577db9
Bug 758992 - Make the classes which use the XPCOM nsISupports implementation macros final, to avoid the warning about deleting using a pointer to a base class with virtual functions and no virtual dtor (more content parts); r=bzbarsky
2012-07-11 00:06:42 -04:00
David Anderson
56d1e29054
Merge from mozilla-central.
...
--HG--
rename : editor/libeditor/base/DeleteElementTxn.cpp => editor/libeditor/base/DeleteNodeTxn.cpp
rename : gfx/layers/basic/BasicLayers.cpp => gfx/layers/basic/BasicBuffers.cpp
rename : gfx/layers/basic/BasicLayers.cpp => gfx/layers/basic/BasicBuffers.h
rename : gfx/layers/basic/BasicLayers.cpp => gfx/layers/basic/BasicCanvasLayer.cpp
rename : gfx/layers/basic/BasicLayers.cpp => gfx/layers/basic/BasicColorLayer.cpp
rename : gfx/layers/basic/BasicLayers.cpp => gfx/layers/basic/BasicContainerLayer.cpp
rename : gfx/layers/basic/BasicLayers.cpp => gfx/layers/basic/BasicContainerLayer.h
rename : gfx/layers/basic/BasicLayers.cpp => gfx/layers/basic/BasicImageLayer.cpp
rename : gfx/layers/basic/BasicLayers.cpp => gfx/layers/basic/BasicLayerManager.cpp
rename : gfx/layers/basic/BasicLayers.cpp => gfx/layers/basic/BasicLayersImpl.cpp
rename : gfx/layers/basic/BasicLayers.cpp => gfx/layers/basic/BasicLayersImpl.h
rename : gfx/layers/basic/BasicLayers.cpp => gfx/layers/basic/BasicThebesLayer.cpp
rename : gfx/layers/basic/BasicLayers.cpp => gfx/layers/basic/BasicThebesLayer.h
rename : js/src/jsobj.cpp => js/src/builtin/Eval.cpp
2012-07-10 19:45:14 -07:00