Commit Graph

997 Commits

Author SHA1 Message Date
Matt Woodrow
2258859236 Bug 966543 - Ensure that the MacIOSurfaceTextureHost has taken a ref to the surface before letting the client side object be destroyed. r=nical 2014-02-04 12:25:22 +13:00
Jeff Muizelaar
33d1508c1d Bug 962721. Handle the flip for CopyTexImage2D. r=bjacob
This fixes a regression from b75d69931d4a. This call to CopyTexImage2D was
forgotten during the move to handling the flip in the compositor.
2014-01-31 10:59:14 -05:00
Vladimir Vukicevic
f5982a8788 b=951799, cache uniforms in OGLShaderProgram, part 3 - inline; r=bjacob 2014-01-29 17:53:38 -05:00
Vladimir Vukicevic
2862b29b17 b=951799, cache uniforms in OGLShaderProgram, part 2 - fix LayerProgramProjectionMatrix; r=bjacob 2014-01-29 17:53:38 -05:00
Vladimir Vukicevic
60cf58f1f2 b=951799, cache uniforms in OGLShaderProgram, part 1; r=bjacob 2014-01-29 17:53:37 -05:00
David Zbarsky
b03cdd7b39 Bug 952977: Convert CompositingRenderTargetOGL to gfx::Matrix4x4 r=nical 2014-01-27 15:25:21 -05:00
David Zbarsky
0bbd7b8bd8 Bug 952977: Convert PrepareViewport to gfx::Matrix4x4 r=nical 2014-01-27 15:25:20 -05:00
David Zbarsky
c2e7c2cd0a Bug 952977: Convert OGLShaderProgram to gfx::Matrix r=nical 2014-01-27 15:25:20 -05:00
David Zbarsky
39799d8dbd Bug 952977: Convert GetTextureTransform to gfx::Matrix4x4 r=nical 2014-01-24 17:49:02 -08:00
Nicolas Silva
f9d19b4183 Bug 952507 - Fix locking in double buffered ContentClient. r=nrc 2014-01-24 15:25:04 +01:00
Sotaro Ikeda
b3cfeb5636 Bug 959171 - Fix how to bind EGLImage in GrallocTextureHostOGL. r=nical 2014-01-24 08:30:41 -05:00
Benoit Jacob
67a17b1047 Bug 959448 - Convert most of LayersTypes.h to typed enums - r=nrc
find content/media dom/ipc widget/ gfx/tests gfx/ipc/ gfx/layers/ layout/ -type f | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)LAYERS_\(NONE\|BASIC\|OPENGL\|D3D9\|D3D10\|D3D11\|CLIENT\|LAST\)\($\|[^A-Za-z0-9_]\)/\1LayersBackend::LAYERS_\2\3/g'

find widget gfx/layers/ layout/ -type f | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)BUFFER_\(NONE\)\($\|[^A-Za-z0-9_]\)/\1BufferMode::BUFFER_\2\3/g'

find widget gfx/layers/ layout/ -type f | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)BUFFER_\(BUFFERED\)\($\|[^A-Za-z0-9_]\)/\1BufferMode::\2\3/g'

find gfx/layers/ layout/ -type f | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)CLIP_\(DRAW\|DRAW_SNAPPED\)\($\|[^A-Za-z0-9_]\)/\1DrawRegionClip::\2\3/g'

find gfx/layers/ layout/ -type f | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)CLIP_\(NONE\)\($\|[^A-Za-z0-9_]\)/\1DrawRegionClip::CLIP_\2\3/g'

find gfx/layers/ layout/ -type f | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)SURFACE_\(NONE\|OPAQUE\|SINGLE_CHANNEL_ALPHA\|COMPONENT_ALPHA\)\($\|[^A-Za-z0-9_]\)/\1SurfaceMode::SURFACE_\2\3/g'

find gfx/ipc/ gfx/layers/ layout/ -type f | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)SCALE_\(STRETCH\|SENTINEL\)\($\|[^A-Za-z0-9_]\)/\1ScaleMode::\2\3/g'

find gfx/ipc/ gfx/layers/ layout/ -type f | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)SCALE_\(NONE\)\($\|[^A-Za-z0-9_]\)/\1ScaleMode::SCALE_\2\3/g'
2014-01-23 13:26:41 -05:00
Benoit Jacob
93826fc6b0 Bug 959380 - 4/5 - Make gfxContentType a typed enum - r=jrmuizel
find . -type f | grep -v '\./obj' | grep -v '\.hg' | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)GFX_CONTENT_\(COLOR\|ALPHA\|COLOR_ALPHA\|SENTINEL\)\($\|[^A-Za-z0-9_]\)/\1gfxContentType::\2\3/g'
2014-01-23 13:26:40 -05:00
Benoit Jacob
3369ca8bb6 Bug 959380 - 2/5 - Make gfxImageFormat a typed enum - r=jrmuizel
find . -type f | grep -v \./obj | grep -v \.hg | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)gfxImageFormat\(ARGB32\|RGB24\|A8\|A1\|RGB16_565\|Unknown\)\($\|[^A-Za-z0-9_]\)/\1gfxImageFormat::\2\3/g'
2014-01-23 13:26:40 -05:00
Carsten "Tomcat" Book
9b33885e9c Backed out changeset 24668220c9a4 (bug 952507) for OS X Build Bustage on a CLOSED TREE 2014-01-23 15:50:14 +01:00
Nicolas Silva
8ffc85202e Bug 952507 - Fix locking in double buffered ContentClient. r=nrc 2014-01-23 15:27:06 +01:00
Dan Glastonbury
16a54e4041 Bug 879663 - Check for GL Context validity in Pause()/Resume(). r=bjacob 2014-01-22 08:45:35 +10:00
Ryan VanderMeulen
ad33ff9d95 Backed out changeset 60698fb6579b (bug 959171) for B2G mochitest-3 crashes. 2014-01-21 15:07:48 -05:00
Sotaro Ikeda
3393c67ef8 Bug 961405 - Change GraphicBufferLocked as to use AtomicRefCountedWithFinalize. r=nical, r=pchang, r=doublec, r=mikeh 2014-01-21 13:53:48 -05:00
Sotaro Ikeda
aea11e910c Bug 959171 - Fix how to bind EGLImage in GrallocTextureHostOGL. r=nical 2014-01-21 11:49:38 -05:00
Sushil Chauhan
dcb369e13a Bug 953303 - HwcComposer2D should honor HWC_HINT_CLEAR_FB set by hwcomposer. r=ncameron 2014-01-17 18:55:30 -08:00
Ryan VanderMeulen
27e42e40e3 Backed out changeset 8a5c1027e6e6 (bug 953303) for bustage. 2014-01-17 14:50:58 -05:00
Sushil Chauhan
497282b936 Bug 953303 - HwcComposer2D should honor HWC_HINT_CLEAR_FB set by hwcomposer. r=ncameron 2014-01-17 11:09:01 -08:00
Bas Schouten
369a4507bb Bug 960254 - Part 2: Update some callers that write to DataSourceSurface. r=jrmuizel 2014-01-16 13:17:23 +01:00
Bas Schouten
370e329706 Backed out 5 changesets (bug 960254, bug 960354)
Backed out changeset 4441c32c724c (bug 960254)
Backed out changeset 4aecc5ca2a19 (bug 960254)
Backed out changeset 9f499e5f7954 (bug 960354)
Backed out changeset fd9b6b044a5a (bug 960354)
Backed out changeset c1f6fbc397bd (bug 960354)
2014-01-16 14:36:53 +01:00
Bas Schouten
e40ceb7ddd Bug 960354 - Part 2: Update some callers that write to DataSourceSurfaces. r=jrmuizel 2014-01-16 13:17:23 +01:00
David Zbarsky
3e6531d3e8 Bug 952977: Switch GL world transform to gfx::Matrix r=nical 2014-01-16 02:22:19 -05:00
Solomon Chiu
66b3bfc35f Bug 958420 - The follow up bug for removing one additional PIXEL_FORMAT_A_8. r=mwu. 2014-01-15 18:06:53 +08:00
Solomon Chiu
374ffb7755 Bug 958420 - Remove obsolete code trying to use PIXEL_FORMAT_A_8 with gralloc. r=gal, r=pchang 2014-01-13 10:00:34 +08:00
Benoit Jacob
06f7a9c4a2 Bug 958375 - 8/9 - Make remaining Moz2D enums typed - r=Bas
Specifically:
  r=Bas for manual changes
  f=Bas for automatic changes
See attachments on the bug for the specific breakdown.
2014-01-10 14:06:17 -05:00
Benoit Jacob
55e7c24065 Bug 958375 - 4/9 - Make SurfaceFormat a typed enum - r=Bas
Specifically:
  r=Bas for manual changes
  f=Bas for automatic changes
See attachments on the bug for the specific breakdown.
2014-01-10 14:06:16 -05:00
Benoit Jacob
6747f7385e Bug 958369 - 3/5 - Make SharedTextureShareType and SharedTextureBufferType typed enums - r=jgilbert 2014-01-10 13:55:23 -05:00
Morris Tseng
b631d4766c Bug 893304 - Convert CanvasClient to new TextureClint/Host and replace SurfaceDescriptors with TextureClients inside SharedSurfaces. r=nical, r=snorp, r=jgilbert, r=bjacob 2014-01-10 08:06:06 -05:00
Andreas Pehrson
797774eebe Bug 877115 - Remove GetTexImage from GLContext helper. r=nical 2014-01-08 09:37:58 +01:00
Markus Stange
7231bd727d Bug 958025 - Only enable GL_SCISSOR_TEST when we know that we have a useful scissor rect. r=bjacob 2014-01-09 17:59:32 +01:00
Daniel Holbert
fc4254eb78 Bug 957499: Fix SetCompositor() signature in subclasses of NewTextureSource, to actually override the parent's impl (and to fix -Woverloaded-virtual build warnings). r=nical 2014-01-08 11:25:52 -08:00
Markus Stange
6bacda007f Bug 956266 - Don't rebuffer quad vertex + texture coordinates when drawing simple quads in CompositorOGL. r=nrc 2014-01-08 13:00:04 +01:00
Markus Stange
5085d2822a Backing out changeset 1ff04cca465b (bug 956266) due to compilation failures on Android. 2014-01-08 11:36:13 +01:00
Markus Stange
d7c5f41aa5 Bug 956266 - Don't rebuffer quad vertex + texture coordinates when drawing simple quads in CompositorOGL. r=nrc 2014-01-08 10:31:07 +01:00
Benoit Jacob
8bd36836f4 Bug 956401 - 7/9 - CompositorOGL::{Begin,End}Frame do not need to touch the scissor rect - r=nrc 2014-01-07 15:02:19 -05:00
Benoit Jacob
e1001f9bd1 Bug 956401 - 6/9 - Remove Compositor::SaveState and Compositor::RestoreState - r=nrc 2014-01-07 15:02:19 -05:00
Benoit Jacob
b94f17373c Bug 956401 - 3/9 - Let DrawQuadInternal use ScopedScissorRect - r=nrc 2014-01-07 15:02:18 -05:00
Benoit Jacob
8a1c3fc36c Bug 956401 - 1/9 - SetRenderTarget doesn't need to touch the scissor rect - r=nrc 2014-01-07 15:02:18 -05:00
Benoit Jacob
e9a9d5ea27 Bug 956141 - Move y-flipping feature out of GLContext, into CompositorOGL - r=jgilbert,nrc 2014-01-07 15:02:18 -05:00
Benoit Jacob
f820c67cd0 Bug 950903 - 6/8 - Remove GLContext::GetNativeData - r=jgilbert 2014-01-07 15:02:18 -05:00
Nicolas Silva
34dd5fed54 Bug 938591 - Fix a test on a CLOSED TREE. r=me 2014-01-07 19:00:26 +01:00
Nicolas Silva
89a1de2117 Bug 938591 - Use texture flags in DataTextureSource + D3D9/11 fixes. r=nrc 2014-01-07 17:20:11 +01:00
Ryan VanderMeulen
62b4fec0e9 Backed out changeset 403ab3213879 (bug 893304) for bustage. 2014-01-07 10:07:32 -05:00
Morris Tseng
69820ceefc Bug 893304 - Convert CanvasClient to new TextureClint/Host and replace SurfaceDescriptors with TextureClients inside SharedSurfaces. r=nical, r=snorp, r=jgilbert, r=bjacob 2014-01-07 09:58:03 -05:00
Benoit Jacob
4bf0659d81 Bug 949819 - Move remaining ReadPixels and GetTexImage helpers out of GLContext - r=jgilbert 2014-01-02 10:17:29 -05:00
Benoit Jacob
457cb85bb0 Bug 949814 - Remove GetEGLContext and GetLibraryEGL from GLContext - r=jgilbert 2014-01-02 10:17:25 -05:00
Andreas Pehrson
2c6b1f5c4f Bug 877115 - [Moz2Dify] Part 6. Moz2Dify SharedSurface_EGLImage::GetPixels. r=nical 2013-12-16 15:50:53 -05:00
Andreas Pehrson
3c4223ff5d Bug 877115 - [Moz2Dify] Part 3. Change gfxIntSize to gfx::IntSize in GLContext::OffscreenSize and dependendent classes. r=nical 2013-12-10 17:11:58 +01:00
Ms2ger
9b8e245bf9 Bug 950143 - Remove the implicit conversion operator from nsIntSize to IntSize; r=roc 2013-12-31 10:06:12 +01:00
Tor Arvid Lund
4476fdeea4 Bug 950677 - Change all remaining gfxIntSize -> IntSize refs. r=nical 2013-12-20 11:46:30 -05:00
Tor Arvid Lund
9730e53aed Bug 950677 - gfxIntSize -> IntSize for Texture* classes. r=nical 2013-12-20 11:46:30 -05:00
Tor Arvid Lund
63ea87829c Bug 950677 - Change gfxIntSize -> gfx::IntSize some places in layers/ipc. r=nical 2013-12-20 11:46:28 -05:00
Benoit Jacob
40cfd97476 Bug 950203 - Let GfxInfo on Android create its own GL context to get GL strings, instead of waiting on the compositor's - r=jrmuizel 2013-12-18 15:49:13 -05:00
Ryan VanderMeulen
c8efa29df1 Backed out changeset 96b0ddfc63f7 (bug 893304) for causing bug 950589. 2013-12-16 22:49:02 -05:00
Nicholas Cameron
09d8e541fe Bug 950504. Remove MatrixForThebesMatrix. r=mattwoodrow
--HG--
extra : rebase_source : 77103221abbb55d23f9d399d4973ef0b8f269079
2013-12-16 11:17:58 +13:00
Morris Tseng
d39f34dbbd Bug 893304 - Convert CanvasClient to new TextureClient/Host. r=nical, r=snorp, r=jgilbert 2013-12-13 12:45:13 -05:00
Tor Arvid Lund
1fb97ff74a Bug 929513 - Replace gfxIntSize in layers/AutoOpenSurface.h r=nical
This rippled into other replacements in layers and in gfx/gl.
2013-12-13 18:32:06 +01:00
Tor Arvid Lund
af7e76f848 Bug 929513 - Replace some instances of gfxIntSize with gfx::IntSize r=nical 2013-12-13 18:32:02 +01:00
Dan Glastonbury
79b2dce11c Bug 942506 - Remove Bind method from AutoBindTexture - r=bjacob
Refactored the places where AutoBindTexture::Bind was used. Replaced with a
simplier class that just saves the texture id bound to a texture unit. The
texture is bound directly instead of via the helper.

I didn't eliminate all occurences of AutoBindTexture because I a few places it
was cleaner than using AutoSaveTexture + TextureSourceOGL->BindTexture.

I extracted the cut'n'paste code that bound the mask texture to program into
BindMaskTextureForProgram. I dislike cut'n'paste code in multiple spots.
2013-12-10 16:50:52 +10:00
Dan Glastonbury
defcd6a300 Bug 942506 - Remove ApplyFilterToBoundTexture from GLContext - r=bjacob
Move it to CompositorOGL.
2013-12-09 14:07:18 +10:00
Dan Glastonbury
c31338cb36 Bug 942502 - Move EGLImage/GraphicBuffer-specific helpers out of GLContext - r=bjacob
Extracted methods CreateEGLImageForNativeBuffer and DestroyEGLImage from
GLContext and moved to EGLImageHelpers.[h|cpp]. Renamed to
EGLImageCreateFromNativeBuffer and EGLImageDestroy.
2013-12-10 15:47:19 +10:00
Nicolas Silva
f8d884874b Bug 897452 - Part 3 - Clean up some unused code after PTexture change - r=mattwoodrow 2013-12-11 20:44:47 -05:00
Nicolas Silva
0f1647175e Bug 897452 - Part 2 - PTexture deallocation logic - r=sotaro,bjacob 2013-12-11 20:44:45 -05:00
Ryan VanderMeulen
f9166936cb Backed out 17 changesets (bug 897452) for OSX crashes on a CLOSED TREE.
Backed out changeset 11ad8608bc27 (bug 897452)
Backed out changeset 6bcc629e76f9 (bug 897452)
Backed out changeset b91c858a43f5 (bug 897452)
Backed out changeset 38ba49ee3e97 (bug 897452)
Backed out changeset ea184ef84762 (bug 897452)
Backed out changeset 686cc5122149 (bug 897452)
Backed out changeset 3685a8018e49 (bug 897452)
Backed out changeset be7ef6240068 (bug 897452)
Backed out changeset f95c20e70947 (bug 897452)
Backed out changeset 4a370d2a1c62 (bug 897452)
Backed out changeset 1222f6ab66d2 (bug 897452)
Backed out changeset 5e9d3c681ee9 (bug 897452)
Backed out changeset 3b9ddce12b7a (bug 897452)
Backed out changeset 7aec6387f3e9 (bug 897452)
Backed out changeset eb1fe464fdaf (bug 897452)
Backed out changeset 07deaa53b6fd (bug 897452)
Backed out changeset ddab7d071d69 (bug 897452)
2013-12-11 14:52:50 -05:00
Nicolas Silva
82e5ac3f48 Bug 897452 - Part 3 - Clean up some unused code after PTexture change - r=mattwoodrow 2013-12-11 13:05:13 -05:00
Nicolas Silva
5a8009c28f Bug 897452 - Part 2 - PTexture deallocation logic - r=sotaro,bjacob 2013-12-11 13:05:11 -05:00
Edwin Flores
ef0e39f7ad Bug 934412 - Pass surface image format into CreateTextureImage r=nical 2013-12-11 15:14:16 +01:00
Nicholas Cameron
f215004cc4 Bug 946958 part 4. Tidy up interaction with widgets. r=kats 2013-12-09 14:40:59 +13:00
Nicholas Cameron
394fe4e5f2 Bug 946958 part 1. Remove GetWidgetSize. r=mattwoodrow 2013-12-09 14:40:59 +13:00
Birunthan Mohanathas
759ab69b0a Bug 713082 - Part 2: Rename Util.h to ArrayUtils.h. r=Waldo
--HG--
rename : mfbt/Util.h => mfbt/ArrayUtils.h
2013-12-08 21:52:54 -05:00
Phil Ringnalda
617e2b2636 Backed out 7 changesets (bug 946958, bug 865033)
Backed out changeset 6dd0a6cb9ab3 (bug 946958)
Backed out changeset 498152aec5b1 (bug 946958)
Backed out changeset 7d035322f51d (bug 946958)
Backed out changeset 99f8ad7561ef (bug 946958)
Backed out changeset 4639c5abea80 (bug 946958)
Backed out changeset 9d1a4d83eccf (bug 865033)
Backed out changeset 41839e4026bc (bug 865033)
2013-12-08 18:43:45 -08:00
Nicholas Cameron
ebb90c9836 Bug 946958 part 4. Tidy up interaction with widgets. r=kats 2013-12-09 14:40:59 +13:00
Nicholas Cameron
feeffb08cf Bug 946958 part 1. Remove GetWidgetSize. r=mattwoodrow 2013-12-09 14:40:59 +13:00
Dan Glastonbury
e794173f4c Bug 942507 - GLContext doesn't need to have userdata. r=bjacob 2013-12-06 10:23:16 -05:00
Nicholas Cameron
91014467fd Bug 893301. Rollup patch - new textures content. r=nical,nrc 2013-12-06 07:39:22 +13:00
Benoit Jacob
a08afe9077 Back out bug 893301 for accidentally disabling gralloc for thebes layers on B2G - no review, bustage fix on a CLOSED TREE 2013-12-04 12:19:50 -05:00
Benoit Jacob
b253073c22 Bug 942499 - Part 2: Move CanUploadNonPowerOfTwo out of GLContext; remove the gfx.textures.poweroftwo.force-enabled preference - r=gal,BenWa 2013-12-03 13:44:38 -05:00
Benoit Jacob
1dea809c09 Bug 942499 - Part 1: Move CanUploadSubTextures and WantsSmallTiles out of GLContext - r=BenWa 2013-12-03 13:44:38 -05:00
Benoit Jacob
aeba86a7b1 Bug 942509 - Move Upload* functions to new GLUploadHelpers files - r=gal,jgilbert 2013-12-03 13:44:38 -05:00
Benoit Jacob
ccea62e706 Bug 942501 - Part 3: move CreateTextureImage and TileGenFunc out of GLContext - r=BenWa 2013-12-03 13:44:38 -05:00
Benoit Jacob
f197bdfbfe Bug 942505 - Move everything SharedHandle-related out of GLContext - r=jgilbert 2013-12-03 13:44:38 -05:00
Nicolas Silva
aec70a903e Bug 929506 - Check that gl->MakeCurrent returns true when using OpenGL on the Compositor side. r=bjacob 2013-12-03 11:44:46 +01:00
Nicholas Cameron
fb1e90c4bd Bug 893301. Some rebasing fixes. r=nical 2013-11-28 10:16:35 +13:00
Ryan VanderMeulen
9e82f773a2 Merge inbound to m-c. 2013-12-02 16:39:00 -05:00
Benoit Girard
e4183dfbd6 Bug 944866 - Pat 1: Add DrawLines to Compositor.h and implement for OGL. r=gal 2013-12-01 15:54:46 -05:00
Dan Glastonbury
1d20a3aa09 Bug 830881 - Port layerscope GL changes to new layers. r=vlad 2013-11-29 14:11:49 +10:00
Benoit Jacob
fad9e41e04 Bug 942503 - Move BlitTextureImage out of GLContext - r=jgilbert 2013-11-28 15:57:19 -05:00
Benoit Jacob
7fd983a4b5 Bug 944172 - Move DecomposeIntoNoRepeatTriangles out of GLContext - r=BenWa 2013-11-28 15:57:19 -05:00
Andreas Pehrson
801b8841c8 Bug 907292 - Change gfxImageSurface to gfx::DataSourceSurface in TextureHost et al 2013-11-27 10:59:01 +01:00
Nicholas Cameron
f1b0c4184f Bug 924403. Rename OGL shaders files. r=mattwoodrow
--HG--
rename : gfx/layers/opengl/LayerManagerOGLProgram.cpp => gfx/layers/opengl/OGLShaderProgram.cpp
rename : gfx/layers/opengl/LayerManagerOGLProgram.h => gfx/layers/opengl/OGLShaderProgram.h
rename : gfx/layers/opengl/LayerManagerOGLShaders.h => gfx/layers/opengl/OGLShaders.h
rename : gfx/layers/opengl/LayerManagerOGLShaders.txt => gfx/layers/opengl/OGLShaders.txt
2013-11-27 11:15:17 +13:00
Nicolas Silva
532313927f Bug 924403 - Send non-OMTC GL layers into oblivion. r=nrc 2013-11-27 11:15:17 +13:00
David Anderson
c06bd5c0fb Only composite changed areas in the software compositor (bug 882447, r=mattwoodrow,nrc). 2013-11-21 11:25:16 -08:00
James Willcox
bd9fd5c2da Bug 928804 - Always use an up-to-date texture transform when compositing SharedTextureSourceOGL r=nical 2013-11-19 08:41:57 -06:00
Benoit Jacob
877d71ca5f Bug 938970 - 5/5. Switch gfx/layers to UNIFIED_SOURCES - r=ehsan,mattwoodrow 2013-11-17 21:07:08 -05:00
Benoit Jacob
45d86c800b Bug 938970 - 4/5. Some gralloc-related tweaks required to build with UNIFIED_SOURCES - r=Bas 2013-11-17 21:06:25 -05:00