AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
4,689 Commits 1 Branch 0 Tags 544 MiB
ae933ce0ea
Commit Graph

346 Commits

Author SHA1 Message Date
mike@reedtribe.org
a69b48c29d Add SkTableColorFilter, as a foundation for several SVG filters 
git-svn-id: http://skia.googlecode.com/svn/trunk@2933 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-12-28 20:31:00 +00:00
tomhudson@google.com
abfa8d137b Fix fixed-point antialiased clipping GM; upload baselines. 
http://codereview.appspot.com/5503077/



git-svn-id: http://skia.googlecode.com/svn/trunk@2930 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-12-28 19:40:48 +00:00
epoger@google.com
c7cf2b351f Add number-of-missing-baseline-images report to gm 
Review URL: http://codereview.appspot.com/5489123

git-svn-id: http://skia.googlecode.com/svn/trunk@2929 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-12-28 19:31:01 +00:00
caryclark@google.com
5fbb4dc0a5 support vertical text and typeface-by-name on Leopard 
M    src/ports/SkFontHost_mac_coretext.cpp
M    gyp/gmslides.gypi
A    gm/verttext2.cpp



git-svn-id: http://skia.googlecode.com/svn/trunk@2920 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-12-21 20:06:30 +00:00
tomhudson@google.com
ef279d36ca New gm to test anti-aliased clipping. 
git-svn-id: http://skia.googlecode.com/svn/trunk@2914 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-12-21 14:27:14 +00:00
schenney@chromium.org
45cbfdd535 Unreviewed changes to the gm tests for paths. Each test is broken into four 
smaller images to avoid problems with XPS on Windows hanging on large images.

git-svn-id: http://skia.googlecode.com/svn/trunk@2911 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-12-20 21:48:14 +00:00
senorblanco@chromium.org
e5ff3cefe0 Implement SkColorFilter::asColorMatrix() virtual, and override in 
SkColorMatrixFilter.  Implement missing SkColorMatrixFilter::setMatrix() and
setArray() functions (were in .h, just not implemented).  Add a gm for color
matrix filters.

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



git-svn-id: http://skia.googlecode.com/svn/trunk@2909 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-12-20 20:58:18 +00:00
reed@google.com
32d25b6f5f initial impl of SkImageFilters : virtual signature will change! 
Do not invest too much in other subclasses until this API solidifies.



git-svn-id: http://skia.googlecode.com/svn/trunk@2903 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-12-20 16:19:00 +00:00
schenney@chromium.org
4da06ab335 Modifying SkPath to store all verbs provided by the user, and to give 
correct results for all stroke and fill modes even on the various types
of degenerate paths.

The goals of this patch include:
1. Have Skia store all of the verbs implied by path construction methods, even
if those define degenerate paths. The SVG implementation in WebKit, which is
backed by Skia, needs to know about all elements of the path, even degenerate
ones, for the correct drawing of markers and line caps. For example, in SVG you
should be able to draw a scatter plot by specifying a marker for vertices and
then giving a sequence of moveTo commands. Skia will not store the moveTos,
requiring a different storage mechanism.

2. Assuming 1, maintain the current Skia behavior. That is, make Skia robust to
degenerate paths.

3. Fix an existing bug in Skia where a degenerate moveTo-lineTo pair spits out
warnings from rasterization and produces incorrect results in inverse-fill
renderings.

4. Adds extensive testing for degenerate paths and path rendering in general.

To meet these goals, the patch I am proposing will result in minor additional
storage for degenerate paths (a few bytes per degenerate path, only if the user
defines such paths). There is also some additional overhead in the iteration
code, with the path now cleaned to remove degenerate segments as part of the
iteration process. I suspect this will also fix issues with computing normal
vectors to degenerate segments. Benchmarking suggests that this change may
result in slightly (< 1%) slower path drawing due to the checks for
degeneracy. This overhead could be removed (in fact, a significant speedup
could occur) if the results of iterating to clean up the path were cached.
This would cost memory, of course, and quite a bit of it.

BUG=398
TEST=tests/PathTest.cpp
     gm/cubicpaths.cpp
     gm/degeneratesegments.cpp
     gm/movepaths.cpp
     gm/linepaths.cpp
     gm/quadpaths.cpp
Review URL: http://codereview.appspot.com/5482051

git-svn-id: http://skia.googlecode.com/svn/trunk@2901 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-12-20 15:14:18 +00:00
reed@google.com
263cb3a79c can't pass const to setPixels :( 
git-svn-id: http://skia.googlecode.com/svn/trunk@2900 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-12-20 14:35:32 +00:00
reed@google.com
5213c04216 defer creating offscreen until our first draw (so our constructor runs fast) 
git-svn-id: http://skia.googlecode.com/svn/trunk@2898 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-12-20 13:41:09 +00:00
reed@google.com
eb85630fd6 fix positioning for scalar=fixed, still need to fix actual mode 
git-svn-id: http://skia.googlecode.com/svn/trunk@2862 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-12-12 22:15:18 +00:00
reed@google.com
eb0fa29fc4 try to make it draw correctly in fixed point 
git-svn-id: http://skia.googlecode.com/svn/trunk@2860 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-12-12 22:01:06 +00:00
bsalomon@google.com
aa814fe4a1 Access sampler matrices directly, cleanup GrSamplerState::reset()s 
Review URL: http://codereview.appspot.com/5488048/


git-svn-id: http://skia.googlecode.com/svn/trunk@2854 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-12-12 18:45:07 +00:00
mike@reedtribe.org
e51755fc64 add first cut at arithmetic mode 
git-svn-id: http://skia.googlecode.com/svn/trunk@2849 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-12-10 19:36:56 +00:00
reed@google.com
a8f60f2502 change to complexclip_bw and complexclip_aa, adding more combinations as well 
git-svn-id: http://skia.googlecode.com/svn/trunk@2833 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-12-08 16:18:29 +00:00
reed@google.com
b4b49ccc41 add getBGColor() getter 
git-svn-id: http://skia.googlecode.com/svn/trunk@2809 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-12-06 16:15:42 +00:00
bsalomon@google.com
39ee0ffa72 Prep #1 for making GrDrawState a class 
Review URL: http://codereview.appspot.com/5437138/




git-svn-id: http://skia.googlecode.com/svn/trunk@2808 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-12-06 15:32:52 +00:00
bsalomon@google.com
5bc34f04fe Remove fConfig/fFormat union in GrTextureDesc 
Review URL: http://codereview.appspot.com/5448116/


git-svn-id: http://skia.googlecode.com/svn/trunk@2806 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-12-06 14:46:34 +00:00
senorblanco@chromium.org
ef843cdcd1 When a bitmap is texture-backed, change SkBitmap::copyTo() to do a deep 
copy of the texels in VRAM rather than a readback and re-upload.  This
gives a 3-10X speedup on recursive canvas-to-canvas draws.

N.B.:  This introduces a new GM test, which will need new baselines.



git-svn-id: http://skia.googlecode.com/svn/trunk@2790 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-12-02 19:11:17 +00:00
bsalomon@google.com
29d3501e3b Fix issue where bumping the max gm width/height affects gpu images 
Review URL: http://codereview.appspot.com/5440065/


git-svn-id: http://skia.googlecode.com/svn/trunk@2766 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-11-30 16:57:21 +00:00
reed@google.com
2f6c957afd update verttext to remove leading space from image name 
add mac-desktop baseline images



git-svn-id: http://skia.googlecode.com/svn/trunk@2763 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-11-30 14:58:16 +00:00
reed@google.com
fb82300d1b enable shadermask optimization all the time 
update gm for shadermask
fix bugs in lcd_blend math



git-svn-id: http://skia.googlecode.com/svn/trunk@2761 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-11-30 14:29:55 +00:00
bsalomon@google.com
fb30951cd9 [GPU] tile when large bitmap pased drawBitmap and only a small fraction is used 
Review URL: http://codereview.appspot.com/5450048/



git-svn-id: http://skia.googlecode.com/svn/trunk@2760 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-11-30 14:13:48 +00:00
reed@google.com
e805535b19 add test for shader text w/ and w/o lcd (and w/ and w/o opaque) 
git-svn-id: http://skia.googlecode.com/svn/trunk@2753 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-11-28 16:31:28 +00:00
bsalomon@google.com
31648eb1cf Fix warnings 
Review URL: http://codereview.appspot.com/5433054/


git-svn-id: http://skia.googlecode.com/svn/trunk@2741 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-11-23 15:01:08 +00:00
bsalomon@google.com
6f3795105b Make all pixel ops go thru ctx so we can correctly flush. Unify two texture upload code paths. 
Review URL: http://codereview.appspot.com/5373108/



git-svn-id: http://skia.googlecode.com/svn/trunk@2701 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-11-16 20:36:03 +00:00
senorblanco@chromium.org
54e01b2ab9 This change makes SkImageFilter and SkBlurImageFilter flattenable/unflattenable. 
The imageblur test also needed to stop calling getDeviceSize(), since it was
 returning 99999x99999 for the  SkPicture case.



git-svn-id: http://skia.googlecode.com/svn/trunk@2699 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-11-16 18:20:47 +00:00
reed@google.com
761661580e add test for bad scanconversion (disabled) 
git-svn-id: http://skia.googlecode.com/svn/trunk@2673 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-11-14 13:14:58 +00:00
reed@google.com
14debba629 add test gm for vertical text 
git-svn-id: http://skia.googlecode.com/svn/trunk@2661 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-11-10 20:06:01 +00:00
senorblanco@chromium.org
60014ca387 Implement Gaussian blurs for images. The caller creates an an 
SkBlurImageFilter, sets it on an SkPaint, passes that paint to saveLayer(),
draws the primitives which are to be blurred, then calls restore(), which
applies the blur.  The blurs have separate sizes in the horizontal and vertical
direction.  This feature is GPU-only for now.

NB:  Due to the clipping change, there are slight pixel differences on the
blurs_gpu and shadows_gpu tests, so those will require rebaselining on all
platforms, as will some of the WebKit layout tests (TBD).


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



git-svn-id: http://skia.googlecode.com/svn/trunk@2643 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-11-09 16:05:58 +00:00
reed@google.com
8923c6cfd5 suppress font-purge messages 
git-svn-id: http://skia.googlecode.com/svn/trunk@2623 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-11-08 14:59:38 +00:00
bungeman@google.com
24babf45b1 Add font scaler gm. 
http://codereview.appspot.com/5337044/


git-svn-id: http://skia.googlecode.com/svn/trunk@2619 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-11-07 16:33:40 +00:00
bsalomon@google.com
c436499622 [GPU] Add explicit byte order and PM vs. UPM 8888 configs 
Review URL: http://codereview.appspot.com/5347042/



git-svn-id: http://skia.googlecode.com/svn/trunk@2618 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-11-07 15:54:49 +00:00
bsalomon@google.com
e269f210bd Recommit r2611 with fix for gm 
git-svn-id: http://skia.googlecode.com/svn/trunk@2614 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-11-07 13:29:52 +00:00
bsalomon@google.com
b87d2b5c2a Revert r2611 until windows gm can be debugged 
git-svn-id: http://skia.googlecode.com/svn/trunk@2612 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-11-07 01:58:39 +00:00
bsalomon@google.com
6d9adaec78 Add replacement APIs for createPlatformSurface: createPlatformTexture and createPlatformRenderTarget 
git-svn-id: http://skia.googlecode.com/svn/trunk@2611 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-11-07 01:37:22 +00:00
bungeman@google.com
0f0c2888e0 Add font scaler gm. 
http://codereview.appspot.com/5337044/


git-svn-id: http://skia.googlecode.com/svn/trunk@2603 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-11-04 15:47:41 +00:00
bsalomon@google.com
c69809745e Recommit r2584 with gpu pass of the new ReadPixels test disabled in fixed pt (gpu code doesn't work in general in fixed pt). 
git-svn-id: http://skia.googlecode.com/svn/trunk@2586 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-11-02 19:57:21 +00:00
bsalomon@google.com
ace7bd5623 Revert r2584 (new test fails in fixed pt builds) 
git-svn-id: http://skia.googlecode.com/svn/trunk@2585 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-11-02 19:39:51 +00:00
bsalomon@google.com
1a8ddf0a35 Changes the SkCanvas::readPixels API. Allows caller to read into prealloced bitmap pixels. Changes how clipping to device bounds is handled. 
Review URL: http://codereview.appspot.com/5307077/



git-svn-id: http://skia.googlecode.com/svn/trunk@2584 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-11-02 19:34:16 +00:00
reed@google.com
b2a5162f1d all for multiple --match foo args, which will be logically OR'd together 
git-svn-id: http://skia.googlecode.com/svn/trunk@2567 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-10-31 16:30:04 +00:00
bsalomon@google.com
48dd1a26ec Import all GMs as Samples. 
Review URL: http://codereview.appspot.com/5332043/



git-svn-id: http://skia.googlecode.com/svn/trunk@2564 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-10-31 14:18:20 +00:00
bsalomon@google.com
72e49b8982 warning fixes 
Review URL http://codereview.appspot.com/5328050/




git-svn-id: http://skia.googlecode.com/svn/trunk@2548 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-10-27 21:47:03 +00:00
bsalomon@google.com
373a6635b7 Virtualize SkGLContext with subclasses SkNativeGLContext and SkMesaGLContext, allow both in gm 
Review URL: http://codereview.appspot.com/5307045/



git-svn-id: http://skia.googlecode.com/svn/trunk@2499 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-10-19 20:43:20 +00:00
bsalomon@google.com
e295313f01 move utils/SkEGLContext to gpu/SkGLContext, some gpu.gyp cleanup, set eol style LF on all gpu files 
Review URL: http://codereview.appspot.com/5242056/



git-svn-id: http://skia.googlecode.com/svn/trunk@2474 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-10-13 13:33:08 +00:00
bsalomon@google.com
a310826855 Add per-vertex coverage field, use in AA rects when alpha tweak is not valid, add relevant sample/gm 
Review URL: http://codereview.appspot.com/5181044/



git-svn-id: http://skia.googlecode.com/svn/trunk@2440 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-10-10 14:08:47 +00:00
bsalomon@google.com
f12449b5d2 Fixed signed/unsigned comparison warnings in empty path gm/sample 
git-svn-id: http://skia.googlecode.com/svn/trunk@2439 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-10-10 14:03:33 +00:00
bungeman@google.com
0f1541f1c3 Mac does not like empty projects. 
git-svn-id: http://skia.googlecode.com/svn/trunk@2438 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-10-10 13:47:06 +00:00
bungeman@google.com
b29c883fb4 Add xps device to skia. 
http://codereview.appspot.com/5076041/


git-svn-id: http://skia.googlecode.com/svn/trunk@2437 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-10-10 13:19:10 +00:00
bungeman@google.com
07faed1102 Setting perspective in fixed point. 
http://codereview.appspot.com/5088043/


git-svn-id: http://skia.googlecode.com/svn/trunk@2435 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-10-07 21:55:56 +00:00
bungeman@google.com
01744a46e8 Fix clamped_gradients gm to work in fixed. 
git-svn-id: http://skia.googlecode.com/svn/trunk@2425 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-10-06 19:37:39 +00:00
bsalomon@google.com
fa6ac938e6 Fixup rendering of empty paths (including inverted fills) 
Add GM and Sample that draw empty paths with various styles and fills

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



git-svn-id: http://skia.googlecode.com/svn/trunk@2414 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-10-05 19:57:55 +00:00
bsalomon@google.com
9d12f5c11b Fix some VS2010 warnings 
Review URL: http://codereview.appspot.com/5155043




git-svn-id: http://skia.googlecode.com/svn/trunk@2380 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-09-29 18:08:18 +00:00
tomhudson@google.com
5ea050f662 Optimize software radial gradients (remove branches from the inner loop where 
we can, because an entire row is conservatively either outside or inside the
gradient.) Change the gradient benchmark to capture both cases, and add new
gm to detect errors in these optimized paths.



git-svn-id: http://skia.googlecode.com/svn/trunk@2327 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-09-26 15:03:55 +00:00
bungeman@google.com
64e011a59d Fix pdf suppression test for gm. 
git-svn-id: http://skia.googlecode.com/svn/trunk@2284 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-09-19 19:31:04 +00:00
reed@google.com
fbc2117288 add getFlags() to gm baseclass 
skip PDF for hairmodes for now, since it crashes



git-svn-id: http://skia.googlecode.com/svn/trunk@2282 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-09-19 19:08:33 +00:00
reed@google.com
ab9739777c add gm test for drawing hairlines (and varying thin lines) in xfermodes 
add --nopdf option to gm app



git-svn-id: http://skia.googlecode.com/svn/trunk@2281 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-09-19 19:01:38 +00:00
bsalomon@google.com
cecd3ac9d0 Remove wrong file, add right file 
git-svn-id: http://skia.googlecode.com/svn/trunk@2257 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-09-13 15:39:00 +00:00
bsalomon@google.com
8c2fe99ed2 Fix some issues in gpu device with perspective. Add a gm that would have caught them. 
Review URL: http://codereview.appspot.com/4994048/



git-svn-id: http://skia.googlecode.com/svn/trunk@2256 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-09-13 15:27:18 +00:00
reed@google.com
9c9b8d90c8 use drawBitmapNine instead of SkNinePatch utils 
git-svn-id: http://skia.googlecode.com/svn/trunk@2237 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-09-07 12:27:43 +00:00
reed@google.com
b636adf980 reimage ninepatch-stretch with white bg (for easier printing) 
git-svn-id: http://skia.googlecode.com/svn/trunk@2225 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-09-06 19:34:13 +00:00
reed@google.com
b67052596f add gm test for ninepatch stretching 
pdf output incorrect, so not checked in.



git-svn-id: http://skia.googlecode.com/svn/trunk@2224 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-09-06 19:23:41 +00:00
reed@google.com
45482d1d2b fix pictures to not skip-over clip ops that might expand the clip 
git-svn-id: http://skia.googlecode.com/svn/trunk@2187 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-08-29 19:02:39 +00:00
bsalomon@google.com
574f29dfa7 Add revisions to complexclip2.cpp from code review. Checkin windows baselines. 
Review URL: http://codereview.appspot.com/4974048/



git-svn-id: http://skia.googlecode.com/svn/trunk@2186 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-08-29 18:05:05 +00:00
reed@google.com
30db599c1d add new test for complex clips 
temp disable picture testing until I fix the bug w/ expanding clips



git-svn-id: http://skia.googlecode.com/svn/trunk@2184 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-08-29 17:41:02 +00:00
epoger@google.com
17b7894609 rolling back the experimental rollbacks in r2178-2179 
git-svn-id: http://skia.googlecode.com/svn/trunk@2180 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-08-26 14:40:38 +00:00
epoger@google.com
5f226572b3 rolling tree back to its state as of r2169 to see if that fixes Windows buildbots 
git-svn-id: http://skia.googlecode.com/svn/trunk@2179 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-08-26 14:27:59 +00:00
tomhudson@google.com
3f088e3651 Move multiple calls to random() out of parameter lists so that the 
evaluation order is consistent across compilers.



git-svn-id: http://skia.googlecode.com/svn/trunk@2173 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-08-25 19:56:04 +00:00
epoger@google.com
6b66c398f9 Fix gm/bitmapscroll.cpp to actually draw in both Debug and Release modes. 
Review URL: http://codereview.appspot.com/4922047

git-svn-id: http://skia.googlecode.com/svn/trunk@2151 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-08-22 18:14:07 +00:00
bsalomon@google.com
971d0c8049 Get rid of createRenderTargetFrom3DAPIState and associated glGets necessary to support it. 
Review URL: http://codereview.appspot.com/4928041/



git-svn-id: http://skia.googlecode.com/svn/trunk@2144 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-08-19 17:22:05 +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
4067d7d5cd Slightly improve visuals of bitmapscroll test in gm 
git-svn-id: http://skia.googlecode.com/svn/trunk@1949 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-07-25 16:56:37 +00:00
epoger@google.com
d4af56c5f2 Exit SkBitmap::scrollRect() early if width <= 0 
As suggested in email from saintlou@google.com
Review URL: http://codereview.appspot.com/4806047

git-svn-id: http://skia.googlecode.com/svn/trunk@1948 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-07-25 16:27:59 +00:00
reed@google.com
e6a5c4d2d5 add --match to the help text 
git-svn-id: http://skia.googlecode.com/svn/trunk@1946 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-07-25 14:30:54 +00:00
reed@google.com
ece2b0297c reenable rotated freetype fix, but behind #ifndef SK_IGNORE_ROTATED_FREETYPE_FIX, 
so chrome can disable it for now.

add --match foo to gm/ so you can run just tests that substring match your pattern (foo)



git-svn-id: http://skia.googlecode.com/svn/trunk@1945 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-07-25 14:28:57 +00:00
epoger@google.com
59f3abf146 fix gradients_degenerate test case for SKIA_SCALAR_IS_FIXED 
http://codereview.appspot.com/4811046/



git-svn-id: http://skia.googlecode.com/svn/trunk@1928 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-07-21 15:50:33 +00:00
bsalomon@google.com
1936f26a0f Add tinybitmap gm and windows baselines. 
Review URL: http://codereview.appspot.com/4674048/



git-svn-id: http://skia.googlecode.com/svn/trunk@1888 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-07-18 21:19:31 +00:00
bsalomon@google.com
d9f826c0db flip Y in uploads to bottom-up textures (and add gm test) 
Review URL: http://codereview.appspot.com/4756043/



git-svn-id: http://skia.googlecode.com/svn/trunk@1882 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-07-18 15:25:04 +00:00
bsalomon@google.com
0a09eef790 Change true and false to 1 and 0 in macros that are used to conditionally compile code. 
Review URL: http://codereview.appspot.com/4664056/



git-svn-id: http://skia.googlecode.com/svn/trunk@1762 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-06-29 19:42:58 +00:00
reed@google.com
46cce91f48 create bitmaps from pdf output for comparison purposes (mac only at the moment) 
git-svn-id: http://skia.googlecode.com/svn/trunk@1745 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-06-29 12:54:46 +00:00
epoger@google.com
213c42bb69 Create new lcdtext page within gm 
http://codereview.appspot.com/4654071



git-svn-id: http://skia.googlecode.com/svn/trunk@1736 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-06-28 16:20:27 +00:00
reed@google.com
ac864a945c add test for degenerate 2point gradients (needs pdf and gpu fixes) 
git-svn-id: http://skia.googlecode.com/svn/trunk@1727 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-06-27 18:11:17 +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
epoger@google.com
4eed340935 roll back r1705 
git-svn-id: http://skia.googlecode.com/svn/trunk@1715 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-06-24 19:14:42 +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
vandebo@chromium.org
1c18ca3ca2 Add additional source types to xfer mode test. 
Review URL: http://codereview.appspot.com/4589051

git-svn-id: http://skia.googlecode.com/svn/trunk@1705 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-06-24 17:05:17 +00:00
reed@google.com
1a7e9461bb disable gpu tests when scalar==fixed, 
add baselines for fixedpoint strokes gm



git-svn-id: http://skia.googlecode.com/svn/trunk@1651 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-06-20 13:21:24 +00:00
mike@reedtribe.org
f2c21cdaf1 add 
git-svn-id: http://skia.googlecode.com/svn/trunk@1645 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-06-18 00:15:04 +00:00
tomhudson@google.com
cae6b3f1e8 -replay tests are only run if forward rendering succeeded. 
-serialize tests are only run if previous test (either -replay or forward
rendering) succeeded.
The results of -replay and -serialize are compared against the output of
forward rendering.



git-svn-id: http://skia.googlecode.com/svn/trunk@1626 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-06-17 13:11:45 +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
tomhudson@google.com
a87cd2af4c Increase compatibility with clang, mostly around SK_RESTRICT. 
Attempting to fix up our use of __restrict__ so Chrome can enable it.



git-svn-id: http://skia.googlecode.com/svn/trunk@1597 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-06-15 16:50:27 +00:00
epoger@google.com
baa677b248 delete all old (non-Gyp) buildfiles 
git-svn-id: http://skia.googlecode.com/svn/trunk@1583 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-06-14 18:35: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
tomhudson@google.com
ea325437bd When user specifies an output path with -w, only output files from main 
render (don't output -replay and -serialize files into separate
directories).
If main render fails, don't test -replay or -serialize.

Also fix misnamed variable, line-wrap.


git-svn-id: http://skia.googlecode.com/svn/trunk@1560 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-06-09 20:30:03 +00:00
reed@google.com
b8b0983c9e make --replay be the default. Now --noreplay will disable testing through a picture 
git-svn-id: http://skia.googlecode.com/svn/trunk@1437 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-05-26 15:57:56 +00:00
reed@google.com
e3605d0e74 retool without shapes, which are broken/experimental 
git-svn-id: http://skia.googlecode.com/svn/trunk@1436 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-05-26 15:12:35 +00:00
reed@google.com
4c9a8155a8 remove self-modifying matrix code, which can't work with pictures, and will be removed from shapes api soon 
git-svn-id: http://skia.googlecode.com/svn/trunk@1434 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-05-26 14:42:48 +00:00
reed@google.com
64f340ceea dynamically allocate the pixels, so they can be referened when drawn into a picture 
git-svn-id: http://skia.googlecode.com/svn/trunk@1433 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-05-26 14:35:41 +00:00
epoger@google.com
8f096724a2 Rebase GM tool for SKIA_SCALAR=fixed 
http://codereview.appspot.com/4559041



git-svn-id: http://skia.googlecode.com/svn/trunk@1408 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-05-24 17:07:01 +00:00
epoger@google.com
b28b5e4e26 Warn when an SkScalar is passed into SkIntToScalar() (converted twice) 
http://codereview.appspot.com/4548051/



git-svn-id: http://skia.googlecode.com/svn/trunk@1405 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-05-24 14:51:57 +00:00
bungeman@google.com
3c14d0f3d1 Fix gm tests for fixed point. 
git-svn-id: http://skia.googlecode.com/svn/trunk@1389 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-05-20 14:05:03 +00:00
bungeman@google.com
0368d06a29 Fix clipping in StrokeRectGM test for fixed point. 
git-svn-id: http://skia.googlecode.com/svn/trunk@1388 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-05-19 21:29:25 +00:00
epoger@google.com
65245ade84 fix assertion failure in Skia_Linux_Fixed_Debug build 
http://codereview.appspot.com/4556043/



git-svn-id: http://skia.googlecode.com/svn/trunk@1381 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-05-19 17:36:21 +00:00
bungeman@google.com
2ed67e83c8 Fix tests with incorrect swizzle. 
http://codereview.appspot.com/4552046/


git-svn-id: http://skia.googlecode.com/svn/trunk@1367 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-05-18 18:54:23 +00:00
junov@google.com
6acc9b3d2b Fixed color bleeding issue when drawing a sub region of a bitmap with filtering enabled. 
Problem was resolved by adding the notion of a custom texture domain in generated shaders, when necessary.




git-svn-id: http://skia.googlecode.com/svn/trunk@1337 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-05-16 18:32:07 +00:00
ctguil@chromium.org
1526129380 PDF Device should report non-transformed size for width and height. 
Review URL: http://codereview.appspot.com/4435074

git-svn-id: http://skia.googlecode.com/svn/trunk@1217 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-04-29 17:54:16 +00:00
tomhudson@google.com
8e728d7467 Propagate return values from compare() up to main() so we can return 0 if all 
tests succeed, -1 if any tests fail. (This will allow the automated test
infrastructure to run GM.) Because we haven't implemented it on some
architectures, not creating a GPU context is not considered a failure.



git-svn-id: http://skia.googlecode.com/svn/trunk@1196 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-04-26 20:22:57 +00:00
tomhudson@google.com
86bf5c91f8 Allocate a bitmap on the stack in xfermodes.cpp to work around a limitation 
in SkPicture.



git-svn-id: http://skia.googlecode.com/svn/trunk@1190 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-04-26 18:15:03 +00:00
tomhudson@google.com
6abfa49b97 Fix default value of doSerialize parameter (oops!). 
Change suffixes on auxiliary output directories to match names of flags
(-replay and -serialize).
Add to output messages an indication of whether this error occurred during
-replay or -serialize (no indication == standard rendering).



git-svn-id: http://skia.googlecode.com/svn/trunk@1185 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-04-26 14:59:32 +00:00
tomhudson@google.com
73fb0422a6 Add command-line parameters to control execution of SkPicture tests; default 
to off.
Emergency commit to fix broken test harness manually reviewed by reed@.



git-svn-id: http://skia.googlecode.com/svn/trunk@1177 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-04-25 19:20:54 +00:00
tomhudson@google.com
9875dd14af Extends gm to test SkPicture replay and serialization. 
Adds usage, fixes coding style violations.
http://codereview.appspot.com/4440063




git-svn-id: http://skia.googlecode.com/svn/trunk@1171 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-04-25 15:49:53 +00:00
vandebo@chromium.org
75f97e452e Generalize the flip origin argument to the PDF device constructor. 
The argument still has a default value that does what most users will want, but provides more flexibility.
Chrome will use this change to support an initial translation of the origin to simulate a margin and to scale the entire content (needed on Windows).

When landing to Chrome, this will need http://codereview.chromium.org/6820038

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

git-svn-id: http://skia.googlecode.com/svn/trunk@1111 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-04-11 23:24:18 +00:00
reed@google.com
c280700ad8 add pathfill gm sample 
git-svn-id: http://skia.googlecode.com/svn/trunk@1098 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-04-11 13:57:04 +00:00
reed@google.com
3b14dc1851 add strokerects to gm 
output current bench settings



git-svn-id: http://skia.googlecode.com/svn/trunk@1040 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-04-04 14:31:36 +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
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
senorblanco@chromium.org
4868e6b221 [Committed on behalf of junov@chromium.org] 
Fixed rendering of shadows under bitmaps.  
Added an option to SkBlurMask to produce higher quality blurs.  
The HQ blur option is propagated through SkBlurDrawLooper so that it can be invoked by WebKit for drawing shadows.
Added a shadow rendering test to gm.

Bugs fixed: 146, 150
Related Chromium bugs: 11153, 42654
Code review: http://codereview.appspot.com/4174049



git-svn-id: http://skia.googlecode.com/svn/trunk@818 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-02-18 19:03:01 +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
c96e5c2720 add new test for blurs 
git-svn-id: http://skia.googlecode.com/svn/trunk@803 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-02-16 21:50:04 +00:00
vandebo@chromium.org
686abdfab0 [PDF] Improve PDF support in gm. 
Currently gm ends up writing the same PDF four times.  This fixes that problem, making PDF a first class citizen and providing a better framework for additional backends.  Read support for PDF is still missing though.

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

git-svn-id: http://skia.googlecode.com/svn/trunk@759 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-02-03 23:00:40 +00:00
reed@google.com
386900790b fix warnings, including using GrTCast<> to go from &Obj -> uint32_t* 
git-svn-id: http://skia.googlecode.com/svn/trunk@732 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-01-26 01:44:18 +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
reed@google.com
d4dfd10bb6 add new 2nd argument for rendertarget to SkGpuCanvas 
git-svn-id: http://skia.googlecode.com/svn/trunk@707 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-01-18 21:05:42 +00:00
reed@google.com
0e4a885376 fix refcount bug - as picture gets referenced by canvas when canvas is a 
picture-recording canvas, so it can't live on the stack. Probably a bug:
nested pictures should probably ref some internal impl, so that callers can be
free to use the stack when they want to.



git-svn-id: http://skia.googlecode.com/svn/trunk@687 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-01-12 17:14:04 +00:00
reed@google.com
37df17d164 fix build for linux 
partial impl for GPU on linux (need getProcAddress and SkEGLContext)



git-svn-id: http://skia.googlecode.com/svn/trunk@661 2bbb7eff-a529-9590-31e7-b0007b416f81
 2010-12-23 20:20:51 +00:00
reed@google.com
51df9e3fe3 add gpu to gm tool 
add pass-through read/write pixels API to canvas



git-svn-id: http://skia.googlecode.com/svn/trunk@660 2bbb7eff-a529-9590-31e7-b0007b416f81
 2010-12-23 19:29:18 +00:00
reed@google.com
f3c1cc9063 update baselines to add 2point-radial gradients, and use gpu-friendly xfermode code 
git-svn-id: http://skia.googlecode.com/svn/trunk@658 2bbb7eff-a529-9590-31e7-b0007b416f81
 2010-12-23 16:45:33 +00:00
reed@google.com
873cb1e23b add gpu to the default makefile 
move skia-gpu files into skia/src/gpu



git-svn-id: http://skia.googlecode.com/svn/trunk@653 2bbb7eff-a529-9590-31e7-b0007b416f81
 2010-12-23 15:00:45 +00:00
reed@google.com
3d3f092a95 -d dir will write out a difference-bitmap for each compare that failes 
git-svn-id: http://skia.googlecode.com/svn/trunk@644 2bbb7eff-a529-9590-31e7-b0007b416f81
 2010-12-20 21:10:29 +00:00
reed@google.com
0770044da6 add option to write PDFs from gm 
fix some compile warnings (reorder initializers, init local ptr)



git-svn-id: http://skia.googlecode.com/svn/trunk@642 2bbb7eff-a529-9590-31e7-b0007b416f81
 2010-12-20 19:46:07 +00:00
reed@android.com
00f883e641 dump message confirming read or write directory 
git-svn-id: http://skia.googlecode.com/svn/trunk@634 2bbb7eff-a529-9590-31e7-b0007b416f81
 2010-12-14 17:46:14 +00:00
reed@android.com
b9b9a18ab4 use genericRGB space to ensure that we decode exactly the pixels we encode 
add -r option to gm to read and compare against known images



git-svn-id: http://skia.googlecode.com/svn/trunk@256 2bbb7eff-a529-9590-31e7-b0007b416f81
 2009-07-08 02:54:47 +00:00
reed@android.com
0ad336f8c6 add shape flatten so they work properly in pictures 
add flatten/unflatten to matrix



git-svn-id: http://skia.googlecode.com/svn/trunk@242 2bbb7eff-a529-9590-31e7-b0007b416f81
 2009-06-29 16:02:20 +00:00
reed@android.com
0bfffc59a0 add golden master code for shapes 
git-svn-id: http://skia.googlecode.com/svn/trunk@241 2bbb7eff-a529-9590-31e7-b0007b416f81
 2009-06-26 20:22:44 +00:00
reed@android.com
09b84a00f7 add shape recording to pictuures (sans serialization) 
git-svn-id: http://skia.googlecode.com/svn/trunk@240 2bbb7eff-a529-9590-31e7-b0007b416f81
 2009-06-26 20:22:26 +00:00
reed@android.com
048522dd2a remove remaining references to porterduff 
git-svn-id: http://skia.googlecode.com/svn/trunk@236 2bbb7eff-a529-9590-31e7-b0007b416f81
 2009-06-23 12:19:41 +00:00
reed@android.com
c9c6422903 update to use new xfermodes 
git-svn-id: http://skia.googlecode.com/svn/trunk@234 2bbb7eff-a529-9590-31e7-b0007b416f81
 2009-06-23 00:09:12 +00:00
reed@android.com
1a2fec55d9 add gm for shader tilemodes 
git-svn-id: http://skia.googlecode.com/svn/trunk@231 2bbb7eff-a529-9590-31e7-b0007b416f81
 2009-06-22 02:17:34 +00:00
reed@android.com
42309d415e add gm for gradients 
git-svn-id: http://skia.googlecode.com/svn/trunk@230 2bbb7eff-a529-9590-31e7-b0007b416f81
 2009-06-22 02:06:35 +00:00
reed@android.com
25b0434908 gm -w 'directory' now works for recording the master images 
git-svn-id: http://skia.googlecode.com/svn/trunk@229 2bbb7eff-a529-9590-31e7-b0007b416f81
 2009-06-21 01:40:31 +00:00
reed@android.com
8015dd83ae almost there on gm (need to fix image writes/reads/compares) 
move SkAutoGraphics into SkGraphics.h
add [] operators to SkString



git-svn-id: http://skia.googlecode.com/svn/trunk@228 2bbb7eff-a529-9590-31e7-b0007b416f81
 2009-06-21 00:49:18 +00:00
reed@android.com
dd0ac281e9 more progress on golden-master test suite (not finished yet) 
git-svn-id: http://skia.googlecode.com/svn/trunk@227 2bbb7eff-a529-9590-31e7-b0007b416f81
 2009-06-20 02:38:16 +00:00
reed@android.com
00dae86f58 checkpoint for golden master suite (gm) 
git-svn-id: http://skia.googlecode.com/svn/trunk@208 2bbb7eff-a529-9590-31e7-b0007b416f81
 2009-06-10 15:38:48 +00:00