Commit Graph

526 Commits

Author SHA1 Message Date
Chris Peterson
f456453bfd Bug 829685 - Remove #include "prtypes.h" from some files that no longer use PR types. r=ehsan 2013-01-10 08:19:36 -08:00
Anthony Jones
ba51b4bc85 Bug 811950 - Add scaling operators to BaseSize and gfxPoint. r=roc 2012-12-23 10:50:30 -05:00
Steven Michaud
22e17a7096 Bug 821304 - Unbreak plugins that use subclasses of CALayer in CoreAnimation mode. r=bgirard 2012-12-20 15:14:20 -06:00
Jeff Muizelaar
9b7394adca Bug 823393. Breakage fix for partially commited Bug 823148.
Only some hunks of the patch for bug 823148 made it into the
tree. I've no idea why.

--HG--
extra : rebase_source : 629e6d74e2e6cf4255e7875a8a1eb044241eec23
2012-12-20 01:16:45 -05:00
Jeff Muizelaar
37df44dd2b Bug 823148. Make IsPatternSupportedByD2D match its name. r=bgirard
The name of this function got inverted but its implementation stayed the same.
2012-12-19 23:19:45 -05:00
Yazen Ghannam
3825f462a9 Bug 795378 - Clean up the high-quality scaler - Merge upstream changes to image_operations.cpp. r=joe 2012-12-18 16:25:07 -05:00
Rik Cabanier
4c61fa69ca Bug 748433: Adds support for blending to the canvas globalCompositeOperator. r=jrmuizel 2012-12-12 21:28:17 +01:00
Rik Cabanier
6b9a25d0b5 Bug 809927: Add new blend modes and implement them for Direct2D. r=bas 2012-12-12 21:28:17 +01:00
Steve Singer
fb88040c36 Bug 817356. the skia image resizers need to respect endian order when finding the alpha values. r=joedrew 2012-12-09 21:20:41 +01:00
Tobias Netzel
05af0c6d7d Bug 818004 - New Blurring code isn't big endian compatible. r=joedrew 2012-12-04 21:00:39 -05:00
Bas Schouten
59275a8c4f Bug 789933: Support non-D2D targets for getting a Path off ScaledFontDWrite. r=nrc 2012-12-05 01:11:02 +01:00
Nicholas Cameron
dbf7f78ed3 Bug 814828. DEST_OUT has no affect outside the source; r=bas
--HG--
extra : rebase_source : 098f3e3e64ba5504530264016d7fa9425c065f99
2012-12-05 13:02:52 +13:00
Joe Drew
915318f7cd Bug 813090 - Fix license block on imported Chromium code. r=gerv 2012-12-03 18:04:22 -05:00
Mats Palmgren
edf8cdeef3 Bug 815489 - Don't let Blur() swap mData since the buffer is also used by the image surface. r=roc 2012-11-28 19:55:36 +01:00
Brian R. Bondy
19fd7aceb1 Bug 793719 - Fix for D2D error on shutdown with VS2012. r=bas 2012-11-25 14:00:31 -05:00
George Wright
cf706b0313 Bug 751418 - Move common functions from DrawTargetSkia to HelpersSkia r=mattwoodrow 2012-10-16 17:16:45 -04:00
Bas Schouten
0aef574264 Bug 814101: Respect system-wide cleartype setting. r=jrmuizel,jfkthame 2012-11-23 02:53:12 +01:00
Yury
fc06b33fb9 Bug 812039 - mozIsPointInPath leaks CGPath objects. r=jmuizelaar 2012-11-15 20:34:57 -05:00
Jeff Muizelaar
7b6c5f3e23 Bug 811919. Include the pattern transform when painting patterns in DrawTargetCG. r=benwa
This fixes a lot of azure content bugs.

--HG--
extra : rebase_source : be84084aa7753862920ddd7b04fbfb0bd0b54ded
2012-11-14 16:52:02 -08:00
Bas Schouten
da71daaa87 Bug 811850: Fix gfx 2d recording to be 64-bit neutral. r=jrmuizel 2012-11-14 20:55:02 +00:00
Nathan Froyd
3520137968 Bug 809967 - include ostream instead of iostream in PathRecording.h to avoid static initializers; r=Bas 2012-11-08 14:22:16 -05:00
Bas Schouten
0c44a0904a Bug 509052: Add new, faster blurring code. r=derf 2012-11-07 09:29:54 +01:00
Ed Morley
7955e755b0 Backout e89f1fce980d (bug 509052) for an assortment of timeouts and crashes 2012-11-07 10:47:27 +00:00
Bas Schouten
18e314acfd Bug 509052: Add new, faster blurring code. r=derf 2012-11-07 09:29:54 +01:00
Tobias Schneider
8b298f4026 Bug 803124 - Implement mozIsPointInStroke. r=jmuizelaar 2012-10-29 16:54:53 +01:00
Tobias Schneider
d12338f402 Bug 806780 - PathSkia::ContainsPoint should use SkPath::contains(x, y). r=jmuizelaar 2012-10-30 10:19:16 +01:00
Nicholas Cameron
9918b32c5c Bug 801465; DataSourceSurfaceD2D; r=Bas 2012-10-31 12:30:25 +13:00
Nathan Froyd
f9b2a74082 Bug 806618 - rewrite PR_NewLogModule calls to not generate static initializers; r=ehsan 2012-10-29 19:32:10 -04:00
Daniel Holbert
f2f61487b3 Bug 795655: Mark "StringFromPtr()" in RecordedEvent.h as inline, not static, so that it doesn't trigger build warnings in cpp files that don't use it. r=bas 2012-10-29 16:15:31 -07:00
Bas Schouten
e52a32f0ff Bug 805831: Add a cache for border corner gradients. r=joedrew 2012-10-27 06:32:52 +02:00
Phil Ringnalda
8ef69d2aac Back out fbd8fdb7c544 (bug 805831) for build failures 2012-10-26 21:53:41 -07:00
Bas Schouten
688168bfaf Bug 805831: Add a cache for border corner gradients. r=joedrew 2012-10-27 06:32:52 +02:00
Matt Joras
cb9f8ae9e7 Bug 798033 - Removes "using namespace" directive from gfx headers - r=jmuizelaar 2012-10-25 16:12:59 -04:00
Markus Stange
19d18b4803 Bug 770524 - Fix FuzzyEqual to not return false for equal floats which are smaller than -2048.0f. r=roc 2012-10-25 12:54:15 +02:00
Anthony Jones
66ba4ec646 Bug 796418 - Check cairo matrix before drawing. r=joe 2012-10-24 22:03:21 -04:00
Jonathan Kew
8797c7fbb0 bug 715798 pt 3 - support Color Emoji font in the gfx/2d quartz backend. r=jrmuizel 2012-10-23 10:07:14 +01:00
Joe Drew
ed27f21e03 Bug 798053 - Do a more accurate test for the return value of Scale(). r=gw280
--HG--
extra : rebase_source : c26a57f060f172e9b7864eef69fa782064b4fae5
2012-10-10 11:35:23 -04:00
Steven Michaud
5a116d7578 bug 794038 pt 3 - plugins support for resolution change. r=bgirard 2012-10-16 20:41:21 +01:00
Benoit Jacob
c78c87a1ca back out 621cfd13ceaf for build failures 2012-10-15 13:34:42 -04:00
Matt Joras
db700742e9 Bug 798033 - Removes "using namespace" directive from gfx headers - r=jmuizelaar 2012-10-15 13:02:21 -04:00
Anthony Jones
15656b2623 Bug 795763 - Support extend mode for gradient patterns in DrawTargetCairo. r=joe 2012-10-10 06:32:36 -04:00
Jacek Caban
28992e5e05 Bug 795839 - Include iostream in PathRecording.h r=bas
--HG--
extra : rebase_source : 3774e2bdd21b05b009301269e8241acac8468003
2012-10-09 11:44:11 +02:00
Bas Schouten
c333193b1d Bug 798931: Push clip layers to the correct render targets. r=roc 2012-10-08 12:17:17 +02:00
Oleg Romashin
17cd21e011 Bug 796927 - Gfx Build fix, missing cstring include for memcpy. r=joe 2012-10-06 13:59:01 -07:00
Joe Drew
6343da8f62 Bug 798061 - Fix mismatched malloc vs delete[] in mozilla::gfx::AlphaBoxBlur::~AlphaBoxBlur(). r=jmuizelaar 2012-10-06 21:53:23 -04:00
Bas Schouten
e24cd566f3 Bug 784382 - Part 2: Use new ID2D1DeviceContext interface in Azure. r=jrmuizel 2012-10-07 01:43:16 +02:00
Ehsan Akhgari
7eb88a7711 Bug 797612 - Remove PathCG::mFigureActive; r=jrmuizel
--HG--
extra : rebase_source : 4ce5161c5ffee297ab55ad7a980dbb74f0051ded
2012-10-03 19:43:03 -04:00
Ehsan Akhgari
efdd777320 Bug 797219 - Make OutputMessage in gfx/2d/Logging.h static inline; r=joe 2012-10-03 13:43:37 -04:00
Robert O'Callahan
463a316a37 Bug 793690. Fix the obvious typos for infinite rects in SetScissorRect. r=bas 2012-10-04 00:30:56 +13:00
Nicholas Cameron
3e5b159112 Bug 753237 - Implement DrawTargetCairo::Mask(). r=joe 2012-10-02 20:14:38 -04:00
Steven Michaud
8650a61e2a Bug 785667 - Make plugins work with HiDPI mode on the Mac. r=bgirard 2012-10-02 14:48:05 -05:00
Anthony Jones
390224a3da Bug 795135 - Fix CairoTempMatrix restore. r=joe 2012-10-01 22:12:13 -04:00
Joe Drew
8219c6bebc Bug 486918. Part 1: Import Chromium's higher-quality image scalers, since we know those to be good and shippable. r=jrmuizel 2012-08-23 15:36:04 -04:00
Ms2ger
372fb21863 Bug 795862 - Back out bug 486918 for build bustage in unreviewed code. 2012-10-01 14:16:03 +02:00
Joe Drew
9c1a03cf35 Bug 486918. Part 1: Import Chromium's higher-quality image scalers, since we know those to be good and shippable. r=jrmuizel 2012-08-23 15:36:04 -04:00
Doug Sherk
f73db9f5da Bug 784908: Part 1: Change names of FrameMetrics variables to be more descriptive, add documentation, change some coordinate spaces. r=roc 2012-09-28 22:16:34 -04:00
Ed Morley
6250aafdf0 Backout 92530b29ac24, 42e659956dc6 & 38277196c099 (bug 486918), d3b69fe15ac3 & b2dba2108722 (bug 786444), e7381ac9e30a (bug 786449) on suspicion of causing Android reftest failures on a CLOSED TREE 2012-09-28 23:00:28 +01:00
Andrew Quartey
24a0485f96 Bug 793201 - Fix compiler warnings in Azure with MSVC r=bas 2012-09-28 13:21:40 -04:00
Joe Drew
d69b59de49 Bug 486918. Part 1: Import Chromium's higher-quality image scalers, since we know those to be good and shippable. r=jrmuizel
--HG--
extra : rebase_source : afcbe4f2b8fac985d836b038fb42156d27dc1c29
2012-08-23 15:36:04 -04:00
Chris Jones
1473dd2ab9 Remove this .rej that didn't merge properly. No bug.
--HG--
extra : rebase_source : de991a63653dba7575448676cb855b29fb3d66c4
2012-09-25 23:44:39 -07:00
Bas Schouten
f879626948 Bug 792207 - Part 5: Add code to Azure to allow initializing recording. r=jrmuizel 2012-09-24 15:02:50 +00:00
Bas Schouten
4bb194b703 Bug 792207 - Part 4: Add Azure recording code. r=jrmuizel 2012-09-24 15:02:50 +00:00
Bas Schouten
32bb90c285 Bug 792207 - Part 3: Add UserData to ScaledFont. r=jrmuizel 2012-09-24 15:02:49 +00:00
Bas Schouten
002f6c0080 Bug 792207 - Part 2: Add method to store and create from TrueType data. r=jrmuizel 2012-09-24 15:02:49 +00:00
Bas Schouten
1573410081 Bug 722269: Make DrawTargetD2D::DrawSurface deal with any SourceSurface convertible to a DataSourceSurface. r=joedrew 2012-09-20 21:24:12 +00:00
Robert O'Callahan
c4a56ee9c9 Bug 772726. Part 14: Nudge pattern transform components to integers to avoid rounding errors. Also nudge rects to integers when we retransform them due to a CTM change. r=bas 2012-09-08 00:32:21 +12:00
Robert O'Callahan
db11746193 Bug 772726. Part 8: Add Rect::NudgeToIntegers and share improved nudging code among all nudging APIs. r=bas 2012-09-12 17:24:09 +12:00
Robert O'Callahan
08124fb0da Bug 772726. Part 6: Add NudgeToIntegers operation to Azure Matrix, add MultiplyAndNudgeToIntegers to gfxContext, and call it from SVG when we render path geometry, to ensure that small internal rounding errors in transforms don't cause unnecessary differences in rasterization of paths. r=bas 2012-09-05 12:15:52 +12:00
Bas Schouten
6ab8e308dd Bug 772726: Factor out pixel-aligned clip handling in DrawTargetD2D. r=jrmuizel 2012-09-18 23:04:42 +00:00
George Wright
323359d051 Bug 777614 - Handle BGRX SourceSurfaces in Skia by converting them to BGRA r=nrc 2012-09-18 15:41:37 -04:00
George Wright
6a0058a6d0 Bug 777614 - Use Skia's Conical gradient shader instead of Radial to be in line with the canvas spec. r=nrc 2012-09-18 15:41:37 -04:00
Daniel Holbert
0d97399c31 Bug 791801: Reorder AlphaBoxBlur init list to fix build warning. r=ajones 2012-09-17 15:41:24 -07:00
Jeff Muizelaar
00587c07b1 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
Bas Schouten
c93c7afc69 Bug 790222: Fix azure stand-alone build. r=BenWa 2012-09-11 13:51:39 +00:00
Andrew Quartey
c34c4521c2 Bug 788398 - Remove unused variable 'rule' in CairoPathContext::DuplicateContextAndPath r=bjacob 2012-09-06 20:16:30 -04:00
Nicholas Cameron
683496a28c Bug 722217; keep only a single snapshot. r=jrmuizel 2012-09-06 16:07:53 +12:00
Benoit Girard
2b1b0b76b1 Bug 788681 - Fix swapped Typedefs IOSurfaceGetWidthFunc and IOSurfaceGetHeightFunc. r=smichaud 2012-09-05 17:31:30 -04:00
Anthony Jones
a9b6e1e92e Bug 788087 - Apply matrices to Azure/Cairo patterns. r=joe 2012-09-04 21:01:57 -04:00
Anthony Jones
1c03dee0c6 Bug 784573 - Fix problems converting cairo paths between user space and device space. r=joe 2012-09-03 17:48:04 -04:00
Anthony Jones
adf1983141 Bug 784573 - Create a RAII helper for temporary cairo matrices. r=joe 2012-09-03 17:47:09 -04:00
Anthony Jones
0aef976df5 Bug 781731 - Use a similar surface for non-blurred shadows to improve performance. r=joe 2012-09-02 19:07:06 -04:00
Anthony Jones
30cd2208d4 Bug 781731 - Speed up shadows by using tee surface to avoid doing a read back. r=jrmuizel 2012-09-02 19:07:06 -04:00
Anthony Jones
57eca94aa8 Bug 781731 - Fix shadow surface extents so they aren't double padded. r=joe 2012-09-02 19:07:05 -04:00
Anthony Jones
08876a0dce Bug 781731 - Clean up DrawTargetCairo::DrawSurfaceWithShadow() to make it simpler and paint correctly in all modes. r=jrmuizel 2012-09-02 19:07:05 -04:00
Ryan VanderMeulen
dea06b0a28 Bug 781380 - Follow-up fix for a change that was lost in the original landing. r=ajones 2012-08-28 20:55:20 -04:00
Ms2ger
6a8ff69ba1 Backout bug 781731. 2012-08-27 12:27:40 +02:00
Anthony Jones
bf498a4c08 Bug 781731 - Fixed failed assertion in reftest1; r=doublec 2012-08-27 22:01:47 +12:00
Anthony Jones
845006b170 Bug 781731 - Use a similar surface for non-blurred shadows to improve performance; r=roc 2012-08-27 11:34:33 +02:00
Anthony Jones
c67126fb9b Bug 781731 - Speed up shadows by using tee surface to avoid doing a read back; r=roc 2012-08-27 11:34:07 +02:00
Anthony Jones
efc3961ad0 Bug 781731 - Fix shadow surface extents so they aren't double padded; r=roc 2012-08-27 11:32:14 +02:00
Anthony Jones
80a0320902 Bug 781731 - Clean up DrawTargetCairo::DrawSurfaceWithShadow() to make it simpler and paint correctly in all modes; r=jrmuizel 2012-08-27 11:31:56 +02:00
Anthony Jones
4cccdbef88 Bug 781380 - Fix cairo surface memory leak in DrawTargetCairo::DrawSurfaceWithShadow(). r=roc 2012-08-23 19:50:59 -04:00
Anthony Jones
2fce71e823 Bug 781380 - Fix cairo surface memory leak in DrawTargetCairo::CreateSimilarDrawTarget(). r=roc 2012-08-23 19:50:59 -04:00
Nicholas Cameron
bf17571aff Bug 784260; DrawTargetD2D should deal with Cairo surfaces in CreateBrush... . r=Bas
--HG--
extra : rebase_source : 6f6226c1b22b6e863499a40268cb44afab799381
2012-08-23 08:56:03 +12:00
Mats Palmgren
82160c5042 Bug 783041 - Minor cleanup: remove local 'shadowIntRect' and use 'mRect' instead since it has the same value, and use Intersect instead of IntersectRect since we're not using its return value. part 2, r=roc 2012-08-16 16:13:29 +02:00
Mats Palmgren
dc4d68085f Bug 783041 - Check IsEmpty() after rounding. part 1, r=roc 2012-08-16 16:13:29 +02:00
Joe Drew
d8748ac877 Bug 782416 - Switch from NULL to nullptr in gfx::2d. r=Bas
--HG--
extra : rebase_source : cfa9fc8ae592880e22e1f14cee42539b4f911668
2012-08-14 14:06:12 -04:00
Joe Drew
dc29fbcc5f Bug 782416 - Make gfx::2d's nullptr definition actually work. r=nrc
--HG--
extra : rebase_source : da098e5e6d04aa1dce2ffefd4ccd0ad6ffb376b8
2012-08-15 15:24:44 -04:00
Joe Drew
0375708f8e Back out 98d2c24ce932 for failing to build r=moron 2012-08-15 12:51:33 -04:00
Joe Drew
f072936338 Bug 782416 - Switch from NULL to nullptr in gfx::2d. r=Bas
--HG--
extra : rebase_source : 9b12a2af4c55f4dc383e8075b400e7a1fbe1ac23
2012-08-14 14:06:12 -04:00
Aryeh Gregor
e2dd9c2028 Bug 626472 part 3 - Remove nsnull for good; r=ehsan 2012-08-12 13:43:47 +03:00
Nicholas Cameron
f587d00227 Bug 781943. nullptr macro. r=joe 2012-08-14 09:06:59 +12:00
Robert O'Callahan
856a5da26e Bug 772726. Part 3: Optimize DrawTargetD2D::GetClippedGeometry for the case where all clips are rectangles, to work around a D2D geometry-intersection bug. r=bas
--HG--
extra : rebase_source : 72a21554ec37818e1b5ba4c36d03e4f81010c6a1
2012-08-10 23:18:36 +12:00
Ed Morley
a0bb24f111 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
00cbe415e1 Bug 772726. Part 3: Optimize DrawTargetD2D::GetClippedGeometry for the case where all clips are rectangles, to work around a D2D geometry-intersection bug. r=bas
--HG--
extra : rebase_source : 51734958e7100ee4a5fc96d973905834d69345f0
2012-08-10 23:18:36 +12:00
Nicholas Cameron
bc4f4c3f06 Bug 781056; remove extraneous save/restores from DrawTargetCairo. r=bas
--HG--
extra : rebase_source : d3c9d94d3263c50bc0d4bae42b6d58f3f5b07a0b
2012-08-10 06:45:03 +12:00
Nicholas Cameron
7d95be8018 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
c2e46a6896 Bug 780392; Make ScaledFontDWrite inherit from ScaledFontBase. r=bas
--HG--
extra : rebase_source : 83ffee7d64f1ecdfa15b8cf96024c27fdf00c29b
2012-08-09 08:17:04 +12:00
Sergey Glushchenko
cc3eef8d15 Bug 776429: Unify scattered M_PI definitions into mfbt/Constants.h r=dRdR 2012-08-06 13:32:11 -07:00
Mike Hommey
c1b35e7b2a Bug 774032 bonus - Use @DEPTH@ and @relativesrcdir@ in Makefile.in. r=ted 2012-08-04 20:26:44 +02:00
Mike Hommey
be451c22dc Backout changeset 2ef51674316a (bug 774032 bonus) for various Mochitest bustages on a CLOSED TREE 2012-08-04 10:38:41 +02:00
Mike Hommey
e79d87471e Bug 774032 bonus - Use @DEPTH@ and @relativesrcdir@ in Makefile.in. r=ted 2012-08-04 08:48:56 +02:00
Matt Woodrow
f19af528e3 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
Andrew McCreight
4518160ee1 Bug 724666 - Remove debugging printfs. r=bgirard 2012-08-01 08:51:31 -07:00
Jeff Muizelaar
a90c947151 Bug 778307. Don't shadow mFormat in DrawTargetCG. r=bgirard
This was causing problems with Azure content.
2012-07-31 12:28:03 -07:00
Benoit Girard
1283cbb069 Bug 724666 - Part 2: Add CGIOSurfaceContext to azure. r=jmuizelaar 2012-07-31 11:17:43 -04:00
Benoit Girard
0c580e48cb Bug 724666 - Part 1: Refactor nsCoreAnimation support into azure QuartzSupport. r=jmuizelaar
--HG--
rename : gfx/thebes/nsIOSurface.h => gfx/2d/MacIOSurface.h
rename : gfx/thebes/nsCoreAnimationSupport.mm => gfx/2d/QuartzSupport.mm
2012-07-31 11:11:57 -04:00
Bas Schouten
9fcbfab303 Bug 777700 - Part 1: Add a way to check validity of SourceSurfaces. r=jrmuizel 2012-07-28 02:33:08 +02:00
Benjamin Peterson
73e5134abb Backout 46b27e913ac9 for windows failures 2012-07-27 21:46:51 -07:00
Bas Schouten
fca34bd45d Bug 777700 - Part 1: Add a way to check validity of SourceSurfaces. r=jrmuizel 2012-07-28 02:33:08 +02:00
Oleg Romashin
d6c5bfebea Bug 778195 - Add string.h to cover memcpy include and fix build error. r=nrc 2012-07-27 17:51:53 -04:00
Nicolas Silva
ac9c907a9b Bug 775226 - Support CreateDrawTargetForData with Azure's CoreGraphics backend, r=jrmuizel 2012-07-26 14:06:23 -04:00
Nicholas Cameron
d4158405d0 Bug 764125; sort out preferred and fallback Azure backends for all platforms (gfxPlatform). r=Bas 2012-07-25 12:45:58 +12:00
Nicholas Cameron
4e5ac23023 Bug 748116; refactor DrawTargetCairo::GfxPatternForPattern. r=roc 2012-07-24 22:18:40 +12:00
Nicholas Cameron
1973aace0a Bug 748116; Make DrawTargetCairo::DrawSurface work with non-Cairo source surfaces. r=roc 2012-07-24 22:18:39 +12:00
Nicholas Cameron
95a274068b Bug 746883; tidying up some nits I found along the way; r=gw280 2012-04-26 10:04:35 +12:00
Anthony Jones
4f689acacc Bug 761895; Fixed Azure/Cairo canvas font support on gtk and android. r=karl 2012-07-24 22:18:39 +12:00
Anthony Jones
a31d942694 Bug 764125; Fix canvas 2d.drawImage.5arg and 2d.drawImage.9arg surface scaling tests. r=karl 2012-07-24 22:18:38 +12:00
Nicholas Cameron
ac6e52b1e5 Bug 764125; Fix a bug where a path with a transform is re-used. r=Bas 2012-07-24 22:18:38 +12:00
Nicholas Cameron
46651fb0db Bug 764125; drawing changes to DrawTargetCairo; r=jrmuizel 2012-07-24 22:18:38 +12:00
Nicholas Cameron
fcab761120 Bug 764125; store a reference to the backing surface in DrawTargetCairo; r=Bas 2012-07-24 22:18:38 +12:00
Nicholas Cameron
29f67f067d Bug 764125; pass around the size of a gfxASurface when creating a DrawTarget. r=Bas 2012-07-24 22:18:38 +12:00
Nicholas Cameron
3843f14d15 Bug 764125; small Windows Cairo text fix. r=Bas 2012-07-24 22:18:38 +12:00
Anthony Jones
b8c555826b Bug 764125; implement DrawTargetCairo::CopySurface; r=Bas 2012-07-24 22:18:37 +12:00
Nicholas Cameron
9e4ceaecb8 Back out bug 746883, bug 764125, bug 761895, bug 746883, bug 748116 2012-07-26 18:48:24 +12:00
Nicholas Cameron
c93adeeed1 Bug 764125; sort out preferred and fallback Azure backends for all platforms (gfxPlatform). r=Bas 2012-07-25 12:45:58 +12:00
Nicholas Cameron
0131e2cc87 Bug 748116; refactor DrawTargetCairo::GfxPatternForPattern. r=roc 2012-07-24 22:18:40 +12:00
Nicholas Cameron
5107e499be Bug 748116; Make DrawTargetCairo::DrawSurface work with non-Cairo source surfaces. r=roc 2012-07-24 22:18:39 +12:00
Nicholas Cameron
2078be321e Bug 746883; tidying up some nits I found along the way; r=gw280 2012-04-26 10:04:35 +12:00
Anthony Jones
5099b0a652 Bug 761895; Fixed Azure/Cairo canvas font support on gtk and android. r=karl 2012-07-24 22:18:39 +12:00
Anthony Jones
c1f427bb0f Bug 764125; Fix canvas 2d.drawImage.5arg and 2d.drawImage.9arg surface scaling tests. r=karl 2012-07-24 22:18:38 +12:00
Nicholas Cameron
5aadfa70b7 Bug 764125; Fix a bug where a path with a transform is re-used. r=Bas 2012-07-24 22:18:38 +12:00
Nicholas Cameron
d157fedf81 Bug 764125; drawing changes to DrawTargetCairo; r=jrmuizel 2012-07-24 22:18:38 +12:00
Nicholas Cameron
437dc05421 Bug 764125; store a reference to the backing surface in DrawTargetCairo; r=Bas 2012-07-24 22:18:38 +12:00
Nicholas Cameron
3b6dfef245 Bug 764125; pass around the size of a gfxASurface when creating a DrawTarget. r=Bas 2012-07-24 22:18:38 +12:00
Nicholas Cameron
0ea5f6253c Bug 764125; small Windows Cairo text fix. r=Bas 2012-07-24 22:18:38 +12:00
Anthony Jones
6c8010e34e Bug 764125; implement DrawTargetCairo::CopySurface; r=Bas 2012-07-24 22:18:37 +12:00
George Wright
2656b05f5e Bug 774728 - Do a null pointer check before using any gradient shaders in DrawTargetSkia r=mattwoodrow
--HG--
extra : rebase_source : 7db2d28692a3cd9cccbd542ca752950f5df90511
2012-07-25 20:11:17 -04:00
Matt Woodrow
fba08bf999 Bug 741682 - Use nsRegion::ScaleToInsidePixels when computing opaque regions of layers. r=roc 2012-07-23 15:00:36 +12:00
Matt Woodrow
01e1e7144d Bug 741682 - Add ScaleToInsidePixels and ScaleToNearestPixels to nsRegion. r=roc 2012-07-23 15:00:36 +12:00
Bas Schouten
14b569ca4d 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
Matt Woodrow
4047b6bdf3 Bug 539356 - Part 1 - Allow LayerManagers to have multiple user data objects. r=roc 2012-07-17 13:03:50 -04:00
Bas Schouten
15f0ce5314 Bug 770033 - Part 3: Deal with extend modes for D2D partial bitmap uploads. r=jrmuizel 2012-07-04 20:23:16 +02:00
Bas Schouten
ffbbf02cae Bug 770033 - Part 2: Add order test for horizontal halfscaling code. r=jrmuizel 2012-07-04 20:21:27 +02:00
Bas Schouten
38ab7bbbf2 Bug 770033 - Part 1: Fix shuffling bug in horizontal halfscaling code. r=jrmuizel 2012-07-04 20:21:12 +02:00
Ehsan Akhgari
e4d2d195ad Backout changeset 89f35d1fea6c (bug 539356) because of performance and correctness regressions 2012-07-03 20:32:33 -04:00
Matt Woodrow
eb7d17c374 Bug 539356 - Part 1 - Allow LayerManagers to have multiple user data objects. r=roc 2012-06-30 15:06:09 +12:00
Bas Schouten
61058bf288 Bug 765845: Reduce calling frequency of SetTextRenderingParams. r=jrmuizel 2012-06-26 02:59:18 +02:00
Jeff Muizelaar
54317a6cbc Bug 764594. Remove some unneeded calls in the Azure CG backend. r=bgirard
Some old code that was copy-n-pasted but never used.
2012-06-12 21:15:32 -07:00
Bas Schouten
f8ade67ce6 Bug 738189 - Followup: Properly move functions into #ifdef. r=bustage 2012-06-21 00:32:52 +02:00
Bas Schouten
8d0bcd0646 Bug 761397 - Part 1: Cache ID2D1Layers for D2D Azure backend. r=jrmuizel 2012-06-20 23:41:16 +02:00
Bas Schouten
022fb4437b Bug 738189: Add memory reporting for Azure VRAM usage. r=jrmuizel 2012-06-20 23:41:16 +02:00
Nicholas Cameron
2a39d6cdd8 Bug 761890 (was 746883); bug fixing Skia fonts; r=gw280 2012-04-26 10:04:35 +12:00
Jeff Muizelaar
6fbc239e10 Bug 763120. Avoid using vm_copy when snapshoting. r=bgirard
CGBitmapContextCreateImage uses vm_copy which ends up being
slower than memcpy if we actually need to make a copy. Further,
since it does the copy by pagefaulting, it's shows up poorly
on profiles. Since, we already manually track modification we
don't really have need for the copy-on-write semantics. This
change ensures that we'll only use memcpy when we need to make
a copy.

--HG--
extra : rebase_source : 93afb1423605a13cb4c76a6c389e1989aa814ae0
2012-06-11 16:21:55 -07:00
Bas Schouten
c644cf11a7 Bug 758980: Assume DirectWrite is buggy when it returns empty alpha texture bounds. r=jrmuizel 2012-06-13 10:42:23 +02:00
Matt Brubeck
72ef8c96fc Back out bug 761890, bug 746896, and bug 759036 because of reftest failures
--HG--
extra : rebase_source : b5bdad8a69eab8e9ba35d21637c0bbcb18bce703
2012-06-11 22:50:31 -07:00
Nicholas Cameron
ed4d4e45c3 Bug 761890 (was 746883); bug fixing Skia fonts; r=gw280
--HG--
extra : rebase_source : 89b3501dad46f0c1284107afe906869548623992
2012-04-26 10:04:35 +12:00
Ed Morley
7d13aab294 Backout 61fd66629c4f, 7c8121f8d3af & 2a2e9cf8fd41 (bug 539356), e31a5e6545d3 (bug 761884), 85fa80bd9792, a284ccb25b83, 2865904db9fc, 34e07b09c426, e9b3d41e0360, cef00ebcd6c8, f943b729ac14 & 783f298401b6 (bug 539356), 330a086f1570 (bug 741682), d80219c8842c (bug 739671), e8c96b4fd4da, 313af486e68d, 0adc41ff56dc, 0cd288a38085, f1d43208825c, 4859876972f3, eec8ef3ebe48, f7f29fcd1845, 6079b229d306, f23c3a7e7ce0, 9824458a41e2 & 6748b5496059 (bug 539356) for mochitest-4 orange & talos regressions on multiple platforms 2012-06-11 10:08:32 +01:00
Matt Woodrow
b17e4001dc Bug 539356 - Part 1 - Allow LayerManagers to have multiple user data objects. r=roc 2012-06-11 16:44:08 +12:00
George Wright
9dcb1bb771 Bug 761201 - Trigger Skia's RGB565 blitter fast path by using SrcOver instead of Src. r=jrmuizel 2012-05-31 14:56:33 -04:00
Jacek Caban
3608ba0206 Bug 756996 - GCC warnings in gfx/2d r=bas 2012-06-04 13:02:02 +02:00
Bas Schouten
12cb490750 Bug 736460: Deal with gradient stops in a single position. r=jrmuizel 2012-06-02 00:00:28 +02:00
Ed Morley
698a10580d Backout fa3fe2aff1f5 (bug 756996) for bustage 2012-05-31 15:46:38 +01:00
Jacek Caban
2a959813ec Bug 756996 - GCC warnings in gfx/2d r=bas 2012-05-31 16:09:20 +02:00
Takanori MATSUURA
5c9f3f4809 Bug 751521 - Separate pixman detection from cairo. r=glandium 2012-05-26 08:44:00 +02:00
Nicholas Cameron
277e41b99e Bug 752380. Refactor gfxFont out of Azure. r=Bas 2012-05-17 10:30:10 +12:00
Jacek Caban
0496c2dfda Bug 756430 - Missing return statement in DrawTargetD2D::FillGlyphsManual r=bas
--HG--
rename : toolkit/content/tests/widgets/test_menubar_gtk.xul => toolkit/content/tests/widgets/test_menubar.xul
rename : toolkit/content/tests/widgets/window_menubar_gtk.xul => toolkit/content/tests/widgets/window_menubar.xul
extra : rebase_source : 1f231cb0a881091853319a9e311405182a4e07f1
2012-05-21 11:03:06 +02:00
Bas Schouten
990e913754 Bug 757329: Support changing transforms while emitting path instructions. r=roc 2012-05-22 07:29:19 +02:00
Bas Schouten
b04ba2bf25 Bug 756767 - Part 1: Simplify SourceSurfaceD2D and add DataSourceSurface support. r=jrmuizel 2012-05-21 17:27:30 +02:00
Bas Schouten
d6881666b8 Bug 756454: User 2D texture for gradient realizations. r=jrmuizel 2012-05-21 17:24:05 +02:00
Bas Schouten
f0b2b86750 Bug 756424: Properly set the rasterizer for FillGlyphsManual. r=jrmuizel 2012-05-21 17:24:00 +02:00
Ed Morley
c6b0785957 Backout a693c64dc64e (bug 715768), c520957cc03f & 713ed280a80d (bug 756767), 20cb25a8b8ba (bug 756454), f3b5ad2320cb (bug 756424) for crashes 2012-05-21 18:56:46 +01:00
Bas Schouten
8444e2eeeb Bug 756767 - Part 1: Simplify SourceSurfaceD2D and add DataSourceSurface support. r=jrmuizel 2012-05-21 17:27:30 +02:00
Bas Schouten
c89569b17b Bug 756454: User 2D texture for gradient realizations. r=jrmuizel 2012-05-21 17:24:05 +02:00
Bas Schouten
4287a47aa4 Bug 756424: Properly set the rasterizer for FillGlyphsManual. r=jrmuizel 2012-05-21 17:24:00 +02:00
Jeff Muizelaar
6ee514463a Bug 752341. Avoid using CGContextSetTextMatrix. r=bgirard
CGContextSetTextMatrix has behaviour that depends on the text
drawing mode. We want consistency so avoid CGContextSetTextMatrix.

--HG--
extra : rebase_source : c6e46252823586d947ec1dd19db7df980dee23f8
2012-05-21 10:22:11 -04:00
Gervase Markham
87620f5676 Bug 716478 - update licence to MPL 2. 2012-05-21 12:12:37 +01:00
Ryan VanderMeulen
9bc3429f7a Merge m-c to inbound. 2012-05-17 23:23:57 -04:00
Makoto Kato
eba5513681 Bug 756010 - Don't build ImageScalingSSE2.cpp on VC2005 due to no _mm_castsi128_ps. r=bas 2012-05-18 11:17:26 +09:00
Nicholas Cameron
13a632fa04 Bug 756007 - Fix path invariant for Azure/Cairo push/pop clip. r=joe 2012-05-17 17:54:22 -04:00
Bas Schouten
1e9105b35d Bug 717393 - Followup: Properly regenerate shader headers. r=autogenerated 2012-05-17 02:33:01 +02:00
Makoto Kato
b843767fc2 Bug 753772 - [VC8 (SeaMonkey)] gfx/2d/Factory.cpp compilation fails since bug 732985 landed. r=bas 2012-05-16 17:40:51 +09:00
Bas Schouten
17982eb2b6 Bug 755591: Properly initialize mPermitSubpixelAA. r=jrmuizel 2012-05-16 03:34:18 +02:00
Benoit Jacob
6598b33e08 Bug 732875 - 8/8 - move CheckedInt to MFBT, enable unit tests in mfbt/tests - r=jwalden
--HG--
rename : xpcom/ds/CheckedInt.h => mfbt/CheckedInt.h
2012-05-14 15:50:20 -04:00
Bas Schouten
73d50f4a6a Bug 717393 - Part 4: Add code for drawing subpixel AA to transparent surfaces. r=jrmuizel 2012-05-15 16:57:51 +02:00
Bas Schouten
9348b020c7 Bug 717393 - Part 3: Cache ClippedGeometry for D2D Azure backend. r=jrmuizel 2012-05-15 16:57:51 +02:00
Bas Schouten
28581d2aad Bug 717393 - Part 2: Refactor clip management and add ClippedMask texture. r=jrmuizel 2012-05-15 16:57:51 +02:00
Bas Schouten
e82d65b328 Bug 717393 - Part 1: Add helper for creating DWriteGlyphRuns. r=jrmuizel 2012-05-15 16:57:51 +02:00
Bas Schouten
0a269a2595 Bug 754751: Fix GetClippedGeometry to work with rectangular clips. r=jrmuizel 2012-05-15 16:57:51 +02:00
Honza Bambas
778033e649 Bug 753790 - define hypotf as _hypotf in gfx/2d/Tools.h when building with MSCV9 or older+include emmintrin.h in ImageScalingSSE2.cpp, r=bas 2012-05-15 16:44:25 +02:00
David Zbarsky
efdd0b3f7f Bug 754138 - Prevent Rect.h warning spam. r=roc 2012-05-14 19:01:05 -04:00
Ed Morley
d38b916352 Backout 345ae68f15f4, b3b40121ac8d, 0d18b7a246d7, 9dbb6064ab58, dee9d7fa8eb6, 63eec6bfa948, 323c6be7cfe8 & f4aac7523a48 (bug 732875) for compilation failures 2012-05-14 21:05:24 +01:00
Benoit Jacob
43d4449b09 Bug 732875 - 8/8 - move CheckedInt to MFBT, enable unit tests in mfbt/tests - r=jwalden
--HG--
rename : xpcom/ds/CheckedInt.h => mfbt/CheckedInt.h
2012-05-14 15:50:20 -04:00
Robert O'Callahan
69c4c13441 Bug 681192. Part 0.1: Add BaseRect::ClampPoint. r=bas
--HG--
extra : rebase_source : 32e086725d450d8867a4b5978cd76a2f03609572
2012-05-10 17:24:17 +12:00
Bas Schouten
a1e540b756 Bug 732985 - Part 2: Use ImageScaler for large images. r=jrmuizel 2012-05-10 06:31:14 +02:00
Bas Schouten
ba7b7826bb Bug 732985 - Part 1: Add image scaling code to Azure. r=jrmuizel 2012-05-10 06:31:14 +02:00
Nicholas Cameron
c22151c2bc Bug 747822 - Implement push/pop clip for Cairo/Azure. r=joe 2012-04-26 10:04:36 +12:00
Bas Schouten
e2245a8bc2 Backout bug 732985(f453201647a1,ca29dc47986a,f0ca5eb320c4,94ffc045ba89). 2012-05-08 04:58:37 +02:00
Bas Schouten
6e06e63991 Bug 732985 - Followup 2: Only compile HasCPUIDBit when using SSE2. r=bustage 2012-05-08 04:52:06 +02:00
Bas Schouten
a1f9436ef2 Bug 732985 - Followup: Fix include order in gfx/2d Makefile. r=bustage 2012-05-08 04:40:13 +02:00
Bas Schouten
f1cad61c49 Bug 732985 - Part 2: Use ImageScaler for large images. r=jrmuizel 2012-05-08 04:31:30 +02:00
Bas Schouten
ca48ea5c42 Bug 732985 - Part 1: Add image scaling code to Azure. r=jrmuizel 2012-05-08 04:31:30 +02:00
Bas Schouten
12b9c87e20 Bug 738413 - Followup: Move ToIntRect to a Rect class method. r=roc 2012-05-03 23:41:37 +02:00
Bas Schouten
b23f9ad1b3 Bug 738413 - Part 1: Add OpaqueRect API to Azure DrawTargets. r=roc 2012-05-03 23:31:02 +02:00
Bas Schouten
700c1894dd Bug 751463: Remove Azure from XUL. r=khuey 2012-05-03 21:21:52 +02:00
Jeff Muizelaar
d2356ee6d6 Bug 743499. Handle negative sizes in CG backend. r=bas, a=akeybl
I didn't realize Sizes could be negative when originally writing this code.
2012-04-23 17:09:57 -04:00
Bas Schouten
8fcd3b1235 Bug 745054 - Part 2: Allow factory construction of Skia drawtargets on all platforms. r=mattwoodrow 2012-04-13 04:10:22 +02:00
Bas Schouten
038184f126 Bug 745054 - Part 1: Fix Skia compilation on windows. r=mattwoodrow 2012-04-13 04:10:22 +02:00
Bas Schouten
bdc56d9de0 Bug 742566: Add stand-alone unit test framework to Azure. r=jrmuizel 2012-04-12 02:03:07 +02:00
Bas Schouten
ced03e7ec4 Bug 719776 - Part 5: Fix MSVC build files for Azure. r=jrmuizel 2012-04-12 02:03:07 +02:00
Bas Schouten
1288fbb92c Bug 719776 - Part 4: Do not depend upon mozalloc inside Azure. r=jrmuizel 2012-04-12 02:03:07 +02:00
Bas Schouten
36ca188749 Bug 719776 - Part 3: Only include ScaledFontWin when using Skia. r=jrmuizel 2012-04-12 02:03:07 +02:00
Matt Woodrow
721e5429cc Bug 719776: Kill some external dependencies inside Azure code. r=Bas 2012-03-05 13:12:15 +13:00
Ehsan Akhgari
49598484f5 Backed out changeset 690cba3bb817 (bug 719776) because of build failures 2012-04-03 17:49:59 -04:00
Matt Woodrow
47b3a0a846 Bug 719776: Kill some external dependencies inside Azure code. r=Bas 2012-03-05 13:12:15 +13:00
Bas Schouten
397da36bfc Bug 740815 - Part 1: Add DrawTargetDual to Azure for Component Alpha drawing. r=jrmuizel 2012-04-03 22:25:52 +02:00
Matt Woodrow
cf0ac03d81 Bug 740560 - [Azure] Add Factory::CreateDrawTargetForData. r=Bas,gw280 2012-04-02 15:15:08 -04:00
Joe Drew
a0a15d0e56 Bug 739969 - Port patch from bug 633627 to use fixed point division instead of integer. r=jmuizelaar 2012-04-01 15:16:33 -04:00
George Wright
b8f758f5bc Bug 740963 - [Skia] Handle non-multiple-of-two dash lengths in HelpersSkia::StrokeOptionsToPaint(). r=jrmuizel 2012-03-30 17:36:34 -04:00
Bas Schouten
2bdf71a9a7 Bug 738691 - Part 1: Add CopyGlyphsToBuilder API. r=jrmuizel 2012-03-29 20:53:44 +02:00
Jeff Muizelaar
b91dddfcfa Bug 738919. Accept dash arrays of length > 0. r=mwoodrow
I copied a bug from the skia code here. This fixes the CG
version and puts a note into the skia code.
2012-03-26 22:50:08 -04:00
Bas Schouten
c098f1f9b2 Bug 736134 - Part 1: Add GlyphRenderingOptions API to Azure. r=jrmuizel 2012-03-19 19:20:17 +00:00
Bas Schouten
6e7653caf4 Bug 717302: Make sure to mark transform dirty after resetting to push clip. r=jrmuizel 2012-03-15 20:26:10 +00:00
Jonathan Watt
1374ace393 Bug 729562 - Make the SVG paint methods take an nsRenderingContext, and kill nsSVGRenderState. r=Bas. 2012-03-02 08:28:59 +00:00
Justin Lebar
62dbeeb1ab Bug 731789 - Rename mfbt/StdInt.h to mfbt/StandardInteger.h, so stdint types work from cpp files inside mfbt. r=waldo 2012-02-29 22:56:43 -05:00
Jeff Muizelaar
ec40979a31 Bug 731117. Bound the size of CG surfaces to match cairo. r=bas
This fixes crashes that can happen when we try to create
an image surface from a quartz surface larger than the maximum
size supported by image surfaces.

--HG--
extra : rebase_source : 6ef9c66a91068f75ddef90a3453a7360dd91fa78
2012-02-29 21:30:11 -05:00
Jeff Muizelaar
956ea69c6a Bug 729850. CG: Get the point order correct when transforming a path. r=mwoodrow 2012-02-25 00:35:41 -05:00
Jeff Muizelaar
937c5ca852 Bug 728028. CG: Avoid double transforming filled gradients. r=mwoodrow
When we fixed transformed clips it caused us to double transform gradients. We
fix this by avoiding ::PushClip when drawing gradients. This has the advantage
of saving a save and restore pair and it makes Fill() more closely match
Stroke()
2012-02-25 00:35:39 -05:00
Jeff Muizelaar
a6b24bfbf7 Bug 729145. Don't ignore curves when we don't have a current point. r=mwoodrow
This was a copy & paste typo and is caught by
http://philip.html5.org/tests/canvas/suite/tests/2d.path.quadraticCurveTo.ensuresubpath.2.html
which is not in our test suite.

--HG--
extra : rebase_source : dc77d4bfa4da0d79e97da1e10e72bbd77223e8fa
2012-02-22 17:06:02 -05:00
Bas Schouten
0d910f5ed3 Bug 726951: Correctly use height to normalize mask v-texture coordinate. r=jrmuizel 2012-02-16 04:08:08 +01:00
Jeff Muizelaar
c6320b4170 Bug 726764. Avoid leaking CGPaths when getting text paths. r=joe 2012-02-14 17:59:11 -05:00
George Wright
0635b52db3 Bug 723110. Refactor font code to lay the groundwork for having a ScaledFontFreetype class. r=jrmuizel 2012-02-13 14:58:01 -05:00
Nathan Froyd
b9d5bef2be Bug 724275 - fix -Wswitch warnings; r=jrmuizel 2012-02-04 07:22:47 -05:00
Rafael Ávila de Espíndola
f6cbb34577 Bug 723122 - fix clang build. r=jmuizelaar. 2012-02-02 10:02:06 +01:00
Ed Morley
08314b3ec8 Merge last PGO-green changeset of mozilla-inbound to mozilla-central 2012-01-31 10:52:29 +00:00
Jeff Muizelaar
f687321a23 Bug 720482. Make CG snapshots work more like the other backends. r=joe,mattwoodrow,bas
This has big improvement in the performance of GetImageData() because
we make the snapshot lazily instead of using the vm_copy() method
of CGBitmapContextCreateImage()
2012-01-31 01:46:54 -05:00
Bas Schouten
89db024398 Bug 718730: Allow creating a bitmap from just an A8 texture. r=jrmuizel 2012-01-31 06:15:23 +01:00
Bas Schouten
b6c6b4d6dc Bug 719136: Don't attempt to upload when there's nothing to upload. r=jrmuizel 2012-01-31 06:15:23 +01:00
Marco Castelluccio
1e527c9676 Bug 702158 - [Skia] Get Skia backend working on Linux, part 2 2012-01-31 10:24:27 +09:00
Jeff Muizelaar
c6a61d7d9a Bug 722444. Initialize mData for 0 sized surfaces. r=bgirard
This avoids an invalid free() during destruction found with the
online canvas test suite.

--HG--
extra : rebase_source : e1aeff36e557b045fbaff38d7b46fdf91956ae49
2012-01-30 11:17:42 -05:00