Commit Graph

377 Commits

Author SHA1 Message Date
tomhudson@google.com
32992605aa Remove compiler warnings (gcc on Linux).
codereview.appspot.com/4922052/



git-svn-id: http://skia.googlecode.com/svn/trunk@2170 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-08-25 15:37:03 +00:00
reed@google.com
00245c94cd test subpixeltext
git-svn-id: http://skia.googlecode.com/svn/trunk@2161 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-08-23 15:30:44 +00:00
bsalomon@google.com
0b77d6892b Make GrGLInterface a per-GrContext refcounted object rather than a global
Review URL: http://codereview.appspot.com/4901046/



git-svn-id: http://skia.googlecode.com/svn/trunk@2140 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-08-19 13:28:54 +00:00
bsalomon@google.com
583a1e3850 Fixed r2125. Identical change but also moves GrTesselatedPathRenderer.h to src dir.
Verbal SGTM from Tom who reviewed the original version at: http://codereview.appspot.com/4894050/



git-svn-id: http://skia.googlecode.com/svn/trunk@2129 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-08-17 13:42:46 +00:00
vandebo@chromium.org
b4f4c02eff Revert "Make GrDrawTarget.h and GrPathRenderer.h be private headers"
This reverts commit r2125

Looks like GrPathRenderer.h is used from gpu/include/GrTesselatedPathRenderer.h

There also seems to be a dependency tracking problem, because r2125 didn't go red, but the next revision did.

Review URL: http://codereview.appspot.com/4896048

git-svn-id: http://skia.googlecode.com/svn/trunk@2127 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-08-16 23:20:31 +00:00
bsalomon@google.com
8b4a64d318 Make GrDrawTarget.h and GrPathRenderer.h be private headers
Review URL: http://codereview.appspot.com/4894050/



git-svn-id: http://skia.googlecode.com/svn/trunk@2125 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-08-16 20:38:11 +00:00
yangsu@google.com
ef7bdfac61 Added Debugger to Sample App, off by default
Removed CocoaDebugger from experimental
Slight changes to SkOSMenu
Bug fixes for NetPipeReader and DrawingBoard


git-svn-id: http://skia.googlecode.com/svn/trunk@2102 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-08-12 14:27:47 +00:00
reed@google.com
43e9f20f4b add serialization to SkLayerRasterizer
git-svn-id: http://skia.googlecode.com/svn/trunk@2088 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-08-09 19:01:50 +00:00
reed@google.com
18dc47731f use common subclass SkPath2DPathEffect, which can be serialized
git-svn-id: http://skia.googlecode.com/svn/trunk@2087 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-08-09 18:47:40 +00:00
yangsu@google.com
f121b05254 Removed networking dependencies from SampleApp, Pipe now off by default
git-svn-id: http://skia.googlecode.com/svn/trunk@2060 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-08-08 16:02:51 +00:00
yangsu@google.com
db03eaa371 Added transitions and net pipe to SampleApp, updated gyp files
http://codereview.appspot.com/4839047/
http://codereview.appspot.com/4801080/


git-svn-id: http://skia.googlecode.com/svn/trunk@2059 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-08-08 15:37:23 +00:00
reed@google.com
0e0c94c8e9 disable test
git-svn-id: http://skia.googlecode.com/svn/trunk@2044 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-08-04 18:11:01 +00:00
reed@google.com
87fac4abd7 retool SkEvent to own its target ID or target proc
git-svn-id: http://skia.googlecode.com/svn/trunk@2041 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-08-04 13:50:17 +00:00
yangsu@google.com
921091f29e Set up global options for SampleApp and now allows SampleApp to request menu items from the slides
http://codereview.appspot.com/4807056/


git-svn-id: http://skia.googlecode.com/svn/trunk@2024 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-08-02 13:39:12 +00:00
bsalomon@google.com
5bfc21761e cleanup GrGLTexture / GrGLRenderTarget cons. Make GrRenderTarget aware of its msaa sample count.
Review URL: http://codereview.appspot.com/4833045/



git-svn-id: http://skia.googlecode.com/svn/trunk@1996 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-29 20:29:05 +00:00
tomhudson@google.com
2c2508d2ed More variable initializations and curly braces to avoid Linux compiler
warnings.



git-svn-id: http://skia.googlecode.com/svn/trunk@1993 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-29 13:44:30 +00:00
junov@google.com
1d32978f7e Fixing the ignore transform flag in Ganesh with mask filter and drawBitmap
TEST=SampleApp/Texture Domain
BUG=http://code.google.com/p/skia/issues/detail?id=335
REVIEW=http://codereview.appspot.com/4803052/



git-svn-id: http://skia.googlecode.com/svn/trunk@1987 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-28 20:10:09 +00:00
epoger@google.com
ec3ed6a5eb Automatic update of all copyright notices to reflect new license terms.
I have manually examined all of these diffs and restored a few files that
seem to require manual adjustment.

The following files still need to be modified manually, in a separate CL:

android_sample/SampleApp/AndroidManifest.xml
android_sample/SampleApp/res/layout/layout.xml
android_sample/SampleApp/res/menu/sample.xml
android_sample/SampleApp/res/values/strings.xml
android_sample/SampleApp/src/com/skia/sampleapp/SampleApp.java
android_sample/SampleApp/src/com/skia/sampleapp/SampleView.java
experimental/CiCarbonSampleMain.c
experimental/CocoaDebugger/main.m
experimental/FileReaderApp/main.m
experimental/SimpleCocoaApp/main.m
experimental/iOSSampleApp/Shared/SkAlertPrompt.h
experimental/iOSSampleApp/Shared/SkAlertPrompt.m
experimental/iOSSampleApp/SkiOSSampleApp-Base.xcconfig
experimental/iOSSampleApp/SkiOSSampleApp-Debug.xcconfig
experimental/iOSSampleApp/SkiOSSampleApp-Release.xcconfig
gpu/src/android/GrGLDefaultInterface_android.cpp
gyp/common.gypi
gyp_skia
include/ports/SkHarfBuzzFont.h
include/views/SkOSWindow_wxwidgets.h
make.bat
make.py
src/opts/memset.arm.S
src/opts/memset16_neon.S
src/opts/memset32_neon.S
src/opts/opts_check_arm.cpp
src/ports/SkDebug_brew.cpp
src/ports/SkMemory_brew.cpp
src/ports/SkOSFile_brew.cpp
src/ports/SkXMLParser_empty.cpp
src/utils/ios/SkImageDecoder_iOS.mm
src/utils/ios/SkOSFile_iOS.mm
src/utils/ios/SkStream_NSData.mm
tests/FillPathTest.cpp
Review URL: http://codereview.appspot.com/4816058

git-svn-id: http://skia.googlecode.com/svn/trunk@1982 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-28 14:26:00 +00:00
epoger@google.com
fd03db0fe9 Manually update copyright notices in files that defied the automated process
used in http://codereview.appspot.com/4816058/ ('Automatic update of all copyright notices to reflect new license terms.')

Note that the following files have been left alone, because they name
copyright holders outside of Google.  Please let me know if we need to update
these files:

experimental/CiCarbonSampleMain.c
src/opts/memset16_neon.S
src/opts/memset32_neon.S
src/opts/opts_check_arm.cpp
src/ports/SkDebug_brew.cpp
src/ports/SkMemory_brew.cpp
src/ports/SkOSFile_brew.cpp
Review URL: http://codereview.appspot.com/4806054

git-svn-id: http://skia.googlecode.com/svn/trunk@1981 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-28 14:24:55 +00:00
junov@google.com
61d46a0c50 This new test provides a test case for
http://code.google.com/p/skia/issues/detail?id=332

REVIEW=http://codereview.appspot.com/4808058/



git-svn-id: http://skia.googlecode.com/svn/trunk@1979 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-28 13:34:31 +00:00
reed@google.com
ceff2870bc add simple test for writepixels
git-svn-id: http://skia.googlecode.com/svn/trunk@1972 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-27 18:21:37 +00:00
senorblanco@chromium.org
4a947d264b Fix kernel width calculation in GPU-based Gaussian blur. When converting the
sigma value to a kernel width, it should be rounded up.  Otherwise, for small
sigmas, the edge pixels of the kernel may be missing.



git-svn-id: http://skia.googlecode.com/svn/trunk@1891 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-18 21:48:35 +00:00
senorblanco@chromium.org
e36ddf0131 More GPU blur fixes.
- clamp the max. radius to 128, as the software path does
- use a more accurate radius-to-sigma conversion (0.6 instead of 0.6666)
- make SampleBlur derive from SampleView, not SkView, so benchmark mode ('f')
works
- implement a new BigBlur sample to test large radii

Review URL:  http://codereview.appspot.com/4726043



git-svn-id: http://skia.googlecode.com/svn/trunk@1871 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-15 14:28:16 +00:00
bsalomon@google.com
84223118f7 Remove some cruft from SampleApp.cpp
Review URL: http://codereview.appspot.com/4724042



git-svn-id: http://skia.googlecode.com/svn/trunk@1858 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-14 14:45:44 +00:00
bsalomon@google.com
098e96df6a Add DeviceManager to SampleWindow
Review URL: http://codereview.appspot.com/4715045/


git-svn-id: http://skia.googlecode.com/svn/trunk@1857 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-14 14:30:46 +00:00
reed@google.com
2377b52ee4 add more angles, and test lineartext
git-svn-id: http://skia.googlecode.com/svn/trunk@1844 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-13 14:06:19 +00:00
reed@google.com
4de4d60a1b add sample for 2ptradial where we divide by zero
git-svn-id: http://skia.googlecode.com/svn/trunk@1832 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-08 20:12:55 +00:00
tomhudson@google.com
d6caf2eefd Replace reference parameter with pointer so that we can pass NULL
in SkDrawPaint::add(); check the pointer when it's used to avoid
dereferencing NULL.

Add title to Animator sample slide.



git-svn-id: http://skia.googlecode.com/svn/trunk@1825 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-08 14:41:12 +00:00
bsalomon@google.com
22c5deaf75 Fix div by zero in GPU degenerate radials (and add sample and gm baselines)
Review URL: http://codereview.appspot.com/4675062/


git-svn-id: http://skia.googlecode.com/svn/trunk@1817 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-07 14:38:03 +00:00
mike@reedtribe.org
6757a1a2bb Be sure to call context->flush() before we swapbuffers, otherwise we might miss
some deferred drawing calls (esp. text). SkGpuCanvas was doing this for us, so
now we have to do it explicitly.



git-svn-id: http://skia.googlecode.com/svn/trunk@1813 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-07 01:10:34 +00:00
bsalomon@google.com
840e9f3776 make sure size change posts at sample app startup.
git-svn-id: http://skia.googlecode.com/svn/trunk@1811 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-06 21:59:09 +00:00
reed@google.com
f78e78da58 add option to test 1x1 bitmapshader
git-svn-id: http://skia.googlecode.com/svn/trunk@1809 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-06 21:01:29 +00:00
reed@google.com
13636fe4b9 add debugging code for degenerate gradients (to be removed later)
git-svn-id: http://skia.googlecode.com/svn/trunk@1805 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-06 18:25:08 +00:00
reed@google.com
5f068f15cc notice if the bitmap failed to load
git-svn-id: http://skia.googlecode.com/svn/trunk@1804 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-06 18:16:00 +00:00
reed@google.com
a03c97943b fix typo:
this-make3DReady()

should be

this->make3DReady()



git-svn-id: http://skia.googlecode.com/svn/trunk@1803 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-06 18:01:20 +00:00
reed@google.com
29038ed2ab always use grcontext to get the bits to the screen
git-svn-id: http://skia.googlecode.com/svn/trunk@1802 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-06 17:56:47 +00:00
reed@google.com
57c8d833cd revert prev hack around make3DReady
git-svn-id: http://skia.googlecode.com/svn/trunk@1799 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-06 15:27:03 +00:00
reed@google.com
c157531aa2 force grcontext to be created at startup
git-svn-id: http://skia.googlecode.com/svn/trunk@1798 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-06 15:11:07 +00:00
reed@google.com
1b195bc8fd fix return value for make_bitmap
git-svn-id: http://skia.googlecode.com/svn/trunk@1797 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-06 15:10:25 +00:00
reed@google.com
3cec4d71e6 check-point for testing drawBitmap [raster,gpu] -> [raster,gpu]
git-svn-id: http://skia.googlecode.com/svn/trunk@1796 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-06 13:59:47 +00:00
epoger@google.com
9ef2d8382f Reverting r1775 at Mike and Brian's request
git-svn-id: http://skia.googlecode.com/svn/trunk@1786 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-01 21:12:20 +00:00
junov@google.com
22c8bb8ebd Fixing several issues with rendering blurred bitmaps with Ganesh
BUG=http://code.google.com/p/skia/issues/detail?id=305
REVIEW=http://codereview.appspot.com/4630073/



git-svn-id: http://skia.googlecode.com/svn/trunk@1775 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-30 22:16:06 +00:00
senorblanco@chromium.org
78b8253c0a Parse SampleApp command line for a test name. If an argument is passed to
SampleApp on the command line, interpret it as a test name.  If it's a valid
test, open that test at startup.

Review URL:  http://codereview.appspot.com/4661054/



git-svn-id: http://skia.googlecode.com/svn/trunk@1742 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-28 19:44:03 +00:00
junov@google.com
d935cfbd79 Adding support for shadows when drawing bitmaps with skia gpu device
Added code to handle this case in SkGpuDevice::drawBitmap
Added test to cover this use case in SampleTextureDomain.cpp

BUG=http://code.google.com/p/chromium/issues/detail?id=83440
REVIEW=http://codereview.appspot.com/4530068/



git-svn-id: http://skia.googlecode.com/svn/trunk@1730 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-27 20:48:23 +00:00
reed@google.com
5667afc5cb remove drawShape from canvas api
git-svn-id: http://skia.googlecode.com/svn/trunk@1723 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-27 14:42:15 +00:00
yangsu@google.com
ae8a2e5cba Modified the iOS pdf data code to use steam.copytoData()
git-svn-id: http://skia.googlecode.com/svn/trunk@1721 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-24 21:09:39 +00:00
reed@google.com
8a85d0c493 replace detach/getStream apis on dynamicwstream with SkData
http://codereview.appspot.com/4657046/



git-svn-id: http://skia.googlecode.com/svn/trunk@1714 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-24 19:12:12 +00:00
yangsu@google.com
501775e5ac Added helper methods for changing samples, getting sample titles, and extracting pdf Data
http://codereview.appspot.com/4626073/


git-svn-id: http://skia.googlecode.com/svn/trunk@1704 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-24 16:04:50 +00:00
Scroggo
d3aed39ab1 Unify handleTouch and handleClick in SampleApp.
Allow each sample to handle clicks in Android SampleApp.

Remove SampleWindow::handleTouch.

Allow an SkWindow to have multiple clicks.

Add an owner pointer to SkView::Click.

Reviewed at http://codereview.appspot.com/4643052/


git-svn-id: http://skia.googlecode.com/svn/trunk@1673 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-22 13:26:56 +00:00
Scroggo
62b65b0913 SampleApp fixes.
On Android, delete gWindow before calling application_term, avoiding a crash
each time the app closes.  Also make sure the screen is redrawn when resuming.

On Linux, delete gWindow to avoid memory leak.

In general, allow moving from sample 0 to the last sample.

Reviewed at http://codereview.appspot.com/4639060


git-svn-id: http://skia.googlecode.com/svn/trunk@1661 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-21 16:01:26 +00:00
Scroggo
8ac0d542b0 Add a way to save to PDF in SampleApp on Android and elsewhere.
In Android, add the PDF file to downloads, so it can be opened.

Reviewed at http://codereview.appspot.com/4638052/


git-svn-id: http://skia.googlecode.com/svn/trunk@1659 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-21 14:44:57 +00:00
mike@reedtribe.org
90bb49747b inherit from SampleView
git-svn-id: http://skia.googlecode.com/svn/trunk@1646 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-18 01:35:18 +00:00
Scroggo
b4490c7435 Minor fixes for SampleApp.
- Add a comment for invalidating in onSizeChange.
- Call base constructor for SkOSWindow_Unix.
- Call onSizeChange in SampleWindow constructor so fZoomCenter gets set.


git-svn-id: http://skia.googlecode.com/svn/trunk@1627 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-17 13:53:05 +00:00
bsalomon@google.com
e97f0856a8 Add createNewCompatibleDevice. Allow devices to have a NULL factory and saveLayer will fall back on createNewCompatibleDevice.
Review URL: http://codereview.appspot.com/4633044/



git-svn-id: http://skia.googlecode.com/svn/trunk@1625 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-17 13:10:25 +00:00
Scroggo
a54e2f61f8 Use SkTouchGesture to handle pinch events in Android SampleApp.
http://codereview.appspot.com/4631043/


git-svn-id: http://skia.googlecode.com/svn/trunk@1624 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-17 12:46:17 +00:00
reed@google.com
af951c9bc4 make SkDevice constructors explicit between offscreen and on/direct
http://codereview.appspot.com/4632044/



git-svn-id: http://skia.googlecode.com/svn/trunk@1620 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-16 19:10:39 +00:00
Scroggo
3e7ff9f31d Better fix for changing the viewport in sample app.
Create a platform description and base the size on the SkWindow
in order to create a RenderTarget, which results in changing the
viewport.  This allows us to use only GR calls.

In the Android sample app, fix the problem where nothing is drawn
in the first frame, and default to drawing in GL.

Reviewed at http://codereview.appspot.com/4642043/


git-svn-id: http://skia.googlecode.com/svn/trunk@1615 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-16 15:31:26 +00:00
Scroggo
716a0387ca Fix the mac build of the SampleApp.
My call to glViewport breaks the mac build, but benefits the Android
and linux builds.  Fix the mac build until I come up with a better
solution.

Reviewed at http://codereview.appspot.com/4628042/


git-svn-id: http://skia.googlecode.com/svn/trunk@1612 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-16 14:00:15 +00:00
senorblanco@chromium.org
129b8e3237 Implement edge AA for concave polys in the tesselated path renderer.
Review URL:  http://codereview.appspot.com/4571072/



git-svn-id: http://skia.googlecode.com/svn/trunk@1600 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-15 17:52:09 +00:00
Scroggo
2c8208f3a4 Improvements to the SampleApp (primarily Android).
Reviewed at http://codereview.appspot.com/4587042/

Android
- Added buttons for interaction without a keyboard.
- Added the ability to zoom in to a specific point (roughly).
- Added event handling (for showing a slideshow, for example).
- Allow changing screen orientation
- Updated README file, explaining how to build

Multiplatform changes
- Added SampleApp header file
- Remove FPS when turning off measure FPS mode


git-svn-id: http://skia.googlecode.com/svn/trunk@1596 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-15 16:49:08 +00:00
bsalomon@google.com
137c428290 Update baselines for linux-fixed. Make shader text sample/GM work with scalar=fixed.
git-svn-id: http://skia.googlecode.com/svn/trunk@1577 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-14 17:13:22 +00:00
bsalomon@google.com
3914958a49 Fix text-as-path with skshader on gpu
Review URL: http://codereview.appspot.com/4576057/



git-svn-id: http://skia.googlecode.com/svn/trunk@1575 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-13 21:55:32 +00:00
djsollen@google.com
e32b5837c3 Updates to the Android SampleApp
http://codereview.appspot.com/4602049/


git-svn-id: http://skia.googlecode.com/svn/trunk@1567 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-13 16:58:40 +00:00
Scroggo
aed68d999b Make linux sample app work on my laptop. Reviewed at http://codereview.appspot.com/4568050/
git-svn-id: http://skia.googlecode.com/svn/trunk@1539 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-08 14:26:00 +00:00
twiz@google.com
76b8274242 Correction of texture domain calculation. Review=http://codereview.appspot.com/4517126
git-svn-id: http://skia.googlecode.com/svn/trunk@1483 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-02 20:30:02 +00:00
yangsu@google.com
1f3942110a Added code to enable the pipe module to record to a file
http://codereview.appspot.com/4564052/


git-svn-id: http://skia.googlecode.com/svn/trunk@1469 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-01 18:03:34 +00:00
yangsu@google.com
4c295a3d92 Added 3 new sample tests. http://codereview.appspot.com/4527092/
git-svn-id: http://skia.googlecode.com/svn/trunk@1464 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-01 16:11:58 +00:00
reed@google.com
81e3d7f794 update to SampleView
git-svn-id: http://skia.googlecode.com/svn/trunk@1460 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-01 12:42:36 +00:00
reed@google.com
e5ff439066 inherit from SampleView
git-svn-id: http://skia.googlecode.com/svn/trunk@1459 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-01 11:59:08 +00:00
Scroggo
bbb203c075 Remove unnecessary call to unlock.
git-svn-id: http://skia.googlecode.com/svn/trunk@1451 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-05-31 17:04:56 +00:00
reed@google.com
1d5aaa8ef6 fix memory leaks
git-svn-id: http://skia.googlecode.com/svn/trunk@1448 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-05-31 15:35:54 +00:00
Scroggo
3272ba8abc Show fatbits mode in openGL. http://codereview.appspot.com/4515141/
git-svn-id: http://skia.googlecode.com/svn/trunk@1426 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-05-25 20:50:42 +00:00
reed@google.com
d9097e0256 add
git-svn-id: http://skia.googlecode.com/svn/trunk@1422 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-05-25 20:13:50 +00:00
reed@google.com
03c2ef5473 inherit from SampleView
git-svn-id: http://skia.googlecode.com/svn/trunk@1421 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-05-25 20:13:06 +00:00
senorblanco@chromium.org
50108cdbfe Grab-bag of memory fixes. SkFlatMatrix::Flatten had the same issue as
Sk2DPathEffect:  it was encoding a partially-unintialized matrix type mask. 
The others are simply uninitialized vars in the sample code.

Review URL:  http://codereview.appspot.com/4539072/



git-svn-id: http://skia.googlecode.com/svn/trunk@1414 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-05-24 20:25:32 +00:00
reed@google.com
dde0956375 add cross-process option to gpipe
add unittests for reader32 and writer32



git-svn-id: http://skia.googlecode.com/svn/trunk@1397 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-05-23 12:21:05 +00:00
bsalomon@google.com
271cffc77b Add dual source blending support for proper blending with coverage.
Review URL: http://codereview.appspot.com/4535088/



git-svn-id: http://skia.googlecode.com/svn/trunk@1390 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-05-20 14:13:56 +00:00
senorblanco@chromium.org
64cc579efa The plain Makefile was using -Wall, but the gyp build wasn't. This CL turns on
-Wall -Wextra and -Wno-unused in common.gypi.  This revealed a lot of warnings
(and some actual bugs), all of which I fixed here.  This is pretty mindless
stuff for the most part (order of intialization, missing initializers, && within
||, etc), but will allow us to build cleanly with -Wall and -Wextra (and
-Werror, if we so choose).

I put defaults into switches that were missing cases.  I could put in the actual
missing enums instead if that's desired.  I could also assert on missing enums
instead of break, if that's desired.  I wasn't sure how to test the stuff in
"animator", so that should be looked at a bit more closely.

Review URL:  http://codereview.appspot.com/4547055/



git-svn-id: http://skia.googlecode.com/svn/trunk@1386 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-05-19 19:58:58 +00:00
senorblanco@chromium.org
e580bc195a Plug a leak in SampleShaderTest.
Review URL:  http://codereview.appspot.com/4517086/



git-svn-id: http://skia.googlecode.com/svn/trunk@1384 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-05-19 18:33:33 +00:00
reed@google.com
bad8c87812 show consistent timings between debug and release
git-svn-id: http://skia.googlecode.com/svn/trunk@1370 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-05-18 20:10:31 +00:00
reed@google.com
b36334d46a lockPixels before looking at them in Zoomer
git-svn-id: http://skia.googlecode.com/svn/trunk@1363 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-05-18 15:07:20 +00:00
reed@google.com
79b3b7e916 checkpoint for 8->5 bit reduction
git-svn-id: http://skia.googlecode.com/svn/trunk@1362 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-05-18 13:07:22 +00:00
reed@google.com
9e39bb3603 code style, inherit from SampleView
git-svn-id: http://skia.googlecode.com/svn/trunk@1361 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-05-18 12:17:53 +00:00
reed@google.com
09e3baaaf5 add 'h' to tri-toggle font hinting
git-svn-id: http://skia.googlecode.com/svn/trunk@1360 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-05-18 12:04:31 +00:00
junov@google.com
869d6d9f4d Adding a test to sampleapp for texture domain
git-svn-id: http://skia.googlecode.com/svn/trunk@1347 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-05-17 15:47:10 +00:00
reed@google.com
66f22fd07a fix uninitialized var
git-svn-id: http://skia.googlecode.com/svn/trunk@1345 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-05-17 15:33:45 +00:00
reed@google.com
176753aa6d add 'n' to tri-toggle bitmap-filter (LERP) on/off/neutral
git-svn-id: http://skia.googlecode.com/svn/trunk@1344 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-05-17 15:32:04 +00:00
reed@google.com
04863fa14a add Convexity enum to SkPath
git-svn-id: http://skia.googlecode.com/svn/trunk@1324 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-05-15 04:08:24 +00:00
reed@google.com
a6ff4dc22d add 'p' to toggle on/off testing the pipe
git-svn-id: http://skia.googlecode.com/svn/trunk@1317 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-05-12 22:08:24 +00:00
Scroggo
97c88c255c Add color filters to gpu path.
git-svn-id: http://skia.googlecode.com/svn/trunk@1297 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-05-11 14:05:25 +00:00
reed@google.com
0faac1e857 remove some dead code in pipes
inherit from SampleView for more samples
add L key to toggle using SkGPipe



git-svn-id: http://skia.googlecode.com/svn/trunk@1296 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-05-11 05:58:58 +00:00
reed@google.com
9ac5e228c6 add
git-svn-id: http://skia.googlecode.com/svn/trunk@1260 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-05-05 20:05:10 +00:00
reed@google.com
70b6125ed2 inherit from SampleView
git-svn-id: http://skia.googlecode.com/svn/trunk@1255 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-05-05 14:12:36 +00:00
reed@google.com
4aebe4fb10 disable experimental TEST_GPIPE
git-svn-id: http://skia.googlecode.com/svn/trunk@1253 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-05-05 14:07:35 +00:00
reed@google.com
961ddb04a0 update to SampleView
git-svn-id: http://skia.googlecode.com/svn/trunk@1252 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-05-05 14:03:48 +00:00
mike@reedtribe.org
5fd9243fd6 switch to inheriting from SampleView
git-svn-id: http://skia.googlecode.com/svn/trunk@1249 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-05-05 01:59:48 +00:00
reed@google.com
7a253379e7 new samples
git-svn-id: http://skia.googlecode.com/svn/trunk@1239 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-05-04 14:34:56 +00:00
reed@google.com
64e3eb24e5 update pipe test
git-svn-id: http://skia.googlecode.com/svn/trunk@1238 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-05-04 14:32:04 +00:00
reed@google.com
17fb387a56 add debugging test for building SkDescriptor
update some samples



git-svn-id: http://skia.googlecode.com/svn/trunk@1237 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-05-04 14:31:07 +00:00
bsalomon@google.com
05ef510389 Remove GrContext.h dependence on GrGpu.h
Review URL:  http://codereview.appspot.com/4433096/



git-svn-id: http://skia.googlecode.com/svn/trunk@1227 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-05-02 21:14:59 +00:00
reed@google.com
68f456d568 fix compile
git-svn-id: http://skia.googlecode.com/svn/trunk@1222 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-05-02 18:55:39 +00:00
reed@google.com
2f3dc9dc4c add typefacecache
speedup lcd blits
clean up some samples



git-svn-id: http://skia.googlecode.com/svn/trunk@1220 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-05-02 17:33:45 +00:00
bsalomon@google.com
8295dc1474 4x4 SSAA with improvements in determination of when to apply. Still disabled at compile time.
Review URL: http://codereview.appspot.com/4445075/




git-svn-id: http://skia.googlecode.com/svn/trunk@1218 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-05-02 12:53:34 +00:00
reed@google.com
17d7aec896 move end-timer for FPS to afterChildren, so we will have flushed opengl
git-svn-id: http://skia.googlecode.com/svn/trunk@1170 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-04-25 14:31:44 +00:00
bsalomon@google.com
205d46067a Move alpha-ramp AA to GrContext, detect cases when AA is applied via other methods (smooth lines, MSAA) or rect falls on integer coords and skip the alpha ramp path. Use pre-fab index buffer for alpha-ramped fill rects and stroke rects.
Review URL: http://codereview.appspot.com/4449047/

git-svn-id: http://skia.googlecode.com/svn/trunk@1169 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-04-25 12:43:45 +00:00
reed@google.com
f21833999d migrate some samples over to SampleView, for FPS measurements
git-svn-id: http://skia.googlecode.com/svn/trunk@1166 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-04-22 14:10:48 +00:00
mike@reedtribe.org
2eb595292b add 'f' toggle to trigger timer for sample. Must subclass SampleView instead
of SkView to opt-in. Then override onDrawContent() and optionally onDrawBackground.



git-svn-id: http://skia.googlecode.com/svn/trunk@1165 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-04-22 01:59:09 +00:00
reed@google.com
261b8e2ca1 fix warnings
git-svn-id: http://skia.googlecode.com/svn/trunk@1129 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-04-14 17:53:24 +00:00
mike@reedtribe.org
a8282ef8f9 add mask for paint-bits to layerdrawlooper
change addLayer variants that don't respect paint changes to return void



git-svn-id: http://skia.googlecode.com/svn/trunk@1123 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-04-14 01:22:45 +00:00
reed@google.com
ad89fbd353 add
git-svn-id: http://skia.googlecode.com/svn/trunk@1099 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-04-11 13:57:34 +00:00
mike@reedtribe.org
3ce59dc499 fix drawfilter to match new api
enlarge default 'z' fatbits view



git-svn-id: http://skia.googlecode.com/svn/trunk@1080 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-04-08 00:38:05 +00:00
bsalomon@google.com
dc66c42d7d Fix Two Pt Radial when circles are concentric.
Review URL: http://codereview.appspot.com/4368047/



git-svn-id: http://skia.googlecode.com/svn/trunk@1069 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-04-06 19:35:37 +00:00
bsalomon@google.com
6dcf499d35 Fix dangling ptr when GrRenderTarget outlives its GrTexture representation
Move management of fRenderTarget ptr from GL texture class to base class

Minor:
Remove redundant GrContext-per-frame debug code in SampleApp.cpp
Add GrTexture.cpp to legacy VS2010 vcxproj

Review URL: http://codereview.appspot.com/4352051/



git-svn-id: http://skia.googlecode.com/svn/trunk@1061 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-04-05 21:16:14 +00:00
bsalomon@google.com
669fdc4ed8 Adds read pixels to GrTexture and GrRenderTarget
Adds SkGrRenderTargetPixelRef for SkBitmaps that are backed by RTs that aren't textures.
Adds onReadPixels implementations for SkGr pixel ref types



git-svn-id: http://skia.googlecode.com/svn/trunk@1056 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-04-05 17:08:27 +00:00
reed@google.com
569e0435af add toggle keys:
'x' -- flip around X axis
'y' -- flip around Y axis
'b' -- toggle between normal, forced-on and forced-off antialiasing



git-svn-id: http://skia.googlecode.com/svn/trunk@1054 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-04-05 13:07:03 +00:00
bsalomon@google.com
5d561959dc Fix crash when codec not found for SampleDecode
git-svn-id: http://skia.googlecode.com/svn/trunk@1036 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-04-01 18:43:22 +00:00
bsalomon@google.com
8fe72477f2 Add GrResource base class for ibs, texs, vbs, etc.
Add lostContext() to GrContext.

Review URL: http://codereview.appspot.com/4328044/



git-svn-id: http://skia.googlecode.com/svn/trunk@1026 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-30 21:26:44 +00:00
bsalomon@google.com
11f0b51976 Fix ref leak on GrGpu.
Review URL: http://codereview.appspot.com/4323043/



git-svn-id: http://skia.googlecode.com/svn/trunk@1015 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-29 20:52:23 +00:00
Scroggo
0f185c2709 Move zoomer into SampleApp
git-svn-id: http://skia.googlecode.com/svn/trunk@1002 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-24 18:35:50 +00:00
reed@google.com
df49991eb3 add SkCreateTypefaceFromCTFont() to create a typeface directly from a CTFontRef
Compute the actual style from the returned CTFontRef, rather than assuming the
request will always be met.



git-svn-id: http://skia.googlecode.com/svn/trunk@979 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-22 14:07:59 +00:00
scroggo
08526c07f4 Add a 'fatbits' mode to unix sample app.
git-svn-id: http://skia.googlecode.com/svn/trunk@978 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-22 14:03:21 +00:00
mike@reedtribe.org
9db4928b26 add more styles to show
git-svn-id: http://skia.googlecode.com/svn/trunk@976 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-22 01:35:30 +00:00
mike@reedtribe.org
dd0cd34067 allow window-subclass to handle dispatching click events (for resize)
add drag tracking to Draw



git-svn-id: http://skia.googlecode.com/svn/trunk@967 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-21 00:53:39 +00:00
mike@reedtribe.org
b7d956df46 add draw sample
git-svn-id: http://skia.googlecode.com/svn/trunk@966 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-20 20:19:16 +00:00
reed@google.com
4b0f0b2758 fix warnings (local storage too small, int->scalar)
git-svn-id: http://skia.googlecode.com/svn/trunk@957 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-18 14:47:36 +00:00
reed@google.com
52f57e1d11 add fling
git-svn-id: http://skia.googlecode.com/svn/trunk@946 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-16 12:10:02 +00:00
scroggo
b7e9aee1ac Add a sample application that runs on unix.
git-svn-id: http://skia.googlecode.com/svn/trunk@938 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-15 15:15:15 +00:00
twiz@google.com
06c3b6bfd5 Correction of Windows SampleApp build break introduced by r925.
(http://code.google.com/p/skia/source/detail?r=925)

Issue: http://codereview.appspot.com/4286053/



git-svn-id: http://skia.googlecode.com/svn/trunk@933 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-14 16:58:39 +00:00
reed@google.com
f0b5f68807 add tristate toggle 'l' for lcd text drawing
git-svn-id: http://skia.googlecode.com/svn/trunk@925 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-11 20:08:25 +00:00
reed@google.com
5ba2d5b187 Fix warnings of SkScalar -> int conversions, by using SkScalarRound()
git-svn-id: http://skia.googlecode.com/svn/trunk@921 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-10 19:40:34 +00:00
bsalomon@google.com
807cec4397 Add complex clip gm sample and cleanup unused headers/code in SampleComplexClip
git-svn-id: http://skia.googlecode.com/svn/trunk@919 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-10 19:20:15 +00:00
bsalomon@google.com
498a623e2e Remove offscreen GL support from SampleApp and SkOSWindow. This never worked anywhere but Mac and it doesn't work there anymore.
git-svn-id: http://skia.googlecode.com/svn/trunk@918 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-10 18:24:15 +00:00
reed@google.com
f88d6765a5 check-point for kLCD16_Format mask support
disabled for now in SkPaint.cpp (for further testing)



git-svn-id: http://skia.googlecode.com/svn/trunk@917 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-10 15:06:27 +00:00
reed@google.com
1d12b1fd66 add setXYWH to rects
new tests for circles



git-svn-id: http://skia.googlecode.com/svn/trunk@877 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-03 13:23:35 +00:00
reed@google.com
55b6b58d8f Fix inverse scanconversion -- be sure to keep our calls to SkBlitter in scanline
order (top to bottom), since the region blitter explicitly requires this.



git-svn-id: http://skia.googlecode.com/svn/trunk@876 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-02 15:58:18 +00:00
bsalomon@google.com
7239aab311 Sample that exercises complex clipping variations.
git-svn-id: http://skia.googlecode.com/svn/trunk@875 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-02 15:35:28 +00:00
reed@google.com
d6f5a81955 #ifdef protect win specific code (e.g. LOGFONT)
git-svn-id: http://skia.googlecode.com/svn/trunk@874 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-02 14:34:11 +00:00
reed@google.com
b652427197 remove obsolete generateLineHeight
use canonical lfHeight so we can compare different LOGFONTs and map
equivalent fonts (except for height) to the same typeface. To do this I
add fSize to scale the output from GDI to get from the canonical int textSize
to the actual fractional size.



git-svn-id: http://skia.googlecode.com/svn/trunk@871 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-03-01 15:18:14 +00:00
reed@google.com
a09368c971 fix bool bug so we can multisample now
git-svn-id: http://skia.googlecode.com/svn/trunk@851 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-02-24 21:42:29 +00:00
reed@google.com
11a5ff376b use new high-quality blur in samples
git-svn-id: http://skia.googlecode.com/svn/trunk@819 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-02-18 20:20:51 +00:00
reed@google.com
a965a15abd add test for points
git-svn-id: http://skia.googlecode.com/svn/trunk@806 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-02-17 15:06:52 +00:00
reed@google.com
67981c5e4b add test for poly2poly
git-svn-id: http://skia.googlecode.com/svn/trunk@805 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-02-17 14:21:01 +00:00
reed@google.com
0ecc2b79db add text
git-svn-id: http://skia.googlecode.com/svn/trunk@798 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-02-16 13:06:15 +00:00
bsalomon@google.com
dd53d91b60 safeUnref() -> SkSafeUnref()
git-svn-id: http://skia.googlecode.com/svn/trunk@785 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-02-13 18:21:16 +00:00
reed@google.com
fb56a9ee2d add 'c' command, which toggles a semi-complex clip (the pink is what has been
clipped out).



git-svn-id: http://skia.googlecode.com/svn/trunk@781 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-02-10 18:47:24 +00:00
bsalomon@google.com
9695921824 safeunref method to SkSafeUnref.
git-svn-id: http://skia.googlecode.com/svn/trunk@777 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-02-08 22:03:36 +00:00
reed@google.com
82065d667f remove SkRefCnt safeRef() and safeUnref(), and replace the call-sites with
SkSafeRef() and SkSafeUnref().

This is basically a bug waiting to happen. An optimizing compiler can remove
checks for null on "this" if it chooses. However, SkRefCnt::safeRef() relies on
precisely this check...

void SkRefCnt::safeRef() {
    if (this) {
        this->ref();
    }
}

Since a compiler might skip the if-clause, it breaks the intention of this
method, hence its removal.

static inline void SkSafeRef(SkRefCnt* obj) {
    if (obj) {
        obj->ref();
    }
}

This form is not ignored by an optimizing compile, so we use it instead.




git-svn-id: http://skia.googlecode.com/svn/trunk@762 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-02-07 15:30:46 +00:00
bsalomon@google.com
0fdaa22dea Add shaded text sample and gm test.
git-svn-id: http://skia.googlecode.com/svn/trunk@725 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-01-25 18:35:26 +00:00
bsalomon@google.com
5782d712ff Rev the GrContext interface. Context has draw* functions that take a new GrPaint object. Removed many of the lower-level GrGpu function call-throughs on context.
Remove unused/unsupported point size (we don't draw non-hairline points using GL points).
Change current* getter functions to get* for consistency.
Fix bounds when drawing inverse-filled paths.


git-svn-id: http://skia.googlecode.com/svn/trunk@718 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-01-21 21:03:59 +00:00
bsalomon@google.com
2e7b43d33c Remove notion of default rendertarget. This doesn't map well to usage patterns outside sample app. Make binding between SkGpuDevice and a GrRenderTarget more explicit. Create method on GrContext to wrap the current target in the 3D API with a GrRenderTarget.
git-svn-id: http://skia.googlecode.com/svn/trunk@706 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-01-18 20:57:22 +00:00