AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
6,695 Commits 1 Branch 0 Tags 544 MiB
67e7cde5c5
Commit Graph

6695 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
reed@google.com
67e7cde5c5 revert 8265-8264 (broke build) 
git-svn-id: http://skia.googlecode.com/svn/trunk@8268 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-03-20 17:47:16 +00:00
djsollen@google.com
113994051b Upstream changes from Android for decoding jpeg images. 
Review URL: https://codereview.chromium.org/12438025

git-svn-id: http://skia.googlecode.com/svn/trunk@8267 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-03-20 17:45:27 +00:00
bsalomon@google.com
4d9853288b Fix build breakage. 
git-svn-id: http://skia.googlecode.com/svn/trunk@8265 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-03-20 17:41:50 +00:00
bsalomon@google.com
ae81d5c4aa Adds local coords to GrEffect system. 
Effects can ask the builder for local coords which may or may not be distinct from positions.

GrEffectStage tracks changes to relationship between pos and local coords.

GrGLEffectMatrix and GrSingleTextureEffect can use either pos or textures as intput coords

GrSimpleTextureEffect now allows for an explicit texture coords attribute.
Review URL: https://codereview.chromium.org/12531015

git-svn-id: http://skia.googlecode.com/svn/trunk@8264 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-03-20 17:32:27 +00:00
junov@google.com
723dd790fb Unreviewed. Adding TODO comment to reference newly filed bug. 
git-svn-id: http://skia.googlecode.com/svn/trunk@8263 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-03-20 16:54:30 +00:00
djsollen@google.com
6e32c4627b Remove SK_ENABLE_LIBPNG define as it is no longer needed by Android. 
Review URL: https://codereview.chromium.org/12958002

git-svn-id: http://skia.googlecode.com/svn/trunk@8262 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-03-20 16:07:37 +00:00
epoger@google.com
8e3fb2d6f4 comments only: update docs for SkStream::readData(), SkWStream::writeData() 
BUG=https://code.google.com/p/skia/issues/detail?id=1167
Review URL: https://codereview.chromium.org/12604012

git-svn-id: http://skia.googlecode.com/svn/trunk@8260 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-03-20 15:56:03 +00:00
djsollen@google.com
a4ecab08b6 Remove unused declaration 
Review URL: https://codereview.chromium.org/12704017

git-svn-id: http://skia.googlecode.com/svn/trunk@8257 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-03-20 15:50:59 +00:00
scroggo@google.com
0f567c6cb6 Write the config options in place in the help string. 
Fixes for gm.

Builds on https://codereview.chromium.org/12955002/

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

git-svn-id: http://skia.googlecode.com/svn/trunk@8256 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-03-20 15:35:08 +00:00
robertphillips@google.com
acef3c4082 Reverting r8233 (Use SkSet in PDF) 
git-svn-id: http://skia.googlecode.com/svn/trunk@8255 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-03-20 14:42:51 +00:00
scroggo@google.com
09fd4d2169 Reland r8235 "Switch gm to use SkFlags." 
This time, using #if guards for gpuCacheSize consistently.

Also fix some warnings.

BUG=https://code.google.com/p/skia/issues/detail?id=1094

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

git-svn-id: http://skia.googlecode.com/svn/trunk@8254 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-03-20 14:20:18 +00:00
reed@google.com
f210f505ff add new API for gdi fonts (not hooked up yet) 
git-svn-id: http://skia.googlecode.com/svn/trunk@8253 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-03-20 14:15:52 +00:00
djsollen@google.com
cb62650ecf Add --resourcePath flag to the test program. 
Review URL: https://codereview.chromium.org/12521016

git-svn-id: http://skia.googlecode.com/svn/trunk@8252 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-03-20 13:48:20 +00:00
commit-bot@chromium.org
c4de776101 Add an entry for Cambria-Caladea to the list of metric compatible fonts. 
Caladea is going to be included in Chromium/Chrome OS as a substitute for Cambria. (see https://gerrit.chromium.org/gerrit/#/c/45888/ ).


BUG=chromium:168879
TEST=See the bug and the ChromeOS CL above.

Author: jshin@chromium.org

Reviewed By: reed@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@8251 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-03-20 13:33:33 +00:00
rmistry@google.com
b56277efc8 Whitespace change to trigger rebuilds since skia-autogen looks ok now 
git-svn-id: http://skia.googlecode.com/svn/trunk@8250 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-03-20 13:20:16 +00:00
skia.committer@gmail.com
01c34ee599 Sanitizing source files in Skia_Periodic_House_Keeping 
git-svn-id: http://skia.googlecode.com/svn/trunk@8249 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-03-20 07:01:02 +00:00
commit-bot@chromium.org
3fbab82bd3 Fixing deferred canvas bug caused by SkTwoPointConicalGradient declaring itself as opaque. 
BUG=https://code.google.com/p/chromium/issues/detail?id=222140
TEST=DeferredCanvas unit test + DRT with --enable-deferred-2d-canvas

Author: junov@chromium.org

Reviewed By: bsalomon@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@8247 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-03-20 00:49:57 +00:00
robertphillips@google.com
f4b6763b95 Removed GrEffectStage::fVertexAttribCount to fix Chrome compilation warning/error 
git-svn-id: http://skia.googlecode.com/svn/trunk@8245 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-03-20 00:28:46 +00:00
bsalomon@google.com
f3a60c09b9 Add support for IMG's MSAA extension. 
Review URL: https://codereview.chromium.org/12875005

git-svn-id: http://skia.googlecode.com/svn/trunk@8241 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-03-19 19:06:09 +00:00
bsalomon@google.com
4c75f241cb Reland MSAA changes to GM now that Linux/ATI driver bug has been worked around. 
git-svn-id: http://skia.googlecode.com/svn/trunk@8240 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-03-19 18:58:43 +00:00
bsalomon@google.com
202d139452 Work around MSAA/lines issue on Linux bot. 
Review URL: https://codereview.chromium.org/12938005

git-svn-id: http://skia.googlecode.com/svn/trunk@8239 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-03-19 18:58:08 +00:00
jvanverth@google.com
65eb4d5a21 Add stroked ovals and CircleEdgeEffect. 
Adds some optimizations to the circle and ellipse shaders, static effect 
instances for their GrEffects, and some minor changes to GrDrawState::setEffect
to make GrEffect setup faster.


git-svn-id: http://skia.googlecode.com/svn/trunk@8238 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-03-19 18:51:02 +00:00
scroggo@google.com
0b735631b7 Revert "Make gm use SkFlags." 
Fix the build.

This reverts commit 6f1fe2aee39308fc56854b062be244a904c209e7.

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

git-svn-id: http://skia.googlecode.com/svn/trunk@8236 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-03-19 17:38:50 +00:00
scroggo@google.com
7d519305bb Make gm use SkFlags. 
Make flag parser its own project. It is still in the tools folder,
but can now be used by other projects.

Some changes to behavior in order to work with SkFlags:
enable-missing-warning and disable-missing-warning have become
enableMissingWarning and noenableMissingWarning.

exclude-config is now excludeConfig

--config now can only be listed once, but all configs listed
after it will be included (same with excludeConfig and match).

In addition, writeJsonSummary has been changed to
writeJsonSummaryPath for consistency with other path flags.

Provide an option to SkFlags to provide a short name, and use
it for the flags which have short names.

--tileGridReplayScales now takes space separated arguments,
like other inputs.

BUG=https://code.google.com/p/skia/issues/detail?id=1094

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

git-svn-id: http://skia.googlecode.com/svn/trunk@8235 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-03-19 17:28:10 +00:00
edisonn@google.com
66bedbb02d resubmit https://code.google.com/p/skia/source/detail?r=7883 (in the meantime we added capability to collect minidump and callstack if buildbot fails with heap coruption in windows. a few minor conflicts have been resolved) 
Review URL: https://codereview.chromium.org/12840004

git-svn-id: http://skia.googlecode.com/svn/trunk@8233 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-03-19 17:19:05 +00:00
bsalomon@google.com
f315451f78 Revert changes to GM MSAA configs, hopefully fixes linux bot gm failures. 
git-svn-id: http://skia.googlecode.com/svn/trunk@8232 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-03-19 16:43:40 +00:00
reed@google.com
0da48618a7 remove SkFontHost::CreateScalerContext 
Review URL: https://codereview.chromium.org/12593013

git-svn-id: http://skia.googlecode.com/svn/trunk@8228 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-03-19 16:06:52 +00:00
bsalomon@google.com
a83d3d8865 fix angle gmmain build 
git-svn-id: http://skia.googlecode.com/svn/trunk@8226 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-03-19 15:19:41 +00:00
sugoi@google.com
4ecd42e4bf Fix for displacement mapping 
Fixed the skia displacement map effect to match the WebKit displacement map fix.
Review URL: https://codereview.chromium.org/12787007

git-svn-id: http://skia.googlecode.com/svn/trunk@8225 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-03-19 15:07:30 +00:00
reed@google.com
56a2e0de63 fix double->float warnings 
git-svn-id: http://skia.googlecode.com/svn/trunk@8224 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-03-19 14:50:41 +00:00
reed@google.com
90808e87c2 Add SkTypeface* parameter to SkScalerContext (and its callers) 
Use SkTypeface to create scalercontext instead of SkFontHost
Review URL: https://codereview.chromium.org/12706010

git-svn-id: http://skia.googlecode.com/svn/trunk@8223 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-03-19 14:44:54 +00:00
bsalomon@google.com
14687813ea Fix build break in gmmain.cpp 
git-svn-id: http://skia.googlecode.com/svn/trunk@8222 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-03-19 14:35:41 +00:00
bsalomon@google.com
40deeadf6f Add config msaa4 to gm (not run by default) and make MSAA configs not run unless 
sample count is <= the max.
Review URL: https://codereview.chromium.org/12554012

git-svn-id: http://skia.googlecode.com/svn/trunk@8221 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-03-19 14:28:36 +00:00
robertphillips@google.com
6a2ea6909b More performance rebaselines 
git-svn-id: http://skia.googlecode.com/svn/trunk@8220 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-03-19 14:20:22 +00:00
commit-bot@chromium.org
e4657ed7e1 Add a macro for querying the byte order of SkPMColor. 
R=reed@google.com

Author: bsalomon@google.com

Reviewed By: reed@google.com,epoger@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@8219 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-03-19 14:16:31 +00:00
robertphillips@google.com
14c3fc60b2 Adding rects-specific GM 
https://codereview.chromium.org/12934003/



git-svn-id: http://skia.googlecode.com/svn/trunk@8218 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-03-19 14:11:15 +00:00
bsalomon@google.com
8a70eef71c Add MSAA configs to bench. 
Review URL: https://codereview.chromium.org/12607013

git-svn-id: http://skia.googlecode.com/svn/trunk@8217 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-03-19 13:58:55 +00:00
reed@google.com
8c3f84d13f use SkStream::NewFromFile() 
git-svn-id: http://skia.googlecode.com/svn/trunk@8216 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-03-19 13:34:55 +00:00
robertphillips@google.com
f735cb3ea3 Remove SkMMapStream.h from core.gypi 
git-svn-id: http://skia.googlecode.com/svn/trunk@8214 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-03-19 12:29:06 +00:00
skia.committer@gmail.com
8eaddb0089 Sanitizing source files in Skia_Periodic_House_Keeping 
git-svn-id: http://skia.googlecode.com/svn/trunk@8211 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-03-19 07:15:10 +00:00
mike@reedtribe.org
f381162e56 use SkStream::NewFromFile() 
git-svn-id: http://skia.googlecode.com/svn/trunk@8210 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-03-19 02:18:33 +00:00
mike@reedtribe.org
54d5f83c33 update coding style 
git-svn-id: http://skia.googlecode.com/svn/trunk@8209 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-03-19 02:12:50 +00:00
scroggo@google.com
bb281f7f96 Improvements/additions to SkImageCache/SkLazyPixelRef. 
SkPurgeableImageCache:
New image cache that uses virtual memory to store the pixels. Combines
features of SkAshmemImageCache (which has been removed) with SkPurgeableMemoryBlock, which has android and Mac versions.

SkImageCache:
Modified the API. pinCache now returns a status out parameter which
states whether the pinned memory retained the old data. This allows
allocAndPinCache to only be used for allocations.
Add a new debug only interface to purge unpinned data.
Updates to documentation, clarifying behavior.
Changed CachedStatus to MemoryStatus

SkLruImageCache:
Implement the new function purgeAllUnpinnedCaches and change implementation
of pinCache for the new behavior.

SkLazyPixelRef:
Rewrite onLockPixels to account for the new behavior of pinCache.

BitmapFactoryTest:
Test the new SkPurgeableImageCache.
Write tests which directly test the SkImageCaches.
Create a larger bitmap, since some of the SkImageCaches are designed
to handle large bitmaps.

bench_ and render_pictures:
Consolidate lazy_decode_bitmap into one function.
Allow using a flag to specify using the purgeable image cache.
Clean up some #includes.

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

git-svn-id: http://skia.googlecode.com/svn/trunk@8207 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-03-18 21:37:39 +00:00
reed@google.com
e1575aa216 reland 8200 w/ fix for android (use fullpath instead of path) 
Review URL: https://codereview.chromium.org/12921003

git-svn-id: http://skia.googlecode.com/svn/trunk@8206 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-03-18 21:08:46 +00:00
reed@google.com
070235e746 revert 8204 -- what is happening??? 
git-svn-id: http://skia.googlecode.com/svn/trunk@8205 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-03-18 20:53:49 +00:00
reed@google.com
4f7e846cd8 reland 8200 w/ fix for android (need fullpath instead of path) 
git-svn-id: http://skia.googlecode.com/svn/trunk@8204 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-03-18 20:49:28 +00:00
scroggo@google.com
a6c76db94c Do not use SkTDS32Array when building for 64 bit. 
This class is used for pointers, which won't work on 64 bit.
Fixes SampleApp on Mac debug 64 bit.

BUG=https://code.google.com/p/skia/issues/detail?id=1169

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

git-svn-id: http://skia.googlecode.com/svn/trunk@8203 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-03-18 19:55:57 +00:00
reed@google.com
1311f7e7f4 revert 8200 to figure out android break 
git-svn-id: http://skia.googlecode.com/svn/trunk@8201 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-03-18 19:32:58 +00:00
reed@google.com
d5ea2aeb60 move SK_MMAP_SUPPORT into SkPreConfig, so we can know about its availability 
throughout the code.

Add SkData::NewFromMMap() help factory.

Refactor (now gone) SkMMapStream into SkStream::NewFromFile() factory
Review URL: https://codereview.chromium.org/12919013

git-svn-id: http://skia.googlecode.com/svn/trunk@8200 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-03-18 19:08:46 +00:00
borenet@google.com
a74302d628 Use "svn cat" in tools/submit_try 
(SkipBuildbotRuns)
Review URL: https://codereview.chromium.org/12726006

git-svn-id: http://skia.googlecode.com/svn/trunk@8197 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-03-18 18:18:26 +00:00