| 4e4a89dab47d74874d6a79c4b34d89ffbfb386af |
|
14-Aug-2014 |
Derek Sollenberger <djsollen@google.com> |
Merge changes from Skia's m37 branch into lmp-dev.
This merge includes the following CLs...
0d78ac2 Set maximum output size for scaled-image-cache images
0c1c911 Adding 64 bit checks
f2d87ba Get additional DW font metrics when available.
Bug: 17024392
Change-Id: I7956f50e5b95b1e012cf56614b12f1d834b423c1
/external/skia/tests/Android.mk
|
| fd33437fecbd8d252d53d61b98b270ade608b172 |
|
20-Jun-2014 |
Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> |
Merge "Move BenchTimer to tools as Timer" into master-skia
https://skia.googlesource.com/skia/+/9ac68ee
Change-Id: I7dc24b601cc1e7bbbc1129b710adc7ff4ec2174b
|
| ab13a9fbecb1a02a2ef660d60cf171d344321922 |
|
20-Jun-2014 |
Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> |
Merge "Revert of Move BenchTimer to tools as Timer (https://codereview.chromium.org/344213003/)" into master-skia
https://skia.googlesource.com/skia/+/9e64b78
Change-Id: I0d5ca3b3f94bb665dc9ac5eecb0b3d41a5afdf54
|
| 0ec0eac8419433256295c74dd2214502408f18a2 |
|
20-Jun-2014 |
Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> |
Merge "Move BenchTimer to tools as Timer" into master-skia
https://skia.googlesource.com/skia/+/4ed7528
Change-Id: Ic2d1a8c7357bc2b693384423587f99bab72397b3
|
| 03d9deec706cd92f8f6524bdabc788a8df50ddf4 |
|
18-Jun-2014 |
Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> |
Merge "Refactor how we handle resources path in Tests." into master-skia
https://skia.googlesource.com/skia/+/bcbc178
Change-Id: Idecea6249a2a1874080c9eaee9a57709fdb0fcbe
|
| 1dc1ba0639572b75b46770f496d18ec003d5b874 |
|
18-Jun-2014 |
Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> |
Merge "Add basic stacktrace handler using libunwind." into master-skia
https://skia.googlesource.com/skia/+/30e6e2a
Change-Id: I845b3fafadc2842c38996c154bf7dbe17859d809
|
| 0cb12c143b442de53bd0112cf7ad6c77a18e0a80 |
|
17-Jun-2014 |
Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> |
Merge "Add EXPERIMENTAL_beginRecording() for SkRecord-based recording." into master-skia
https://skia.googlesource.com/skia/+/887f397
Change-Id: Icfd224e82066b1f71d77b38629ac6d60568ac63c
|
| a8dbe3f21c692b274486d03e7e44b4d19a0ea06b |
|
17-Jun-2014 |
Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> |
Merge "Silence warnings about using offsetof on near-POD structs." into master-skia
https://skia.googlesource.com/skia/+/24ad096
Change-Id: If7bd992905da096c98e415c3da88949ca4069d9d
|
| b6faff609c1428c3c69def9de750f6caf3273d79 |
|
12-Jun-2014 |
Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> |
Merge "Cleanup: Delete sk_tools::make_filepath() in favor of SkOSPath::SkPathJoin()." into master-skia
https://skia.googlesource.com/skia/+/da4ed32
Change-Id: I6b237a1ae3e2109bcdfcec79c92bcfbf9296cabb
|
| 77e5291ca6903c9e9351c53d358a41ee181a12ce |
|
11-Jun-2014 |
Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> |
Merge "Texture compression unit tests along with a couple of bug fixes" into master-skia
https://skia.googlesource.com/skia/+/2b310e4
Change-Id: I96938abbfe517aa357439f2570081c9783e08a4e
|
| 9503b8fb5bd302be3ae2ad9fc96b2cc91724a24f |
|
09-Jun-2014 |
Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> |
Merge "Generate path names on the client side" into master-skia
https://skia.googlesource.com/skia/+/5119234
Change-Id: Ida526ebeebc9f3fd3292bdd694179dae3574e383
|
| 9e143897ca864c4b577887b26250584ad1e2a75f |
|
06-Jun-2014 |
Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> |
Merge "Initial KTX encoder" into master-skia
https://skia.googlesource.com/skia/+/c250d2e
Change-Id: Ic51e46f0eb6a1ac4bd9cfabf25c9e7c2828eee38
|
| ab312cb7e11a396b04e93f042b198763bdd04e5e |
|
04-Jun-2014 |
Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> |
Merge "Add non power of two gm for ETC1 bitmap" into master-skia
https://skia.googlesource.com/skia/+/2dc337c
Change-Id: Ib8e3cd42167df59861b34dff6a5975cd3aea09e0
|
| 6a890e7034bcf44a7dd6697e6970f814e8852300 |
|
04-Jun-2014 |
Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> |
Merge "Android: remove -lcutils dependency" into master-skia
https://skia.googlesource.com/skia/+/bec3634
Change-Id: I078b513c9037b748d98a424ad45625985bbdd7e1
|
| f56b9c160fe9eba8bfa1779a4ee54b0082a278b3 |
|
30-May-2014 |
Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> |
Merge "Test font created from paint" into master-skia
https://skia.googlesource.com/skia/+/7ae034d
Change-Id: I6f79db659d1ea5eb92907a0c626dd309d7a37697
|
| dd9fdd91285c6e71431bafc11d0d7b5bcabb203f |
|
29-May-2014 |
Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> |
Merge "Add testing for Rectanizer-derived classes" into master-skia
https://skia.googlesource.com/skia/+/ad854bf
Change-Id: If4417333964928df4184bcbc44803891d061df1d
|
| 24d69ffe7d66ee1f2bb2f675caf53c67ebb51510 |
|
06-May-2014 |
Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> |
Merge Skia at r14582
Change-Id: I03e9b5ffc8739c45e8f2389926079e6cf0d765fa
|
| b972454f6908d6e5236ef27c7305c3d59ca7f6ad |
|
30-Apr-2014 |
Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> |
Merge Skia at r14456
Change-Id: I75c8a9d99af37ff80ac30ebd6d88740954650996
|
| 58b38c2d473883bbc7f7c8a080560fe117cdfef6 |
|
29-Apr-2014 |
Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> |
Merge Skia at r14430
Change-Id: Id34bf0a8fe8a0faae87c620542ddaa9f37121d7a
|
| f397b21b691b7ea535dc764590704946cfff7899 |
|
17-Jan-2014 |
Derek Sollenberger <djsollen@google.com> |
Merge Skia r12682 into Android.
Conflicts:
include/core/SkDraw.h
include/pdf/SkPDFDevice.h
include/utils/SkCanvasStateUtils.h
include/utils/SkFrontBufferedStream.h
src/core/SkDevice.cpp
src/core/SkDeviceLooper.cpp
src/core/SkDeviceLooper.h
src/core/SkRRect.cpp
src/doc/SkDocument_PDF.cpp
src/effects/SkBlurMaskFilter.cpp
src/fonts/SkFontMgr_fontconfig.cpp
src/gpu/GrAAHairLinePathRenderer.cpp
src/gpu/GrAAHairLinePathRenderer.h
src/gpu/GrTextContext.cpp
src/images/SkImageDecoder_libpng.cpp
src/images/SkScaledBitmapSampler.cpp
src/images/SkScaledBitmapSampler.h
src/pdf/SkPDFDevice.cpp
src/pdf/SkPDFDeviceFlattener.cpp
src/ports/SkFontConfigInterface_android.cpp
src/ports/SkFontHost_FreeType.cpp
src/ports/SkFontHost_FreeType_common.cpp
src/utils/SkCanvasStack.cpp
src/utils/SkCanvasStack.h
src/utils/SkCanvasStateUtils.cpp
src/utils/SkDeferredCanvas.cpp
src/utils/SkFrontBufferedStream.cpp
src/utils/SkPictureUtils.cpp
Change-Id: Ice86d9769ed99f804932d8839acfdea695cb6d28
|
| 72689a0db4cd82519fd7b54e02f2177250105182 |
|
08-Oct-2013 |
Derek Sollenberger <djsollen@google.com> |
We don't flatten or unflatten SkPaintOptionsAndroid. Reproduce and fix.
cherry-pick of http://code.google.com/p/skia/source/detail?r=11472
bug: 11115961
Change-Id: I0ed8af0bdec006178e5e6bd1c0a0c4f1cb517961
/external/skia/tests/Android.mk
|
| cc7508b2ab7e56d42c1c4b75dff028286d3d3341 |
|
11-Sep-2013 |
Leon Scroggins III <scroggo@google.com> |
Fixes in support of framework changes.
Two Skia changes required for
https://googleplex-android-review.git.corp.google.com/#/c/357301/:
https://codereview.chromium.org/23464068/:
Use the default resync_to_restart in jpeg.
Our version requires rewinding the stream, which is not always
supported. Instead, depend on jpeg's default version.
This is required because the new framework code assumes that an
image stream will never be rewound unless it's at the beginning.
https://codereview.chromium.org/23717055/:
Add a buffered SkStream class.
This is used by Android to buffer an input stream which may not
otherwise be able to rewind.
Add a test for the new class.
This change allows us to buffer natively, and to only buffer the
beginning of the stream, which is all that is needed by the image
decoders.
BUG:8432093
BUG:6493544
BUG:10725383
Change-Id: I39fb1346866066693e14b6bcab1c398b9befa296
/external/skia/tests/Android.mk
|
| fa0ab893eb60a41aac6945ab26d2b3a7e38443c4 |
|
29-Aug-2013 |
Derek Sollenberger <djsollen@google.com> |
Create a semi-stable API for capturing the state of an SkCanvas and reconstructing that state across different versions of Skia.
cherry-pick of https://skia.googlecode.com/svn/trunk@11013
cherry-pick of https://skia.googlecode.com/svn/trunk@11081
bug:10152369
Change-Id: I7821cf6efe856d5da0ba9c9ddda7a7ad392492e2
/external/skia/tests/Android.mk
|
| 1c38bb9ea8c4c8f5227c3e25e86faddfbf824524 |
|
14-Aug-2013 |
Leon Scroggins III <scroggo@google.com> |
Merge Skia r10680 into Android.
Conflicts:
include/core/SkUserConfig.h
src/images/SkImageDecoder_libjpeg.cpp
Change-Id: I40e031f0abcd0d1e064b25f071bfc5f1b3c55e91
|
| 0cfa53d69f121ba65ae8466971f54c38081afe44 |
|
31-Jul-2013 |
Derek Sollenberger <djsollen@google.com> |
Merge Skia r10377 into Android.
This CL also includes a cherry-pick of r10483 to fix
errors in the JPEG region decoder.
Conflicts:
include/core/SkUserConfig.h
src/images/SkImageDecoder.cpp
src/images/SkImageDecoder_libbmp.cpp
src/images/SkImageDecoder_libgif.cpp
src/images/SkImageDecoder_libico.cpp
src/images/SkImageDecoder_libjpeg.cpp
src/images/SkImageDecoder_libpng.cpp
src/images/SkImageDecoder_libwebp.cpp
src/images/SkImageDecoder_wbmp.cpp
src/ports/FontHostConfiguration_android.cpp
src/ports/FontHostConfiguration_android.h
src/ports/SkFontConfigInterface_android.cpp
Change-Id: I415ba6cfbb7ee41f4c8c5c01ec1bcc32345568d2
|
| e7e8691b08f0cf2292ff470ada84e03ded358075 |
|
28-May-2013 |
Derek Sollenberger <djsollen@google.com> |
Merge Skia r9286 into android.
Conflicts:
include/core/SkFontHost.h
include/core/SkPaint.h
include/core/SkScalar.h
include/ports/SkTypeface_android.h
src/core/SkPaint.cpp
src/core/SkScalerContext.cpp
src/core/SkScalerContext.h
bug: 8719528
Change-Id: Icf2f43cfaacc6f0a0fa1965b2c1f4d2b957e9982
|
| dde23ce372d3ac1beb27c82ad5814cc744b843d8 |
|
03-Apr-2013 |
Derek Sollenberger <djsollen@google.com> |
Merge Skia r8352 into Android
Change-Id: Id9945639617af9802b3d16a5f8485469125e8545
|
| 60a9b8e11b10563167107cebafd1cc25d825d7b1 |
|
04-Feb-2013 |
Derek Sollenberger <djsollen@google.com> |
Merge Skia @7527
Conflicts resolved in:
include/gpu/GrBackendEffectFactory.h
src/core/SkPaint.cpp
src/effects/gradients/SkLinearGradient.cpp
src/ports/FontHostConfiguration_android.cpp
Change-Id: I5ad1f8f99f8fdbc26c5f98861701dd0c1cee82fa
|
| 1d0f5a1e3b467fc2211e2a94b3806770b228b6e0 |
|
19-Dec-2012 |
Derek Sollenberger <djsollen@google.com> |
Merge Skia @6890
Change-Id: I12ae1c7ebdb566addf3d2783c8405793e842df8a
|
| 6699e7ea2e981dccc2f3c41b5dcf1c860b11558d |
|
06-Dec-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge skia @5967
Change-Id: I8c637470b52c8277a781111c2ac2d1dcce7d84fa
|
| 4f1dae40e24d57d647db01443b8bf2410514b8b5 |
|
06-Mar-2012 |
Derek Sollenberger <djsollen@google.com> |
Skia Merge (revision 3312)
This CL also includes changes made to Android's copy of
Skia in their J release branch.
Change-Id: Ib2baecf48004951a3ad4a1574cdc38790c814cbc
/external/skia/tests/Android.mk
|
| 1cab2921ab279367f8206cdadc9259d12e603548 |
|
18-Jan-2012 |
Derek Sollenberger <djsollen@google.com> |
Skia merge (revision 3022)
This CL has companion changes to account for API updates in...
(1) frameworks/base
(2) external/webkit
Change-Id: Ibb989e76e8bd24313849f9631dbef42cdef9eb7d
/external/skia/tests/Android.mk
|
| 0199fa7423f89a129da2b22a488f2c18e2e4727f |
|
23-Jun-2011 |
Derek Sollenberger <djsollen@google.com> |
Skia Merge (revision 1562)
Change-Id: Ief005abc9eb741ccf5efec3d1f29fe2dfc23103d
/external/skia/tests/Android.mk
|
| 0b15698a8c76bb8abc1b555c1d91892669b4118f |
|
06-Jun-2011 |
Derek Sollenberger <djsollen@google.com> |
Skia Merge (revision 1510)
This CL includes bug fixes and closely mirrors the version of
Skia used in Chrome M13, which is likely to be our baseline for
ICS.
The CL also adds source files for the SampleApp which will allow
us to execute basic skia tests. The SampleApp requires the
utils/views directory in order to run.
Finally, we have included the PDF backend for Skia in order to
experiment with using it to generate PDF files for certain
applications.
Note: The SampleApp and PDF code are not built as part of libskia.
Change-Id: I1895ccfbd8074e25f19148cc7bd1b4af571fb307
/external/skia/tests/Android.mk
|
| 35e2e62b55598210f6999fc2ea26ff8f41446ffe |
|
16-May-2011 |
Derek Sollenberger <djsollen@google.com> |
Skia Merge (revision 1327)
Change-Id: I46f41274d07a3d7bac4728f8841c7f5e89dc9181
/external/skia/tests/Android.mk
|
| 87b8e645865f9633f410c02252a0fd3feb18f09b |
|
14-Apr-2011 |
Derek Sollenberger <djsollen@google.com> |
Skia Merge (revision 1116)
There is a companion change in external/webkit
Change-Id: I1c4110e7520bbef3f4e5f9551adb7ec79ac1e3ed
/external/skia/tests/Android.mk
|
| 05b6b4d746867a9fb02e14edfe1bf3685abeb813 |
|
14-Mar-2011 |
Derek Sollenberger <djsollen@google.com> |
Skia Merge (revision 922)
Change-Id: I7ed57d10905d8bad6486a4d7410165eec1cc2b4f
/external/skia/tests/Android.mk
|
| 3c1a5cbb65fd9aa63ad4cde7f4a9a0e02a50eb61 |
|
10-Mar-2010 |
Doug Kwan <dougkwan@google.com> |
Add missing library in command line to the linker. Currently this library is
included implicitly via inter-library dependency. The library is also used
by the main executable.
Change-Id: Ib5562dbc481af6d95823c97e63355037e0049f7e
/external/skia/tests/Android.mk
|
| 215473cea1702d8acc0316da3e5a9bf4ce0130ef |
|
09-Mar-2010 |
Mike Reed <reed@google.com> |
disable neon-opt for 32A->565 + alpha blend since it doesn't correctly treat
src-alpha == 0 as a no-op.
update unittests to measure this
Change-Id: If4d61ac5f7ff3d7fc27cbc3f242dbdf7ff4e76be
http://b/issue?id=2333376
/external/skia/tests/Android.mk
|
| bc22683e2ed4aa3439c6edd3dc1e261c399c023e |
|
10-Jul-2009 |
Mike Reed <reed@google.com> |
rename libsgl/libcorecg to libskia
/external/skia/tests/Android.mk
|
| d5bf0ecf31f33fb31763995e3c8bfab69dc2457f |
|
21-May-2009 |
Wei-Ta Chen <weita@google.com> |
Adapting Skia's tests to the native test framework.
/external/skia/tests/Android.mk
|
| da3b8b285a5e3e6f344461d67e3370b27701756d |
|
02-Apr-2009 |
Mike Reed <> |
AI 144248: add unittests
add android-specific work around for double-initialization of globals
Automated import of CL 144248
/external/skia/tests/Android.mk
|