Robert O'Callahan
0a9430327c
Bug 777194. Part 7: Add gfx3DMatrix::NudgeToIntegers. r=bas
2012-08-25 16:41:46 +12:00
Robert O'Callahan
60f5afa85b
Bug 777194. Part 1: Use an epsilon tolerance value when comparing residual translations. r=tnikkel
2012-08-17 11:38:59 +12:00
Robert O'Callahan
bced6f53eb
Bug 777194. Part 0: Add gfxPoint::WithinEpsilonOf. r=jrmuizel
2012-08-17 11:38:59 +12:00
Ehsan Akhgari
4ff7580683
Bug 785321 follow-up: Remove a hunk from the patch which is no longer needed
...
DONTBUILD
2012-09-17 22:00:07 -04:00
Chris Jones
b46f585a35
Bug 791364: Free canvas front buffers that are surface descriptors. r=gal
2012-09-17 17:56:04 -07:00
Ryan VanderMeulen
66baa7fbda
Backout c2b7be27e412 (bug 791644) due to mochitest orange.
2012-09-17 20:09:42 -04:00
Chris Peterson
5544d9e588
Bug 778980 - Part 1: Fix gcc -Wconversion-null warnings in gfx/gl. r=joedrew
2012-09-14 11:52:42 -07:00
Daniel Holbert
d45280b718
Bug 791801: Reorder AlphaBoxBlur init list to fix build warning. r=ajones
2012-09-17 15:41:24 -07:00
Matt Woodrow
3c16b96179
Bug 791644 - Refactor nsDisplayTransform::GetResultingTransformMatrix into two functions with less optional parameters. r=roc
2012-09-18 10:34:21 +12:00
Koosha Khajeh Moogahi
dcf81f4fb0
Bug 788242: Implement and make use of void versions of NS_ENSURE_* macros; r=ehsan,bsmedberg
2012-09-14 14:30:31 +04:30
Nicolas Silva
63e0f1374e
Bug 790716 - Allocate shared YCbCr images in one shmem. r=jrmuizel.
2012-09-13 16:52:26 -04:00
James Willcox
09a83acdf2
Bug 778091 - Use medium precision for SurfaceTexture shader r=vlad
2012-09-17 15:50:33 -04:00
Jeff Muizelaar
9d45f08968
Bug 782647. Move the nullptr workaround macros to MFBT so that it can be shared. r=waldo
...
This also changes the header to use compiler detection instead of a
configure test. This makes the header more portable because
it doesn't require the configure infrastructure.
2012-09-01 16:16:17 -04:00
Benoit Girard
6fb16e9cb4
Bug 789597 - Should support correlation of profile with capture frames. r=joe
...
--HG--
extra : rebase_source : 66361f31c12774ab7d2bbb9e66a4e673f2a272ba
2012-09-17 13:58:04 -04:00
Ed Morley
9045d73d8a
Backout 7f86b28171a2 (bug 787853) & e18fdb9a8e12, ba47dac3cf97, e3fdcf7ed7f2, 992ee4c72c87 (bug 777946) for intermittent linux M4 ABORTs
2012-09-17 14:17:02 +01:00
Ms2ger
e600b43e79
Merge m-c to m-i.
2012-09-17 12:08:58 +02:00
Ms2ger
711f1fd480
Bug 787933 - Stop using stdin types in IPC code; r=bsmedberg+cjones sr=cjones
2012-09-17 10:37:20 +02:00
Matt Woodrow
ad9a9edc59
Bug 788044 - Make inactive layer subtrees relative to the ContainerLayer, not the reference frame. r=roc
2012-09-17 10:25:33 +12:00
Doug Sherk
0de4e182ef
Bug 787549 - B2G: Stop simulating mouse events unless there's a tap. r=cjones
2012-09-14 21:16:32 -04:00
Jeff Gilbert
35b8f538b0
Bug 771406 - Add previous patch to ANGLE patch list - r=bjacob
2012-09-14 16:02:40 -07:00
Jeff Gilbert
c94de51f41
Bug 771406 - Add emulation for GLSL faceForward() to ANGLE - r=bjacob
2012-09-14 16:02:39 -07:00
Doug Sherk
2a5d788e4c
Bug 780395: Part 1, B2G: Listen to scrollTo calls and metrics being clobbered r=cjones
2012-09-14 17:57:35 -04:00
Makoto Kato
6025716d17
Bug 785321 - Replace PRUptrdiff with uintptr_t, prtdiff_t or etc; r=ehsan,jrmuizel
2012-09-14 16:09:52 -04:00
Marco Castelluccio
d504c532ae
b=787853 Upload surface when it doesn't support texture_from_pixmap r=karlt
...
--HG--
extra : transplant_source : %85b%86%E4%DBK%D7%A2%14%BEK%A3%40l%5D%B5%29L%EF%F0
2012-09-05 01:10:22 +02:00
Karl Tomlinson
d89f452e7b
b=777946 implement SCALE_STRETCH through ComputeEffectiveTransforms r=Bas
...
--HG--
extra : transplant_source : %9AZ%89%90_4%08R%C5%0E%AB1%40g%23.%7Bo%EE%2A
2012-09-17 17:19:59 +12:00
Anthony Jones
a84827280d
Bug 789367 - Add content preference for GTK platform; r=nrc
2012-09-16 20:23:00 -07:00
Phil Ringnalda
e68bd50029
Back out 9805ecdb8f66 (bug 789367) on suspicion of breaking the build
2012-09-16 17:59:25 -07:00
Anthony Jones
1e224ae09c
Bug 789367 - Add content preference for GTK platform. r=nrc
2012-09-16 20:20:16 -04:00
Jeff Muizelaar
0c3cfe2ae7
Bug 788794. Use BitBlt to do SOURCE and OVER from RGB24 to ARGB32. r=nical
...
This seems to give a speed up of about 23x for this operation.
--HG--
extra : transplant_source : %AA%E9T%24%E5%97KR%A2%FC%E2%DB%A3ga%5C%82K%7DW
2012-09-12 22:57:25 -04:00
Chris Jones
39e006604f
Bug 780330: Avoid mapping/unmapping buffers when we don't use them. r=mattwoodrow sr=roc
2012-09-12 03:41:34 -07:00
Nicolas Silva
f0885a863f
Bug 774622 - Fixes fennec exit crash by reference counting the compositor thread and making sure the CompositorParents are not destroyed while running code on the compositor thread. r=cjones
2012-09-11 14:17:05 -04:00
Ehsan Akhgari
589178c8cd
Merge IonMonkey into mozilla-inbound
2012-09-11 16:38:44 -04:00
David Anderson
76ab271ead
Merge IonMonkey to mozilla-central. a=arewefastyet
...
--HG--
rename : content/base/src/nsWebSocket.cpp => content/base/src/WebSocket.cpp
rename : content/base/src/nsWebSocket.h => content/base/src/WebSocket.h
2012-09-11 10:25:14 -07:00
Andrew Quartey
c98758a870
Bug 607075 - Fix logic in gfxWindowsPlatform::UpdateRenderMode r=bjacob
2012-09-10 23:35:25 -04:00
David Anderson
09854d2b71
Merge from mozilla-central.
2012-09-10 12:16:38 -07:00
Bas Schouten
6882d89bf4
Bug 790222: Fix azure stand-alone build. r=BenWa
2012-09-11 13:51:39 +00:00
Rafael Ávila de Espíndola
ef282a6ec3
Bug 789983 - remove unused field. r=bjacob.
2012-09-11 08:59:34 -04:00
David Anderson
130b34a147
Merge from mozilla-central.
2012-09-07 15:17:11 -07:00
Jacek Caban
3e05eaddc6
Bug 787653 - Updated ANGLE to r1267 r=upstream
2012-09-07 11:12:54 +02:00
L. David Baron
6521fcaca1
Rename nsIPresShell::InitialReflow to Initialize since it doesn't actually perform reflow. (Bug 788956) r=roc
2012-09-06 21:16:09 -07:00
David Anderson
f4bf6ff039
Merge from mozilla-central.
2012-09-06 18:28:59 -07:00
Chris Jones
0d82e82abc
Bug 789368: Mind our fenceposts when estimating fps. r=jrmuizel
2012-09-06 20:12:03 -07:00
David Anderson
f6eca6c7f0
Merge from mozilla-central.
...
--HG--
rename : js/jsd/jsd_scpt.c => js/jsd/jsd_scpt.cpp
rename : js/jsd/jsd_stak.c => js/jsd/jsd_stak.cpp
rename : js/jsd/jsd_val.c => js/jsd/jsd_val.cpp
2012-09-05 16:18:11 -07:00
Phil Ringnalda
2c0b236f34
Switch reftest conditions for OSX to use the OSX variable from bug 789771 instead of a regex
...
--HG--
extra : rebase_source : f4123ff10d1df1ec4f6f2ad75b764416056cf271
2012-09-08 23:40:29 -07:00
David Anderson
25cb077cb2
Merge from mozilla-central.
...
--HG--
rename : js/src/sharkctl.cpp => js/src/devtools/sharkctl.cpp
rename : js/src/sharkctl.h => js/src/devtools/sharkctl.h
rename : js/src/MemoryMetrics.cpp => js/src/jsmemorymetrics.cpp
2012-08-29 17:57:37 -07:00
David Anderson
a77264d9fb
Merge from mozilla-central.
...
--HG--
rename : content/base/public/nsIFrameMessageManager.idl => content/base/public/nsIMessageManager.idl
2012-08-29 17:51:24 -07:00
Andrew Quartey
951e732fc2
Bug 761155 - Extend Mesa LLVMpipe Preference to GLX r=bjacob
2012-09-06 20:16:30 -04:00
Andrew Quartey
0711be59da
Bug 788398 - Remove unused variable 'rule' in CairoPathContext::DuplicateContextAndPath r=bjacob
2012-09-06 20:16:30 -04:00
Luqman Aden
ab8b047314
Bug 714937 - Replace GFX_PACKED_PIXEL with an inline function. r=jrmuizel
2012-09-06 01:31:29 -04:00
Ehsan Akhgari
e15d129ab3
Backout changeset 25fd2119c8e1 (bug 714937) for possible orange
2012-09-06 18:51:02 -04:00
Luqman Aden
0f1d23f090
Bug 714937 - Replace GFX_PACKED_PIXEL with an inline function. r=jrmuizel
2012-09-06 01:31:29 -04:00
David Anderson
3b9fed8952
Merge from mozilla-central.
2012-08-22 16:09:24 -07:00
David Anderson
c50adec55d
Merge parity.
2012-08-22 11:10:55 -07:00
David Anderson
a264d0ebc8
Merge from mozilla-central.
2012-08-21 15:59:12 -07:00
Landry Breuil
3a38e327ff
Bug 786995: Ensure the whole toolchain supports -mssse3, not only the compiler. r=ted
2012-09-04 22:19:50 +02:00
David Zbarsky
8ec03cd866
Bug 783893 - Clean up async animation code r=roc
2012-08-21 00:06:47 -04:00
David Zbarsky
3154e1b535
Bug 784004 - Don't include Layers.h everywhere Part 3 r=nical
2012-08-21 00:06:46 -04:00
David Zbarsky
8b80664250
Fix layer tree dumping code, no bug, r=cjones over irc
2012-08-21 00:06:46 -04:00
David Anderson
f427cc76fa
Merge from mozilla-central.
2012-08-16 14:04:20 -07:00
David Anderson
58e1815704
Merge from mozilla-central.
2012-08-15 14:22:26 -07:00
Jeff Gilbert
88506f3b6e
Bug 783663 - Add ReadScreenIntoImageSurface for reading pixels from the screen - r=bgirard
2012-08-20 17:13:32 -07:00
Gregory Szorc
91c0c766a9
Bug 776077 - Silence hundreds of conversion errors in cairo; r=jmuizelaar
...
Cairo is a 3rd party project and we decided in bug that silencing the
warnings was easier than patching.
--HG--
extra : rebase_source : aa7a22b208e62d0d84d1b4a6e5c58d366d957bb9
2012-08-20 14:04:42 -07:00
David Anderson
d522cd5bdc
Merge from mozilla-central.
2012-08-14 12:20:09 -07:00
David Anderson
5c045998a5
Merge from mozilla-central.
2012-08-13 13:40:42 -07:00
Matt Woodrow
6ac4dc5746
Bug 539356 - Part 30 - Make ShadowContainerLayerD3D10 hold references to child layers. r=roc
2012-08-13 22:10:45 +12:00
Matt Woodrow
2ebb996f8c
Bug 539356 - Part 8b - Move painting of retained layers to the view manager flush, and only composite on the paint event. r=roc
...
* * *
Fix Empty transactions with the new paint timing
2012-08-13 22:10:10 +12:00
Matt Woodrow
8e8f866f65
Bug 539356 - Part 8a - Add END_NO_COMPOSITE to EndTransactionFlags and implement in for all LayerManagers. r=roc
2012-08-13 22:10:10 +12:00
Aryeh Gregor
a88ffe5c80
Bug 626472 part 3 - Remove nsnull for good; r=ehsan
2012-08-12 13:43:47 +03:00
Doug Sherk
22ae74ed70
Bug 781734: Implement pinch threshold; fingers need to move a bit before page zooms r=gal
2012-08-13 21:08:38 -07:00
Doug Sherk
a92d1b87eb
Bug 781734: Decrease axis lock angle r=gal
2012-08-13 21:08:38 -07:00
Doug Sherk
723485177c
Bug 781734: When flinging many times successively in one direction, accelerate them more and more r=gal
2012-08-13 21:08:38 -07:00
Doug Sherk
f0b76dbaae
Bug 781734: Greatly increase friction on flings, remove pseudo-kinetic vs. static friction distinction r=gal
2012-08-13 21:08:38 -07:00
Doug Sherk
c54409d628
Bug 781734: Detect very light touches and pan the page r=gal
2012-08-13 21:08:38 -07:00
Chris Lord
8bf5620a83
Bug 782332 - Don't retain fixed-position tiles. r=bgirard
...
Retaining tiles on a fixed position layer often just results in rendering
artifacts. Don't do this.
2012-08-13 22:59:16 -04:00
Alexander Boldyrev
51cb65d942
Bug 738866 - Implement WEBGL_depth_texture extension - r=jgilbert
2012-08-13 18:17:55 -07:00
Nicholas Cameron
f31d62bd16
Bug 781943. nullptr macro. r=joe
2012-08-14 09:06:59 +12:00
David Anderson
ecf43e9ddf
Merge from mozilla-central.
2012-08-10 14:50:20 -07:00
David Anderson
a02edfdd65
Merge from mozilla-central.
2012-08-09 13:41:13 -07:00
Ed Morley
b5f4776008
Merge last PGO-green changeset of mozilla-inbound to mozilla-central
2012-08-09 12:46:05 +01:00
Ms2ger
374d1023c2
Bug 780387 - Part f: Stop using PRBool & PRPackedBool; r=bsmedberg
2012-08-09 09:10:13 +02:00
Ms2ger
75ab7efb95
Bug 780387 - Part b: Stop using PRIntn; r=bsmedberg
2012-08-09 09:09:40 +02:00
David Anderson
8d084d5b2e
Merge from mozilla-central.
2012-08-08 15:09:49 -07:00
Ehsan Akhgari
845651448b
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
f22f8b7a49
Bug 579517 - Part 4: Manually rewrite some parts of the code base not covered by the automated conversion; r=bsmedberg
2012-08-22 11:59:54 -04:00
Ehsan Akhgari
e368dc9c85
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
Jeff Gilbert
f928964d5a
Bug 766366 - Add GLContext::BlitTextureToTexture - r=bjacob
2012-08-21 20:30:20 -07:00
Jeff Gilbert
6030890a7f
Bug 738833 - Add webgl force-readback pref - r=bjacob
2012-08-21 20:29:06 -07:00
Jeff Gilbert
ae272e1e5c
Bug 782785 - Use temp surfaces to ReadPixels with correct stride - r=bjacob
2012-08-21 16:13:26 -07:00
Kan-Ru Chen (陳侃如)
967b36e8ae
Bug 767480 - Gralloc backed video buffer. r=roc
2012-08-21 18:22:58 +08:00
Kan-Ru Chen (陳侃如)
a55761dc81
Bug 767480 - PlanarYCbCrImage Refactoring. r=roc
2012-08-21 18:18:20 +08:00
Kan-Ru Chen (陳侃如)
1460a419c4
Back out c8f7bace9cf9, 17ec4e01c126 (bug 767480) r=bustage
2012-08-21 17:55:02 +08:00
Kan-Ru Chen (陳侃如)
4a4557a29e
Bug 767480 - Gralloc backed video buffer. r=roc
2012-08-21 14:59:42 +08:00
Kan-Ru Chen (陳侃如)
b992322a3a
Bug 767480 - PlanarYCbCrImage refactoring. r=roc
2012-08-21 17:31:36 +08:00
David Anderson
7ab97db10e
Merge from mozilla-central.
2012-08-07 15:13:28 -07:00
Landry Breuil
d85bac97b5
Bug 780409: Followup, remove extra comma at end of enum. r=jfkthame
2012-08-07 11:31:46 +01:00
David Anderson
f2b01e4cbb
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
Jonathan Kew
35700912b8
bug 780409 - updates to thebes harfbuzz integration for hb api changes. r=jdaggett
2012-08-06 11:42:20 +01:00
Jonathan Kew
9c344c83c6
bug 780409 - update harfbuzz to commit 8ba8042... to pick up improvements from toronto hackfest. r=jdaggett
2012-08-06 10:52:25 +01:00
David Anderson
f0e6ae1aeb
Merge from mozilla-central.
2012-08-03 18:58:30 -07:00
Matt Woodrow
c8b229743e
Bug 782808 - Apply the widget rotation to the gonk LayerManager at all times instead of only during the paint event. r=cjones
2012-08-15 13:10:40 +12:00
Ehsan Akhgari
a09e69cee0
Merge removal of nsnull
2012-08-14 11:29:00 -04:00
Aryeh Gregor
291bfa222b
Bug 783523 - Fix platform-specific nsresult misuse; r=ehsan,tbsaunde,smaug
2012-08-16 14:58:11 +03:00
Edwin Flores
a0a458956f
Bug 719286 - Fix SVG glyphs to work with Azure r=roc
2012-09-06 16:58:47 +12:00
Edwin Flores
f8d6f28538
Bug 719286 - Implement GetFontTable for downloaded fonts in linux r=karl
2012-09-06 16:58:47 +12:00
Edwin Flores
6cea6e0646
Bug 719286 - Support new OpenType-in-SVG table format r=roc
2012-09-06 16:58:47 +12:00
Edwin Flores
a8ea4d5da0
Bug 719286 - Use -moz-objectValue keywords in SVG glyphs r=roc
2012-09-06 16:58:47 +12:00
Edwin Flores
1b4129c7f5
Bug 719286 - Add support for -moz-objectFillOpacity and -moz-objectStrokeOpacity to SVG *-opacity fields in SVG glyphs r=roc
2012-09-06 16:58:47 +12:00
Edwin Flores
00ae723fe4
Bug 719286 - Include SVG glyphs when calculating glyph extents r=jfkthame
2012-09-06 16:58:46 +12:00
Edwin Flores
008158c07b
Bug 719286 - Fixed some SVG glyphs not rendering properly r=jwatt
2012-09-06 16:58:46 +12:00
Edwin Flores
4db701b991
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
3b0fe9adec
Bug 719286 - Add new gfxTextObjectPaint paint wrapper for use with SVG glyphs r=roc
2012-09-06 16:58:46 +12:00
Edwin Flores
ca569f62dc
Bug 719286 - Basic OpenType SVG functionality r=roc
2012-09-06 16:57:54 +12:00
Edwin Flores
5e83da96d5
Bug 719286 - Add OTS support for OpenType SVG table r=jfkthame
2012-09-06 16:57:02 +12:00
Edwin Flores
9b5bc40bde
Bug 719286 - Extend gfxFontUtils::MapCharToGlyph to accept variation selectors r=roc
2012-09-06 16:57:01 +12:00
Nicholas Cameron
4e0c1c1461
Bug 722217; keep only a single snapshot. r=jrmuizel
2012-09-06 16:07:53 +12:00
David Anderson
b1e8dd2805
Merge from mozilla-central.
2012-08-02 13:47:20 -07:00
Robert O'Callahan
676bce6e67
Bug 778045. Add helpful comment to ImageContainer explaining its modes. r=bas
2012-08-03 15:23:27 +12:00
Cameron McCormack
a273d9a029
Bug 655877 - Part 25: Give gfxTextRuns the ability to invoke a callback after painting glyphs and partial ligatures. r=roc
2012-08-08 21:37:12 +10:00
Nicholas Cameron
7ba2f80762
Bug 779650; handle Cairo DrawTargets in CanvasLayerD3D10; r=bas
2012-08-02 16:01:05 +12:00
David Anderson
bd3a52c3e2
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
Jonathan Watt
45c94a3377
Bug 777430 - In BasicLayerManager::PushGroupForLayer, call the less expensive gfxContext::PushGroup instead of gfxContext::PushGroupAndCopyBackground when possible. r=roc.
2012-08-01 11:03:42 +01:00
Jeff Muizelaar
dd0d7af561
Bug 779636. Add SAMPLE_LABELS to gralloc implementation. r=cjones
...
--HG--
extra : rebase_source : ea66610435b3974607bcb8705912004ad3090b4c
2012-08-01 15:49:59 -07:00
David Anderson
56597a8412
Merge from mozilla-central.
2012-07-31 17:19:41 -07:00
Nicholas Cameron
5dd825ba63
Back out bug 779001, bug 746883, bug 778595, bug 776803, bug 7118849
2012-07-31 18:17:23 +12:00
Nicholas Cameron
77df30f28c
Bug 779001. Falling back to Cairo for large canvases. r=roc
2012-07-31 13:46:05 +12:00
Nicholas Cameron
883ca8cb74
Bug 776802; Give better info about Azure. r=Bas
2012-07-31 13:45:59 +12:00
Nicholas Cameron
f296218e72
Bug 718849; patch to keep Skia up to date. r=gw280
2012-07-31 12:58:14 +12:00
David Anderson
e7f516869b
Merge from mozilla-central.
2012-07-30 13:15:39 -07:00
Mark Finkle
ecceaf8977
Backout 169ff207ed19, a34baed70c1b, f9ccdd490bd7, 39550ed860e6, 2194a2dd66b2, 908eb2e26843, a76e0a267f26 due to mobile viewport bustage (bug 778580)
2012-07-30 14:36:12 -04:00
Chris Jones
f55e36f91d
Bug 781024: Use the current decoded image as the reference for allocation. r=roc
2012-08-08 10:51:40 -07:00
Aryeh Gregor
d0ad5a7d0c
Bug 777292 part 2 - Change all nsnull to nullptr
2012-07-30 17:20:58 +03:00
David Zbarsky
f8268417e9
Bug 778496 - Layer should store ComputedTimingFunction directly rather than as a pointer r=roc
2012-07-29 18:59:26 -07:00
Nicholas Cameron
e9faa0eec1
Backout bug 718849
2012-07-30 11:40:42 +12:00
Nicholas Cameron
52c22cb8c0
Bug 718849; patch to keep Skia up to date. r=gw280
2012-07-30 10:35:54 +12:00
David Anderson
b8519fb4f1
Merge from mozilla-central.
2012-07-26 18:19:02 -07:00
David Anderson
8e99468375
Merge from mozilla-central.
2012-07-25 14:30:08 -07:00
David Anderson
8027cb08c0
Merge from mozilla-central.
2012-07-24 16:32:08 -07:00
Matt Brubeck
90029e0bf6
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
David Anderson
04a683031c
Merge from mozilla-central.
2012-07-23 12:37:49 -07:00
Matt Brubeck
b9fbf3dea9
Back out 9fb78d71f361, 28f8ce199bed, 78ffaa79a3de, 9f6f9b74d685 (bug 779940 and bug 778036) because of Android failures
2012-08-06 21:59:01 -07:00
Matt Woodrow
4df6703052
Bug 779940 - Add a ShadowLayer transaction fps counter. r=cjones
2012-08-07 15:00:42 +12:00
Matt Woodrow
4b08c58146
Bug 778036 - Only mark Layers as Mutated if the property values are different. r=roc
2012-08-07 15:00:41 +12:00
Matt Woodrow
792c71324e
Bug 778036 - Retain RefLayers instead of creating them every frame. r=roc
2012-08-07 15:00:41 +12:00
Karl Tomlinson
ddce1daf02
b=779786 check fbconfig alpha instead of buffer size against render format r=mattwoodrow
...
--HG--
extra : transplant_source : %B6%E0%DDdG%F0%93%88%02%DDKf%D7%F8%9E%98%2A%19%92%BB
2012-08-07 13:22:23 +12:00
Ed Morley
5162e724a0
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
Bobby Holley
2adf92413a
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
Daniel Holbert
1574c75a77
Bug 780680: Remove never-read variable 'prevGlyphCharIndex' from gfxHarfBuzzShaper::SetGlyphsFromRun(). r=jfkthame
2012-08-06 13:34:38 -07:00
Sergey Glushchenko
a2ebf3852f
Bug 776429: Unify scattered M_PI definitions into mfbt/Constants.h r=dRdR
2012-08-06 13:32:11 -07:00
Robert O'Callahan
13a40a7a24
Backout c1878d925ef5 (bug 776940) due to leaks on Mac
2012-07-25 17:39:47 +12:00
Chris Jones
42c7cd078e
Bug 776940: Fix shutdown protocol of shadow OGL layers. r=roc
2012-07-24 19:46:32 -07:00
Nicholas Cameron
00e35a27df
Bug 775215; remove D3D10_RESOURCE_MISC_GDI_COMPATIBLE. r=Bas
...
--HG--
extra : rebase_source : bb05c51a4e7f57dc2db0c17cb321160dc619ecb6
2012-07-25 12:28:20 +12:00
Jim Mathies
b37801facf
Bug 776876- backout patch to try and fix red. r=backout
2012-07-24 15:29:30 -05:00
Jim Mathies
855e96526b
Bug 776876 - vc11 nullptr fix for GLContextProviderEGL. r=joe
2012-07-24 15:07:18 -05:00
David Zbarsky
be1773d24a
Remove trailing semicolons in GeckoContentController, no bug, r=dRdR
2012-07-24 12:12:11 -07:00
Chris Jones
94c70c8ab5
Bug 776217: Support gecko-implemented screen rotation with omtc. r=roc
2012-07-24 12:01:09 -07:00
Doug Sherk
64c27116c3
Bug 776226: Implement axis locking when panning along one axis r=roc
2012-07-22 23:49:07 -04:00
Matt Woodrow
1686bde08a
Bug 539356 - Part 21 - BasicLayers should always retain content. r=roc
2012-07-23 15:00:37 +12:00
Matt Woodrow
bf589f8d22
Bug 539356 - Part 23 - Fix MovePixels crash when our surface is in an error state. r=jrmuizel
2012-07-23 15:00:37 +12:00
Matt Woodrow
1a5c93fd0e
Bug 741682 - Flatten component alpha layers into their parent layer with BasicLayers. r=roc
2012-07-23 15:00:36 +12:00
Matt Woodrow
9cd0f7f2c4
Bug 741682 - Use nsRegion::ScaleToInsidePixels when computing opaque regions of layers. r=roc
2012-07-23 15:00:36 +12:00
Matt Woodrow
12dbf688b4
Bug 741682 - Add ScaleToInsidePixels and ScaleToNearestPixels to nsRegion. r=roc
2012-07-23 15:00:36 +12:00
Doug Sherk
196cffe61b
Bug 776413: Temporary workaround, fix initial displayport on page load. r=gal
...
This needs to be fixed properly by setting the displayport to a larger area than
just the viewport but before the page has already been loaded. This patch will
mask it to look decent once the page has finished loading and before panning.
2012-07-22 21:51:38 -04:00
Doug Sherk
5f2e57a806
Bug 776226: Improve displayport sizing, account for velocity, and properly clip edges r=cjones
2012-07-22 21:51:23 -04:00
Doug Sherk
3ef8a4e51d
Bug 776310: Tune flinging friction and logic in AsyncPanZoomController r=cjones
2012-07-22 21:50:41 -04:00
Doug Sherk
d9bf60609b
Bug 776149: Fix Gecko panning code to account for time deltas for displacements r=cjones
2012-07-22 21:43:37 -04:00
David Anderson
07f7d8e680
Merge from mozilla-central.
2012-07-20 12:02:04 -07:00
Doug Sherk
a0dd3b1be3
Bug 776203: Add virtual dtor to GeckoContentController r=gal
2012-07-22 13:37:13 -07:00
David Zbarsky
33710a6b6d
Bug 706179: Add support for animations to the Layers API r=roc, dbaron, cjones
2012-07-23 17:34:22 -07:00
Chris Jones
77fdc3e6fe
Bug 771350, part 2: Use OpenDescriptorForTexturing() in ShadowThebesLayerOGL, where possible. r=BenWa
2012-07-23 16:58:37 -07:00
Chris Jones
83c1ddf4b4
Bug 771350, part 1: Add GLContext::CreateDirectTextureImage and OpenDescriptorForTexturing to more easily support direct texturing without updates. r=vlad
2012-07-23 16:58:37 -07:00
Chris Jones
82f0a71400
Bug 771350, part 0: Remove some dead code to make later patches clearer. r=BenWa
2012-07-23 16:58:35 -07:00
Chris Jones
fc6d547510
Bug 750977: Implement glue code for asynchronous panning/zooming. r=jlebar,roc,vingtetun
...
This is a rollup of three separate patches
- Add nsIDocShell.asyncPanZoomEnabled. r=jlebar
- Have BrowserElementChild service repaint requests and handle fallback synchronous scrolling (for now). r=jlebar,vingtetun
- Glue async pan/zoom logic up between compositing, event dispatch, and repaint requests. r=roc
--HG--
rename : b2g/chrome/content/webapi.js => dom/browser-element/BrowserElementScrolling.js
2012-07-19 23:48:27 -07:00
Doug Sherk
911626890a
Bug 750974: Move basic pan/zoom logic into Gecko C++ r=cjones,roc sr=smaug[widget/]
2012-07-19 23:48:25 -07:00
Jonathan Watt
613454044e
Bug 775697 - Cancel layer transactions that haven't ended after nsDisplaySVGEffects::PaintAsLayer returns. r=roc.
2012-07-20 00:53:55 -04:00
Chris Jones
f28956b0e5
Followup to bug 775436: Fix thinko. r=gal
2012-07-19 21:34:21 -07:00
David Anderson
5297cee003
Merge from mozilla-central.
2012-07-19 14:34:36 -07:00
David Anderson
eec7db39f5
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
Doug Sherk
ff885fa426
Bug 775463: Implement tolerance in double tap detection r=cjones
2012-08-08 21:39:11 -07:00
Doug Sherk
c728bb798f
Bug 775463: Implement double-tap-to-zoom content r=cjones
2012-08-08 21:39:02 -07:00
Doug Sherk
8358a34d39
Bug 775451: Reduce diagonal checkerboarding r=cjones
2012-08-08 13:38:23 -07:00
Doug Sherk
417b3855ee
Bug 779572: Properly protect state in AsyncPanZoomController with a monitor r=cjones
2012-08-08 13:38:20 -07:00
Doug Sherk
298a698b2f
Bug 779572: Factor zoom into min pan distance before moving the viewport r=cjones
2012-08-08 13:38:16 -07:00
Doug Sherk
8b64f2b23f
Bug 780210: Fix B2G focus point calculation for pinching r=kats
2012-08-08 13:38:14 -07:00
Doug Sherk
b75e0a656f
Bug 775448: Add gesture cancelling support during sync subframe scrolling r=cjones
2012-08-08 13:38:10 -07:00
Doug Sherk
a842889a26
Bug 775448: Disable async scrolling when we detect a scrollable subframe r=cjones
2012-08-08 13:38:06 -07:00
Doug Sherk
6b3965aa7c
Bug 775447: Properly count number of touch listeners in AsyncPanZoomController r=cjones
2012-08-08 13:37:57 -07:00
Bobby Holley
1895527d8c
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
Nicholas Cameron
3a0930992b
Bug 779401; Teach HelpersCairo.h about 565 image formats. r=bas
...
--HG--
extra : rebase_source : eef05ab0fa1a8094104f272786ba7a3714c27dd5
2012-08-09 08:17:04 +12:00
Nicholas Cameron
ebac508850
Bug 780392; Make ScaledFontDWrite inherit from ScaledFontBase. r=bas
...
--HG--
extra : rebase_source : 83ffee7d64f1ecdfa15b8cf96024c27fdf00c29b
2012-08-09 08:17:04 +12:00
Jeff Gilbert
a695d8ec1c
Bug 774059 - Fix up references to glEGLImageTargetTexture2D - r=bjacob
2012-07-19 21:14:14 -07:00
ku.b@gmx.de
78a0b90ff8
Bug 709732 - double color correction with X Color Management
2012-07-18 21:09:13 -04:00
Jeff Gilbert
b32dccdd51
merge the backout of cset d4a04cc38326
2012-07-18 15:25:59 -07:00
Jeff Gilbert
be91e4f40e
Backed out changeset d4a04cc38326
2012-07-18 15:23:47 -07:00
Jeff Gilbert
cc1778b63f
Bug 774059 - Fix up references to glEGLImageTargetTexture2D - r=bjacob
2012-07-18 14:17:10 -07:00
Jeff Gilbert
8f647b4c56
Bug 774841 - Check the proper extension before using ImageTargetTexture2D - r=bgirard
2012-07-18 13:41:49 -07:00
David Zbarsky
9a61d96c70
[Bug 774505] Don't include Layers.h everywhere r=cjones
2012-07-18 12:31:40 -04:00
Jonathan Kew
fb06cb14f2
bug 769475 - incorrect font used for italicized Arabic text when font-family is Arial or Times New Roman. r=smontagu
2012-07-23 03:48:26 -04:00
Siddharth Agarwal
91d92e952e
Bug 780421 - Use $(PYTHON) to run config.status. r=glandium
2012-08-05 12:42:57 +02:00
David Anderson
a0c566a977
Merge from mozilla-central.
2012-07-13 19:50:02 -07:00
Ms2ger
cb94cc2ce1
Bug 776142 - Back out bug 687267 / changeset 8571114112b2 on a CLOSED TREE.
2012-07-22 14:02:18 +02:00
Phil Ringnalda
c6b792f900
Back out 0c1f34eb5b93 and 0f987ac28e8c (bug 683243) for Android R2 bustage
2012-07-12 22:27:34 -07:00
Nicholas Cameron
f81c82b671
Bug 767337; remove D3D10_RESOURCE_MISC_GDI_COMPATIBLE flag from D3D10 layer manager. r=roc
2012-07-18 15:02:12 -04:00
Bas Schouten
c6748c7b62
Bug 772726. Part 4: Fix SampleTextTexturesPS(Masked) shaders to premultiply TextColor. r=jrmuizel
...
--HG--
extra : rebase_source : 76781e7f69db6d47b3ecf8d8c37bac284133c6be
2012-07-18 01:02:08 -04:00
Robert O'Callahan
d5e555eeca
Bug 772726. Part 2: When BasicLayers is compositing directly to an Azure DrawTarget, Transform3D should handle the destination not having a CurrentSurface. r=mattwoodrow
...
--HG--
extra : rebase_source : 838f6b643d9ab4ca10a0bf9612eb2081e728288f
2012-07-18 01:02:07 -04:00
Jeff Gilbert
dae32c9f56
Bug 774688 - Mark reused buffer as dirty in BasicCanvasLayer - r=bas
2012-07-17 21:27:49 -07:00
David Anderson
4264d447f8
Merge from mozilla-central.
2012-07-12 13:23:26 -07:00
Vladimir Vukicevic
098150359d
b=773071; use KHR_fence_sync instead of GuaranteedRsolve with EGLImage WebGL; r=jgilbert
2012-07-17 21:20:28 -04:00
David Anderson
12f86be1b6
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
Ryan VanderMeulen
a9d0f1da9e
Backout a516a86f854d (bug 767064) due to Android M1 orange.
2012-07-09 21:49:50 -04:00
Rafael Ávila de Espíndola
b1d34774bf
Bug 775134 - Remove extra ; r=ehsan.
...
--HG--
extra : rebase_source : 1d44663679e8f1944649d54608e5e6e6694e88c5
2012-07-18 12:15:47 -04:00
Joshua Cranmer
d539846cab
Bug 702877 - Replace NS_OVERRIDE with MOZ_OVERRIDE. r=ehsan
...
--HG--
extra : rebase_source : 1843575683c3897f96f3966cbce26140ff1a7d90
2012-07-06 13:15:45 -05:00
Oleg Romashin
e40d28c591
Bug 774841 - Call SetupLookupFunction for EGL - r=jgilbert
2012-07-23 13:39:29 -07:00
James Willcox
30e0f551ce
Bug 687267 - Initial support for Flash on Honeycomb r=bgirard,vlad,jgilbert,blassey
2012-07-20 15:20:51 -04:00
Ed Morley
320a116efd
Backout 4987ffd173a4 (bug 687267) for bustage
2012-07-23 14:47:54 +01:00
James Willcox
752928c2eb
Bug 687267 - Initial support for Flash on Honeycomb r=bgirard,vlad,jgilbert,blassey
...
--HG--
extra : rebase_source : 450055ae3e71ea84f74252d3bf100fe970d29d14
2012-07-20 15:20:51 -04:00
Aryeh Gregor
65eef91085
Bug 626472 part 1 - Define nsnull as nullptr where available; r=ehsan
2012-07-20 14:16:17 +03:00
Ed Morley
c6ba1ec99f
Backout 07cd3d70434c & 9be67e1a7b4f (bug 769475) for failures in arial-arabic.html
2012-07-23 11:01:59 +01:00
Jonathan Kew
a363194212
bug 769475 - incorrect font used for italicized Arabic text when font-family is Arial or Times New Roman. r=smontagu
2012-07-23 03:48:26 -04:00
Vladimir Vukicevic
3bf3ba878d
b=767064; use 4444/565 GL context format for WebGL on mobile; r=jgilbert,r=bjacob
2012-07-06 09:19:27 -04:00
Chris Jones
161b9050f9
Bug 745148, part 9: Hook up the pieces and enable direct compositor. r=roc
2012-07-17 16:59:45 -07:00
Chris Jones
2949a9f18b
Bug 745148, part 8: Implement the little boilerplate-y bits and pieces needed for cross-process compositor. r=ajuma,BenWa
2012-07-17 16:59:45 -07:00
Chris Jones
f86571551f
Bug 745148, part 7: Create a RefLayer type to temporarily contain a foreign layer subtree during composition. r=BenWa sr=roc
2012-07-17 16:59:45 -07:00
Chris Jones
791fa8f037
Bug 745148, part 6: Allow layer trees to be given IDs so that the referent can be used in another context. r=ajuma sr=roc
2012-07-17 16:59:45 -07:00
Chris Jones
56cbcae7e6
Bug 745148, part 5: Pass the layer tree to ShadowLayersUpdate(). r=ajuma
2012-07-17 16:59:44 -07:00
Chris Jones
493c9592b6
Bug 745148, part 4: Remove duplicated code in Basic*ContainerLayer. r=roc
2012-07-17 16:59:44 -07:00
Matt Woodrow
8f19d77bb2
Bug 539356 - Part 6 - Add compositing paint flashing to BasicLayers. r=roc
2012-07-17 13:03:51 -04:00
Matt Woodrow
dab82349ce
Bug 539356 - Part 2 - Add new API to BasicLayers. r=roc
2012-07-17 13:03:51 -04:00
Matt Woodrow
b095ec8407
Bug 539356 - Part 1 - Allow LayerManagers to have multiple user data objects. r=roc
2012-07-17 13:03:50 -04:00
Mike Hommey
70d7c821af
Bug 774032 bonus - Use @DEPTH@ and @relativesrcdir@ in Makefile.in. r=ted
2012-08-04 20:26:44 +02:00
Mike Hommey
03af8b0c50
Backout changeset 2ef51674316a (bug 774032 bonus) for various Mochitest bustages on a CLOSED TREE
2012-08-04 10:38:41 +02:00
Mike Hommey
7096160830
Bug 774032 bonus - Use @DEPTH@ and @relativesrcdir@ in Makefile.in. r=ted
2012-08-04 08:48:56 +02:00
Mike Hommey
e5d69586e3
Bug 774032 part 6 - Replace autoconf handling of config files and headers with our own. r=ted
2012-08-04 08:47:28 +02:00
Benjamin Peterson
c0edec90e7
backout 6609595c84eb for leaking mutex
2012-08-03 20:32:57 -07:00
Matt Woodrow
3276a711dc
Bug 778036 - Add Has function to gfx::UserData and use it in Layers to correctly check for existance of user data. r=roc
2012-08-03 17:38:44 -07:00
Matt Woodrow
c7942e6ad6
Bug 780260 - Add serial numbers to Images and use it to check if an image has been painted to its BasicShadowableImageLayer already. r=cjones
2012-08-03 17:09:13 -07:00
Ed Morley
99e28f982d
Backout 14245bf85a3d (bug 778420), b9f603d3eef4 (bug 778420), e9bc27234022 (bug 72964), d5aa53121d29 (bug 778420), 959cc7ef5f5a (bug 726053) for m1 failures in test_offline_gzip.html
2012-08-03 23:29:10 +01:00
David Zbarsky
aaa7d5ced9
Bug 706179 Part 3: Turn on the use of scaling for layers in FrameLayerBuilder r=mattwoodrow
2012-08-03 14:29:22 -07:00
Bobby Holley
53a8783e02
Bug 778420 - Fix up tests that don't like the new enablePrivilege. r=jmaher
2012-08-03 22:19:54 +02:00
Andrew McCreight
0ae46980c5
Bug 724666 - Remove debugging printfs. r=bgirard
2012-08-01 08:51:31 -07:00
Benoit Jacob
1ec8a85786
Bug 778765 - Work around nouveau driver bug by changing samples=1 to samples=0 - r=jgilbert
2012-08-03 11:08:11 -04:00
Jan Beich
dd8e2e7ec6
Bug 779847: use optimized color conversion on BSDs. r=doublec
2012-08-03 15:04:39 +02:00
Brian R. Bondy
1d1476e115
Bug 770694 - Fix for snapped view windows size. r=bas
2012-07-04 20:36:37 -04:00
James Willcox
fa70604fdd
Bug 776331 - Avoid crash when trying to redraw a destroyed plugin on Android r=josh
2012-07-26 09:39:21 -04:00
Jeff Muizelaar
c2bd2a56d1
Bug 683243. Dither 16 bit gradients. r=BenWa
...
This does a 2x2 ordered dither in the same way that Skia does.
One of the things I'm currently unhappy with is that it duplicates
the gradient walker code for 16 bits. We could turn it into a large
macro that does the appropriate things for 16 bit and 32 bit
versions, but that's not particularly appealing.
--HG--
extra : rebase_source : ef89cd53d68166db825bb993e1262db342ba9b5d
2012-07-04 11:42:29 -04:00
Jeff Muizelaar
2209d71abe
Bug 683243. Add a 16 bit pipeline. r=BenWa
...
This is to support dithering 16 bit gradients with decent performance.
--HG--
extra : rebase_source : cffa90d5959211c8c1953867d85c7799ed52d662
2012-07-11 12:58:17 -04:00
Chris Jones
48b38d12fa
Bug 773192: Only proxy drawing to a non-default target in BasicShadowableLayerManager, i.e. drawWindow(USE_WIDGET_LAYERS) for a content context, when the request is same-process. r=ajuma
2012-07-12 14:07:13 -07:00
Jacek Caban
933060d186
Bug 778129 - GLContextProviderEGL.cpp fails to compile on mingw-w64 r=snorp
2012-08-02 15:58:34 +02:00
Steve Fink
6914108ba0
Backed out changeset afd9e75374e8 from a CLOSED TREE for breaking Windows builds
2012-07-19 14:55:48 -07:00
James Willcox
08eb1f216b
Bug 687267 - Initial support for Flash on Honeycomb r=benwa,vlad
2012-07-19 16:15:40 -04:00
Andreas Gal
4b90ef79db
Unbind external buffers by re-binding a dummy texture to work around GL driver issues with unlocking (bug 774530, r=cjones).
2012-07-19 11:40:04 -07:00