AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
7,417 Commits 1 Branch 0 Tags 544 MiB
74ce6f046c
Commit Graph

4160 Commits

Author SHA1 Message Date
reed@google.com
74ce6f046c add dumpops.lua as a sample scraper that just dumps the arguments 
add SkLua.h for common utilities

BUG=
R=rmistry@google.com

Review URL: https://codereview.chromium.org/15737010

git-svn-id: http://skia.googlecode.com/svn/trunk@9242 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-05-22 15:13:18 +00:00
bsalomon@google.com
2db3ded335 Make GrGLProgramDesc's key variable length by compacting the effect key array 
R=robertphillips@google.com

Review URL: https://codereview.chromium.org/15252004

git-svn-id: http://skia.googlecode.com/svn/trunk@9239 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-05-22 14:34:04 +00:00
reed@google.com
8c6411a603 reenable lerpmode in gms, now that I think we fixed the global-initialization 
BUG=

Review URL: https://codereview.chromium.org/15737004

git-svn-id: http://skia.googlecode.com/svn/trunk@9234 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-05-22 13:21:32 +00:00
commit-bot@chromium.org
8f838259ab Add methods to SkLayerDrawLooper to allow adding layers on top 
as well as on the bottom.

This is more convenient for some callers who generate layers
from a data structure in bottom-to-top, rather than top-to-bottom,
order.

BUG=242529
R=tomhudson@chromium.org

Author: jbroman@chromium.org

Review URL: https://chromiumcodereview.appspot.com/15314003

git-svn-id: http://skia.googlecode.com/svn/trunk@9233 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-05-22 12:35:50 +00:00
skia.committer@gmail.com
b148aca07e Sanitizing source files in Housekeeper-Nightly 
git-svn-id: http://skia.googlecode.com/svn/trunk@9232 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-05-22 07:01:13 +00:00
robertphillips@google.com
b7457d0d3b Fix clang warnings/errors in Android only code 
git-svn-id: http://skia.googlecode.com/svn/trunk@9231 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-05-22 00:12:43 +00:00
reed@google.com
b83cb9bf89 add SkLerpXfermode 
BUG=
R=bsalomon@google.com

Review URL: https://codereview.chromium.org/15602003

git-svn-id: http://skia.googlecode.com/svn/trunk@9229 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-05-21 21:33:11 +00:00
scroggo@google.com
edef4aa8d8 Patch to prevent chromium breakage until the DEPS. 
Once https://codereview.chromium.org/15489004/ is submitted to
Skia, a DEPS roll into chrome will break due to a change in the
API. A long term fix for chrome to use the new API is at
https://codereview.chromium.org/15496006/, but since it depends
on the earlier Skia change, this patch fills in the gap.

Will be reverted once https://codereview.chromium.org/15496006/
is submitted to chrome.

R=djsollen@google.com

Review URL: https://codereview.chromium.org/15538005

git-svn-id: http://skia.googlecode.com/svn/trunk@9228 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-05-21 20:45:03 +00:00
scroggo@google.com
61d6c9ef8f Add prototype for warning. 
Fixes build.

Review URL: https://codereview.chromium.org/15536007

git-svn-id: http://skia.googlecode.com/svn/trunk@9227 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-05-21 20:38:40 +00:00
scroggo@google.com
1b1bcc3cea New API for encoding bitmaps during serialization. 
This change gives more flexibility to the implementation of
EncodeBitmap to prefer calling refEncodedData, doing its own
encode, or even doing both and making a decision about which
to use.

The new function signature also allows the implementation to
tell the ordered write buffer whether to store the pixel offset,
in the case where the encoded bitmap represents the larger
bitmap, or to ignore the pixel offset, in the case where the
implementation only encoded the subset that is used.

Requires changes to chromium to use the new function signature.
(https://codereview.chromium.org/15496006/)

SkPicture:
New API for EncodeBitmap.

SkOrderedReadBuffer:
Ifdef'd out addition of reading the offset.

SkOrderedWriteBuffer:
Never call refEncodedData. Allow the user to call that from their
EncodeBitmap function, if desired.
This addresses https://code.google.com/p/skia/issues/detail?id=1239
Add in ifdef'd out code to record the offset.

PictureTest and PictureRenderer:
Implement the new definition of EncodeBitmap. Also update the name
of the function to meet coding style guidelines.

BUG=https://code.google.com/p/skia/issues/detail?id=1239
R=reed@google.com

Review URL: https://codereview.chromium.org/15489004

git-svn-id: http://skia.googlecode.com/svn/trunk@9226 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-05-21 20:31:23 +00:00
reed@google.com
2522ac6448 remove extra return statement (doh) 
git-svn-id: http://skia.googlecode.com/svn/trunk@9225 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-05-21 20:30:17 +00:00
junov@chromium.org
b1c725a108 Fixing deferred canvases so that they do not return deferred devices on createCompatibleDevice 
TEST= DeferredCanvas unit test.

Review URL: https://codereview.chromium.org/15594004

git-svn-id: http://skia.googlecode.com/svn/trunk@9224 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-05-21 20:16:17 +00:00
djsollen@google.com
2e08f19943 Fix android font lookup bug 
R=reed@google.com

Review URL: https://codereview.chromium.org/15602002

git-svn-id: http://skia.googlecode.com/svn/trunk@9223 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-05-21 20:08:10 +00:00
reed@google.com
9a73104c1b add SkPath as real lua object 
R=robertphillips@google.com

Review URL: https://codereview.chromium.org/15563013

git-svn-id: http://skia.googlecode.com/svn/trunk@9221 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-05-21 17:52:33 +00:00
djsollen@google.com
ab6eeb9d84 Fix release build warnings for unused variables 
R=rmistry@google.com

Review URL: https://codereview.chromium.org/15565008

git-svn-id: http://skia.googlecode.com/svn/trunk@9220 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-05-21 17:15:27 +00:00
djsollen@google.com
bfae9d373c Add a fontConfig interface for android. 
The contents of this CL are based on the SkFontHost_android.cpp found
in the android repository.

BUG=
R=reed@google.com

Review URL: https://codereview.chromium.org/14731025

git-svn-id: http://skia.googlecode.com/svn/trunk@9219 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-05-21 16:53:50 +00:00
djsollen@google.com
7768751b8b Add buffer helper to read directly into SkString to avoid extra copying 
R=reed@google.com

Review URL: https://codereview.chromium.org/15179008

git-svn-id: http://skia.googlecode.com/svn/trunk@9218 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-05-21 16:17:14 +00:00
mike@reedtribe.org
f02fe3d4fe support SkCanvas as a real lua object 
git-svn-id: http://skia.googlecode.com/svn/trunk@9208 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-05-21 12:20:39 +00:00
skia.committer@gmail.com
3e50e99fe7 Sanitizing source files in Housekeeper-Nightly 
git-svn-id: http://skia.googlecode.com/svn/trunk@9207 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-05-21 07:01:40 +00:00
commit-bot@chromium.org
1f6aed0b1c Move SkImage::encode to SkImage_Codec.cpp. 
Chrome depends on SkImage.cpp, but does not include SkImageDecoder,
so having SkImage::encode in SkImage.cpp breaks chromium. Temporarily
fix the problem by moving the implementation into SkImage_Codec.cpp.

The larger fix will be to solve
https://code.google.com/p/skia/issues/detail?id=1275

R=reed@google.com, robertphillips@google.com

Author: scroggo@google.com

Review URL: https://chromiumcodereview.appspot.com/15314004

git-svn-id: http://skia.googlecode.com/svn/trunk@9204 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-05-20 23:57:38 +00:00
humper@google.com
2b71c439af fix boolean check for unknown rtconf variables in files. 
BUG=

Review URL: https://codereview.chromium.org/15300019

git-svn-id: http://skia.googlecode.com/svn/trunk@9198 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-05-20 17:14:40 +00:00
reed@google.com
74babdfce5 add SkDrawPictureCallback optional parameter to drawPicture(), which can abort the picture drawing. 
R=bsalomon@google.com

Review URL: https://codereview.chromium.org/14598023

git-svn-id: http://skia.googlecode.com/svn/trunk@9197 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-05-20 17:02:41 +00:00
scroggo@google.com
67882ddc0e Make DecodeMemoryToTarget handle more configs. 
In SkImageDecoder::DecodeMemoryToTarget, if SkBitmapToImageInfo fails due to an unsupported config, copy to 8888.

Needed for https://codereview.chromium.org/15145004/ and
https://codereview.chromium.org/12851012/ for all bitmaps to be
decoded properly in render_pictures and bench_pictures.

R=reed@google.com

Review URL: https://codereview.chromium.org/14772035

git-svn-id: http://skia.googlecode.com/svn/trunk@9196 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-05-20 16:58:16 +00:00
bsalomon@google.com
1dd9baa6c8 Reland path bounds change with correct bounds for convex and hairline path renderers. 
R=robertphillips@google.com

Review URL: https://codereview.chromium.org/15465005

git-svn-id: http://skia.googlecode.com/svn/trunk@9194 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-05-20 16:49:06 +00:00
reed@google.com
4b0757b748 add encodeData() to SkImageEncoder, and add encoding to SkImage 
BUG=
R=scroggo@google.com

Review URL: https://codereview.chromium.org/15002004

git-svn-id: http://skia.googlecode.com/svn/trunk@9193 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-05-20 16:33:41 +00:00
skia.committer@gmail.com
845220b817 Sanitizing source files in Housekeeper-Nightly 
git-svn-id: http://skia.googlecode.com/svn/trunk@9189 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-05-20 11:51:35 +00:00
bsalomon@google.com
20f7f173e0 One SkTSearch to rule them all. Allow key to be of different type than the array. 
R=bungeman@google.com

Review URL: https://codereview.chromium.org/15070011

git-svn-id: http://skia.googlecode.com/svn/trunk@9182 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-05-17 19:05:03 +00:00
bsalomon@google.com
d7c3742580 Revert "Revert "Revert "Pass bounds into draw calls in path renderers.""" 
git-svn-id: http://skia.googlecode.com/svn/trunk@9181 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-05-17 18:01:38 +00:00
bsalomon@google.com
0bf4d47e3c fix uninitialized adcd 
git-svn-id: http://skia.googlecode.com/svn/trunk@9177 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-05-17 13:31:57 +00:00
bsalomon@google.com
2f2d1306ec Revert "Revert "Pass bounds into draw calls in path renderers."" 
This reverts commit 2b80eb179df14c7c8d67b8ef2b2ee60efc504f65.

git-svn-id: http://skia.googlecode.com/svn/trunk@9176 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-05-17 13:31:40 +00:00
robertphillips@google.com
83d1a68141 Add special handling of rectori case for gpu 
https://codereview.chromium.org/15080010/



git-svn-id: http://skia.googlecode.com/svn/trunk@9175 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-05-17 12:50:27 +00:00
skia.committer@gmail.com
8be02fc2a7 Sanitizing source files in Housekeeper-Nightly 
git-svn-id: http://skia.googlecode.com/svn/trunk@9174 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-05-17 07:01:11 +00:00
bsalomon@google.com
9a9c3d5535 Revert "Pass bounds into draw calls in path renderers." 
This reverts commit 9e6c4259d8453b893b4abc28beba8f77226d18d1.

git-svn-id: http://skia.googlecode.com/svn/trunk@9173 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-05-16 20:54:05 +00:00
bsalomon@google.com
f438c97258 Pass bounds into draw calls in path renderers. 
R=jvanverth@google.com, robertphillips@google.com

Review URL: https://codereview.chromium.org/14882011

git-svn-id: http://skia.googlecode.com/svn/trunk@9171 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-05-16 19:58:46 +00:00
scroggo@google.com
719a3733ae Band-aid for subsetted bitmaps in SKPs. 
Partial fix for https://code.google.com/p/skia/issues/detail?id=1301.

Instead of firing an assert when the recorded width and height do
not match the encoded data's width and height, take a subset of
the bitmap of the correct size.

The bitmap may be drawn incorrectly, since it will not necessarily
be the correct subset (though it will be the correct size). The
complete fix will be to record the offset to the stream. Holding off
on that since it will change the PICTURE_VERSION. There is still
more work to do on read/writeBitmap, and I would like to change
PICTURE_VERSION as few times as possible.

BUG=https://code.google.com/p/skia/issues/detail?id=1301
R=djsollen@google.com

Review URL: https://codereview.chromium.org/15159004

git-svn-id: http://skia.googlecode.com/svn/trunk@9169 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-05-16 19:35:39 +00:00
djsollen@google.com
9401deeb10 Make the use of fallback fonts in Android a runtime decision. 
R=reed@google.com

Review URL: https://codereview.chromium.org/14972022

git-svn-id: http://skia.googlecode.com/svn/trunk@9168 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-05-16 18:38:43 +00:00
reed@google.com
57de5cfe42 add the following fields to the lua accumulate table: 
- rrect.rect
- rrect[1..8] for radii
- rrect.type = "empty|rect|oval|simple|complex"
- path.isRect, path.isOval

Review URL: https://codereview.chromium.org/15192003

git-svn-id: http://skia.googlecode.com/svn/trunk@9163 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-05-16 13:51:07 +00:00
commit-bot@chromium.org
6bb3efc4db Better method for rendering AA ellipses. 
This uses the standard ellipse equation as a signed distance 
test, and adjusts the result by the length of the gradient 
at that point to get a better approximation of the distance 
to the ellipse. It replaces the standard ellipse and 
roundrect shader renderers.

Also adds a check to see if the curvature extrema of the 
stroke are less than the curvature extrema of the ellipse (i.e. 
the radius of curvature is larger). In this case, it's no 
longer an ellipse and we can't use this renderer.

Only supports stroking for near-circular ellipses.

R=bsalomon@google.com, robertphillips@google.com

Author: jvanverth@google.com

Review URL: https://chromiumcodereview.appspot.com/14938004

git-svn-id: http://skia.googlecode.com/svn/trunk@9162 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-05-16 13:14:46 +00:00
skia.committer@gmail.com
539f364e80 Sanitizing source files in Housekeeper-Nightly 
git-svn-id: http://skia.googlecode.com/svn/trunk@9159 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-05-16 07:01:00 +00:00
mike@reedtribe.org
1c5a94f5e0 lua accumulate now receives a table of the draw parameters 
git-svn-id: http://skia.googlecode.com/svn/trunk@9158 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-05-16 04:20:23 +00:00
djsollen@google.com
6930b57221 Move the FontConfigTypeface class into private header. 
R=reed@google.com

Review URL: https://codereview.chromium.org/15111004

git-svn-id: http://skia.googlecode.com/svn/trunk@9154 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-05-15 20:11:20 +00:00
reed@google.com
dff7e11c20 add SkLuaCanvas 
add lua 5.2 to third_party

BUG=
R=bungeman@google.com

Review URL: https://codereview.chromium.org/14907017

git-svn-id: http://skia.googlecode.com/svn/trunk@9149 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-05-15 19:34:20 +00:00
bsalomon@google.com
0c89db2929 Disable blending when there is an effect that reads the dst and draw state blend is 1,0. 
R=robertphillips@google.com

Review URL: https://codereview.chromium.org/15199008

git-svn-id: http://skia.googlecode.com/svn/trunk@9147 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-05-15 17:53:04 +00:00
bsalomon@google.com
d09ab84678 Don't make dst copies when color stage requires dst but color writes are disabled. 
R=robertphillips@google.com

Review URL: https://codereview.chromium.org/15001035

git-svn-id: http://skia.googlecode.com/svn/trunk@9146 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-05-15 17:30:26 +00:00
bungeman@google.com
cefd981a4c Fix vertical text scaling and clipping on Mac. 
https://codereview.chromium.org/15064003/


git-svn-id: http://skia.googlecode.com/svn/trunk@9142 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-05-15 15:07:32 +00:00
scroggo@google.com
f98118e65c Provide a function to print the name of a Format. 
Also use SkToU32 instead of a flat cast.

R=djsollen@google.com

Review URL: https://codereview.chromium.org/14565005

git-svn-id: http://skia.googlecode.com/svn/trunk@9139 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-05-15 14:53:49 +00:00
skia.committer@gmail.com
eafdf126d4 Sanitizing source files in Housekeeper-Nightly 
git-svn-id: http://skia.googlecode.com/svn/trunk@9135 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-05-15 07:01:09 +00:00
commit-bot@chromium.org
5da3f22003 Fix includes in SkLayerDrawLooper.h. It was previously not possible to 
include this header unless SkPoint and SkPaint were previously defined.

BUG=
R=reed@google.com, senorblanco@chromium.org

Author: jbroman@chromium.org

Review URL: https://chromiumcodereview.appspot.com/14607015

git-svn-id: http://skia.googlecode.com/svn/trunk@9130 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-05-14 20:11:23 +00:00
bsalomon@google.com
944c504961 Remove assert that is no longer valid. 
R=robertphillips@google.com

Review URL: https://codereview.chromium.org/14671017

git-svn-id: http://skia.googlecode.com/svn/trunk@9129 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-05-14 19:55:56 +00:00
robertphillips@google.com
afd1cba523 Re-add isIRect test for AA rect drawing 
https://codereview.chromium.org/14820035/



git-svn-id: http://skia.googlecode.com/svn/trunk@9128 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-05-14 19:47:47 +00:00