| 8f34190104d139c64598c334709aacff723c4fc9 |
|
28-Mar-2014 |
Leon Scroggins <scroggo@google.com> |
Merge upstream Skia at r13977.
Includes cherry-picks from:
https://code.google.com/p/skia/source/detail?r=14009
https://code.google.com/p/skia/source/detail?r=14014
Android.mk and SkUserConfig.h have been generated by
gyp_to_android.py.
SkUserConfig.h was additionally updated to include defines
which are necessary but not generated by gyp_to_android.
SkTemplates.h has been further modified to exclude the use
of numeric_limits.
Merge remote-tracking branch 'upstream/master' into merge
Conflicts:
src/images/SkImageRef.cpp
SkImageRef conflicts because
https://code.google.com/p/skia/source/detail?r=13503 (the correct fix)
was committed to Skia upstream, but it depended on APIs not yet in
Android's version of Skia. So Android got
change id I245eea4f05f402ca24849d5d2fe354c69526d03d. This merge takes
Skia r13503 (plus later fixes).
Requires changes to frameworks/base (I5cdcea827ebff587df0bbddc0965e3e0fbf48002)
and cts (Ia6864326bd582587227ab404dbacb409d7f08016).
Change-Id: I816129d49c0118453222916f3c818eccac33663d
|
| 562b2e67a29f24db4c258aa2fa59cd7b4ee15174 |
|
12-Mar-2014 |
bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> |
Fix (1 << 31) to (1u << 31) in SkOTTable_OS_2.
When ints are 32 bits, (1 << 31) is undefined.
R=reed@google.com
Committed: https://code.google.com/p/skia/source/detail?r=13757
Review URL: https://codereview.chromium.org/189093020
git-svn-id: http://skia.googlecode.com/svn/trunk@13779 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/include/core/SkTemplates.h
|
| e60ae2eca3ca7142b6f1fc2361986756bcf79b81 |
|
12-Mar-2014 |
bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> |
Revert 13757.
git-svn-id: http://skia.googlecode.com/svn/trunk@13758 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/include/core/SkTemplates.h
|
| 3258a5348beb721ee47fbe8928d78b0bf0fed5bd |
|
12-Mar-2014 |
bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> |
Fix (1 << 31) to (1u << 31) in SkOTTable_OS_2.
When ints are 32 bits, (1 << 31) is undefined.
R=reed@google.com
Review URL: https://codereview.chromium.org/189093020
git-svn-id: http://skia.googlecode.com/svn/trunk@13757 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/include/core/SkTemplates.h
|
| cc787fa8029889877da8edbb70a284cb0e19de33 |
|
31-Jan-2014 |
commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> |
fix auto-delete bug that crept in with new fast blur path; is causing
some of the valgrind errors.
BUG=skia:2111
R=bsalomon@google.com, robertphillips@google.com
Author: humper@google.com
Review URL: https://codereview.chromium.org/148593003
git-svn-id: http://skia.googlecode.com/svn/trunk@13257 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/include/core/SkTemplates.h
|
| 90313cc36a6f43a3e9d3818aca536cd6631c222b |
|
17-Jan-2014 |
commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> |
Move GrGLExtensions from GrGLContextInfo to GrGLInterface
BUG=skia:2042
R=robertphillips@google.com
Author: bsalomon@google.com
Review URL: https://codereview.chromium.org/140823003
git-svn-id: http://skia.googlecode.com/svn/trunk@13118 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/include/core/SkTemplates.h
|
| ae326bb5ca55b7102e70a8a589adcb7cf78f37e7 |
|
30-Oct-2013 |
bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> |
Revert r1784: SK_API on a non-concrete template is strange.
TBR=bsalomon@google.com
Review URL: https://codereview.chromium.org/52843004
git-svn-id: http://skia.googlecode.com/svn/trunk@12040 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/include/core/SkTemplates.h
|
| adacc7067ad617cdc7bbef39192ca80f4b4d27f9 |
|
14-Oct-2013 |
robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> |
Start cleaning up 64bit Win warnings
https://codereview.chromium.org/27192003/
git-svn-id: http://skia.googlecode.com/svn/trunk@11764 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/include/core/SkTemplates.h
|
| e02944075840d672bd1797f3d945ff82d302282f |
|
30-Aug-2013 |
commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> |
Replace SkTScopedPtr with SkAutoTDelete in Skia.
BUG=
R=djsollen@google.com, reed@google.com, vandebo@chromium.org
Author: mtklein@google.com
Review URL: https://chromiumcodereview.appspot.com/23621005
git-svn-id: http://skia.googlecode.com/svn/trunk@11016 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/include/core/SkTemplates.h
|
| caacc8f4e1ff69d545fb55c2a0a1d46e5cdbae3f |
|
31-Jul-2013 |
mtklein@google.com <mtklein@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> |
Remove a stray double assign that g++ 4.8 thinks has ill-defined sequencing.
BUG=
R=bungeman@google.com
Review URL: https://codereview.chromium.org/21352003
git-svn-id: http://skia.googlecode.com/svn/trunk@10462 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/include/core/SkTemplates.h
|
| 4d3767373942c55be893d3bbbfe35e1975c2e1b4 |
|
12-Jul-2013 |
robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> |
Fix leak in SkAutoSTArray
https://codereview.chromium.org/18915010/
git-svn-id: http://skia.googlecode.com/svn/trunk@10053 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/include/core/SkTemplates.h
|
| f5cc5b140c1c00c536e02b5cfbe158bb2d5c2c15 |
|
12-Jul-2013 |
bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> |
R=mtklein@google.com
Review URL: https://codereview.chromium.org/18503009
git-svn-id: http://skia.googlecode.com/svn/trunk@10050 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/include/core/SkTemplates.h
|
| 929c98d35ff8133af765180552715b04ec177ad3 |
|
02-Jul-2013 |
reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> |
speculative fix for signed-unsinged compare warning
git-svn-id: http://skia.googlecode.com/svn/trunk@9876 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/include/core/SkTemplates.h
|
| d51041469a9a45562d88e9ff137c6726562e8c40 |
|
13-Jun-2013 |
bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> |
Enhancements and a fix to templated containers.
R=robertphillips@google.com
Review URL: https://codereview.chromium.org/16951004
git-svn-id: http://skia.googlecode.com/svn/trunk@9582 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/include/core/SkTemplates.h
|
| 4e05fd25c88bea64a988ededfc810770095ed97c |
|
10-Jun-2013 |
reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> |
add conic support to hairlines
git-svn-id: http://skia.googlecode.com/svn/trunk@9493 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/include/core/SkTemplates.h
|
| 11c9a55afd95078d14ab8cd7c1c5c0032af2a498 |
|
03-Jun-2013 |
bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> |
Add SkData::NewFromFD.
Chromium needs a SkStream backed by a file descriptor.
Skia already has the code and can do the work, this change exposes the
functionality in Skia in a clean way.
https://codereview.chromium.org/15941025/
git-svn-id: http://skia.googlecode.com/svn/trunk@9408 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/include/core/SkTemplates.h
|
| 1198e740d58abba5edc749c14ed088688b3e76ca |
|
29-May-2013 |
scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> |
Use macros for new and delete in SkTemplates.h
Remove use of new placement array.
R=bungeman@google.com, reed@google.com
Review URL: https://codereview.chromium.org/15739013
git-svn-id: http://skia.googlecode.com/svn/trunk@9329 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/include/core/SkTemplates.h
|
| b5e34e22aa0e019e25f9f913f0e119a9a97e5562 |
|
07-May-2013 |
commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> |
XPS ttc handling.
R=reed@google.com
Author: bungeman@google.com
Review URL: https://chromiumcodereview.appspot.com/14873006
git-svn-id: http://skia.googlecode.com/svn/trunk@9037 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/include/core/SkTemplates.h
|
| 7103344b64f3f0df88e76857c16edc8eedb58366 |
|
01-May-2013 |
bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> |
Add FontMgr to DirectWrite.
https://codereview.chromium.org/14314008/
git-svn-id: http://skia.googlecode.com/svn/trunk@8934 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/include/core/SkTemplates.h
|
| d42aca31b9ddc1cb9a81522b4c73a9fe550450bc |
|
23-Apr-2013 |
bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> |
Remove static effects from the effect memory pool.
Review URL: https://codereview.chromium.org/14081016
git-svn-id: http://skia.googlecode.com/svn/trunk@8828 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/include/core/SkTemplates.h
|
| 9d1cff124c14e550889a5755ffa5e6537af7c8c8 |
|
18-Apr-2013 |
reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> |
use SkAutoTDelete instead of SkTScopedPtr
Review URL: https://codereview.chromium.org/13831011
git-svn-id: http://skia.googlecode.com/svn/trunk@8749 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/include/core/SkTemplates.h
|
| 7de18e5c7b4e4a8ad8910b1016688ded902f185b |
|
04-Feb-2013 |
bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> |
Add sk_ignore_unused_variable to avoid warnings.
https://codereview.appspot.com/7218045/
git-svn-id: http://skia.googlecode.com/svn/trunk@7539 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/include/core/SkTemplates.h
|
| e16efc1882ab34a0bb3ae361a2d37f840044cf87 |
|
26-Jan-2013 |
skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81> |
Sanitizing source files in Skia_Periodic_House_Keeping
git-svn-id: http://skia.googlecode.com/svn/trunk@7406 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/include/core/SkTemplates.h
|
| 7103f182ce61280eacb35f1832df350b642a5381 |
|
31-Oct-2012 |
bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> |
GDI fonthost to serialize using correct font name.
https://codereview.appspot.com/6822060/
git-svn-id: http://skia.googlecode.com/svn/trunk@6227 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/include/core/SkTemplates.h
|
| 52657c75b5d4c0e72d64ecaec504b26d0d215a33 |
|
20-Sep-2012 |
reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> |
remove unused parameter (that also slowed us down) to SkAutoTDelete
git-svn-id: http://skia.googlecode.com/svn/trunk@5611 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/include/core/SkTemplates.h
|
| 58b4ead36c62d8c0256ee4da554f3df2744d904c |
|
31-Aug-2012 |
scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> |
Perform multi core rendering in bench_pictures.
Add a flag in SkGPipeWriter for threadsafe drawing.
Add a deferred pipe controller to SamplePipeControllers, which can
be called to play back in multiple threads.
Depends on http://codereview.appspot.com/6459105/
Review URL: https://codereview.appspot.com/6482068
git-svn-id: http://skia.googlecode.com/svn/trunk@5371 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/include/core/SkTemplates.h
|
| fbfcd5602128ec010c82cb733c9cdc0a3254f9f3 |
|
23-Aug-2012 |
rmistry@google.com <rmistry@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> |
Result of running tools/sanitize_source_files.py (which was added in https://codereview.appspot.com/6465078/)
This CL is part I of IV (I broke down the 1280 files into 4 CLs).
Review URL: https://codereview.appspot.com/6485054
git-svn-id: http://skia.googlecode.com/svn/trunk@5262 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/include/core/SkTemplates.h
|
| 6d552ee5f56e76da6ba244df0f0df2234f2d8977 |
|
14-Aug-2012 |
bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> |
Reduce allocations in RandomPathBench
Review URL: http://codereview.appspot.com/6453116
git-svn-id: http://skia.googlecode.com/svn/trunk@5080 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/include/core/SkTemplates.h
|
| 91208922687a33df1d5253928b8d5d7d4685c7ac |
|
30-Jul-2012 |
bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> |
Const correct BlockRef in SkAutoTUnref.
https://codereview.appspot.com/6448066/
git-svn-id: http://skia.googlecode.com/svn/trunk@4829 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/include/core/SkTemplates.h
|
| 49313f6b4391d0f74ab1964c295634e8830680f6 |
|
14-Sep-2011 |
bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> |
GrTArray->SkTArray & docs
Review URL: http://codereview.appspot.com/5005045/
git-svn-id: http://skia.googlecode.com/svn/trunk@2265 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/include/core/SkTemplates.h
|
| 7d4679a2e1aaa1953bc20d668135c517ee488c11 |
|
03-Sep-2011 |
bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> |
Rename existing nonpreserving reallocs to reset, add reset to SkAutoMalloc, use reset in GrBufferAllocPool
Review URL: http://codereview.appspot.com/4951058/
git-svn-id: http://skia.googlecode.com/svn/trunk@2215 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/include/core/SkTemplates.h
|
| ec3ed6a5ebf6f2c406d7bcf94b6bc34fcaeb976e |
|
28-Jul-2011 |
epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> |
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
/external/skia/include/core/SkTemplates.h
|
| 8bcc6f47b0d5985f139b6f6dbdc166cf2f4b7c61 |
|
01-Jul-2011 |
bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> |
export SkAutoSTMalloc (for multi-dll chrome build)
Review URL: http://codereview.appspot.com/4643063/
git-svn-id: http://skia.googlecode.com/svn/trunk@1784 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/include/core/SkTemplates.h
|
| 3582bf9e3d94feac5d4cc64fdb646dd68a3e4b18 |
|
30-Jun-2011 |
bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> |
Remove GrAuto*Malloc, replace with SkAuto*Malloc
Review URL: http://codereview.appspot.com/4629088
git-svn-id: http://skia.googlecode.com/svn/trunk@1774 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/include/core/SkTemplates.h
|
| 57f4969724a1dd88c8d9ae35a863e6cf621181d5 |
|
23-Feb-2011 |
djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> |
merge from android tree:
- optional parameters added to descriptorProc and allocPixels
- clip options to image decoders
- check for xfermode in blitter_a8
- UNROLL loops in blitrow
reviewed by reed@google.com
git-svn-id: http://skia.googlecode.com/svn/trunk@841 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/include/core/SkTemplates.h
|
| 2a22e10ab2946c5590cd2a258427ce3ccfca9bfa |
|
25-Jan-2011 |
vandebo@chromium.org <vandebo@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> |
Add Truetype and Type 1 font embedding support
Sorry this is such a large CL. It was very exploratory for me to make this
work.
- Add an interface to SkFontHost to retrieve font information and provide NULL implementations on all platforms except Linux.
- Segment large Type 1 fonts into fonts with shared resources with 255 glyphs each.
- Convert the various Type 1 formats to the form PDF wants.
- Update font as we draw text instead of as part of the graphical state.
- Remove built-in font support, we can't really use it.
Other changes I can pull out to a separate CL if you like.
- Add SkTScopedPtr class.
- Fix double free of resources.
- Fix bug in resource unique-ifying code.
- Don't print anything for any empty clip path.
- Fix copy paste error - MiterLimit.
- Fix sign extension bug in SkPDFString
- Fix FlateTest rename that was missed on a previous commit.
Review URL: http://codereview.appspot.com/4082042
git-svn-id: http://skia.googlecode.com/svn/trunk@728 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/include/core/SkTemplates.h
|
| 8a1c16ff38322f0210116fa7293eb8817c7e477e |
|
17-Dec-2008 |
reed@android.com <reed@android.com@2bbb7eff-a529-9590-31e7-b0007b416f81> |
grab from latest android
git-svn-id: http://skia.googlecode.com/svn/trunk@27 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/include/core/SkTemplates.h
|