summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-05-01Merge from Chromium at DEPS revision 267519idea133-weekly-releaseBo Liu
This commit was generated by merge_to_master.py. Change-Id: If4516ffa0889e0aafc1c29ff65cd2d5125661999
2014-04-30Merge third_party/skia/gyp from ↵Android Chromium Automerger
https://chromium.googlesource.com/external/skia/gyp.git at ad64fe80988d6bd5b1467ecfab1341bc71aab706 This commit was generated by merge_from_chromium.py. Change-Id: I177ddac7f30e748c08cd13acb57fc7a8c26790ab
2014-04-30Turn on quilt mode in DM.commit-bot@chromium.org
- Rename TileGrid -> Quilt to avoid the name overload. - Tag all failing GMs with kSkipTiled_Flag. You may be wondering, do any GMs pass? Yes, some do! And that trends towards all of them as we increase --quiltTile. Two GMs only fail in --quilt mode in 565. Otherwise all GMs which fail are skipped, and those which don't fail aren't. (The 8888 variants of those two GMs are skipped even though they pass.) BUG=skia:2477 R=reed@google.com, mtklein@google.com Author: mtklein@chromium.org Review URL: https://codereview.chromium.org/256373002 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@14457 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-30Backfill unit tests for SkRecordcommit-bot@chromium.org
BUG=skia:2378 R=fmalita@chromium.org, mtklein@google.com Author: mtklein@chromium.org Review URL: https://codereview.chromium.org/251133008 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@14455 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-29Merge third_party/skia/gyp from ↵Android Chromium Automerger
https://chromium.googlesource.com/external/skia/gyp.git at 8ecee3cd6742fa45e097e49fae4bb55d398b706d This commit was generated by merge_from_chromium.py. Change-Id: I5d485302d3acb3288dbbedfbcd742f321a8d7b83
2014-04-29Move GrGLInterface function ptr setup into a common function for all OpenGL ↵commit-bot@chromium.org
GrGLInterface factories (but not GLES yet). R=robertphillips@google.com Author: bsalomon@google.com Review URL: https://codereview.chromium.org/254713006 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@14444 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-29Remove dependency of views on anglecommit-bot@chromium.org
Just like with http://code.google.com/p/skia/source/detail?r=13618, listing angle.gyp as a dependency when in the Android tree (i.e. w/o third_party/externals) causes gyp_to_android.py to fail. (See http://108.170.220.27:10115/builders/Housekeeper-PerCommit-AndroidRoll/builds/229/steps/Merge/logs/stdio for example failure.) Fortunately, views (and views_animated) has no need to depend directly on angle. R=bungeman@google.com, bsalomon@google.com, robertphillips@google.com TBR=bsalomon@google.com BUG=skia:2447 Author: scroggo@google.com Review URL: https://codereview.chromium.org/253773004 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@14426 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-28Refactor SkPictureStateTree::Iterator to avoid use of kClip_SaveFlag.commit-bot@chromium.org
The current implementation relies on soon-to-be-deprecated kClip_SaveFlag behavior. Updated to use default save flags (kMatrixClip_SaveFlag) and stop assuming that the matrix survives restore() calls. R=junov@chromium.org, reed@google.com, robertphillips@chromium.org, robertphillips@google.com Committed: http://code.google.com/p/skia/source/detail?r=14319 Author: fmalita@chromium.org Review URL: https://codereview.chromium.org/246893005 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@14421 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-28Merge third_party/skia/gyp from ↵Android Chromium Automerger
https://chromium.googlesource.com/external/skia/gyp.git at 359920658f4dab23d5e167cab8b7855a9f6688a0 This commit was generated by merge_from_chromium.py. Change-Id: I9606109a4d006ba08a96c01cc73f2291b2d7389e
2014-04-28move common blur types into central headercommit-bot@chromium.org
BUG=skia: R=scroggo@google.com, djsollen@google.com Author: reed@google.com Review URL: https://codereview.chromium.org/253833002 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@14411 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-28Start using type traits in src/record instead of macros.commit-bot@chromium.org
Simplified skip logic by always running clip commands. No performance difference on bot or silk SKPs. BUG=skia:2378 R=bungeman@google.com, fmalita@chromium.org, mtklein@google.com Author: mtklein@chromium.org Review URL: https://codereview.chromium.org/258693006 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@14410 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-28Generate tests/Android.mk from gypcommit-bot@chromium.org
gyp/apptype_console.gypi: Don't include console app dependencies when building for Android framework. gyp/tests.gyp: Add/remove libraries for framework build. platform_tools/android/bin/android_framework_gyp.py: Moved to gyp_gen. clean_up_gypd_files moved to this script. platform_tools/android/bin/gyp_to_android.py: Call new function for generating tool makefile. Set LOCAL_MODULE. platform_tools/android/gyp_gen/gypd_parser.py: Support relative paths. platform_tools/android/gyp_gen/makefile_writer.py: Factor out helper functions to be used by tool writer. LOCAL_MODULE is set elsewhere. platform_tools/android/gyp_gen/tool_makefile_writer.py: Multipurpose file for writing makefiles for tools. Should be able to use it mostly unchanged for bench, gm, etc. platform_tools/android/gyp_gen/vars_dict_lib.py: Make the comments follow the style guide. Add set(). Rename __li to __ordered_set More/update tests: platform_tools/android/tests/android_framework_gyp_tests.py platform_tools/android/tests/expectations/Android.mk platform_tools/android/tests/expectations/tool/Android.mk platform_tools/android/tests/expectations/write_local_vars_append_arm platform_tools/android/tests/expectations/write_local_vars_append_foo platform_tools/android/tests/expectations/write_local_vars_append_no_name platform_tools/android/tests/expectations/write_local_vars_no_append_arm platform_tools/android/tests/expectations/write_local_vars_no_append_foo platform_tools/android/tests/expectations/write_local_vars_no_append_no_name platform_tools/android/tests/gyp_to_android_tests.py platform_tools/android/tests/makefile_writer_tests.py platform_tools/android/tests/ordered_set_tests.py platform_tools/android/tests/test_variables.py BUG=skia:2447 May require an update to the bot to remove pyc files. R=halcanary@google.com, djsollen@google.com Author: scroggo@google.com Review URL: https://codereview.chromium.org/235883015 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@14408 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-28use BenchTimer, print in µscommit-bot@chromium.org
BUG=skia:2378 R=bungeman@google.com, mtklein@google.com Author: mtklein@chromium.org Review URL: https://codereview.chromium.org/257563006 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@14405 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-28Add pathops and capture stderr so we can get SkDebugf output.commit-bot@chromium.org
BUG=skia: R=mtklein@google.com Author: jcgregorio@google.com Review URL: https://codereview.chromium.org/252863002 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@14402 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-28gpuveto toolcommit-bot@chromium.org
This CL adds a command line tool to report the suitableForGpuRasterization status of a single skp file. R=bsalomon@google.com, rmistry@google.com Author: robertphillips@google.com Review URL: https://codereview.chromium.org/259663004 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@14393 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-25fix minor skp-found bugscommit-bot@chromium.org
remove globals from pathops_unittest BUG=skia:2460 TBR=mtklein Author: caryclark@google.com Review URL: https://codereview.chromium.org/239563004 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@14378 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-24Merge third_party/skia/gyp from ↵Android Chromium Automerger
https://chromium.googlesource.com/external/skia/gyp.git at f187160f1c51a308d9e4007aa4237f88df6813e5 This commit was generated by merge_from_chromium.py. Change-Id: Ibdf3fde746460ab836c0bd2605b1cee7fa368843
2014-04-24Deprecate SaveFlags use in the public SkCanvas API.commit-bot@chromium.org
Because we still have internal users for now (to support the deprecated mode), this CL introduces an external-only variant of deprecation. Chromium is no longer using the deprecated methods, but Android may need to suppress SK_ATTR_EXTERNALLY_DEPRECATED warnings. R=reed@google.com, robertphillips@google.com, scroggo@google.com, bungeman@google.com, mtklein@google.com Author: fmalita@chromium.org Review URL: https://codereview.chromium.org/246023008 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@14367 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-24Add GM that exercises SkCanvas::discard()commit-bot@chromium.org
R=robertphillips@google.com Author: bsalomon@google.com Review URL: https://codereview.chromium.org/252443007 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@14365 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-24Restore SkPicture-related guard flags for Chromerobertphillips@google.com
https://codereview.chromium.org/255543004/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@14349 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-24Remove 2 SkPicture-related flags Chrome should be able to live withoutcommit-bot@chromium.org
R=bsalomon@google.com TBR=bsalomon@google.com Author: robertphillips@google.com Review URL: https://codereview.chromium.org/252403003 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@14347 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-24Merge from Chromium at DEPS revision 265802Ben Murdoch
This commit was generated by merge_to_master.py. Change-Id: I2cdcf09998162691ec5ba2988179e1735ab8874f
2014-04-23Merge third_party/skia/gyp from ↵Android Chromium Automerger
https://chromium.googlesource.com/external/skia/gyp.git at b460a213ddebe85e7a61996298582eff269b6f25 This commit was generated by merge_from_chromium.py. Change-Id: I55909d3dce204a8700c4251abc0102bbd6f82f7a
2014-04-23Remove guards Chromium no longer needscommit-bot@chromium.org
Note: Android still needs these guards. Committed: http://code.google.com/p/skia/source/detail?r=14299 R=bsalomon@google.com Author: robertphillips@google.com Review URL: https://codereview.chromium.org/246403004 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@14329 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-23Merge third_party/skia/gyp from ↵Android Chromium Automerger
https://chromium.googlesource.com/external/skia/gyp.git at 6e773af83fe08119bdb50d8b720fcd46eebea74e This commit was generated by merge_from_chromium.py. Change-Id: If6846e005da93ea649ffe23122e2a934420eeadc
2014-04-22Add gpu fast path for two point conical gradients.commit-bot@chromium.org
Also shader changes should help numerical issues on certain android gpus BUG=179264 R=bsalomon@google.com Author: egdaniel@google.com Review URL: https://codereview.chromium.org/238443006 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@14316 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-22Revert of make drawText calls non-virtual, to ease SkFont and TextBlob ↵commit-bot@chromium.org
(https://codereview.chromium.org/243853006/) Reason for revert: need to test more the code-path where we don't opt into the new virtuals Original issue's description: > make drawText calls non-virtual, to ease SkFont and TextBlob > > BUG=skia: > > Committed: http://code.google.com/p/skia/source/detail?r=14307 R=robertphillips@google.com TBR=robertphillips@google.com NOTREECHECKS=true NOTRY=true BUG=skia: Author: reed@google.com Review URL: https://codereview.chromium.org/247983003 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@14314 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-22gyp: only include windows *_x64 targets if GYP_GENERATORS includes ninjacommit-bot@chromium.org
BUG=skia:2442 R=caryclark@google.com Author: epoger@google.com Review URL: https://codereview.chromium.org/247143003 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@14313 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-22Reverting Skia r14299 ( Remove guards Chromium no longer needs - ↵robertphillips@google.com
https://codereview.chromium.org/246403004) git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@14311 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-22make drawText calls non-virtual, to ease SkFont and TextBlobcommit-bot@chromium.org
BUG=skia: R=robertphillips@google.com Author: reed@google.com Review URL: https://codereview.chromium.org/243853006 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@14307 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-22Remove guards Chromium no longer needscommit-bot@chromium.org
Note: Android still needs these guards. R=bsalomon@google.com Author: robertphillips@google.com Review URL: https://codereview.chromium.org/246403004 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@14299 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-22Add asADash entry point into SkPathEffect to allow extracting Dash info from ↵commit-bot@chromium.org
PathEffects BUG=skia: R=bsalomon@google.com, reed@google.com Author: egdaniel@google.com Review URL: https://codereview.chromium.org/212103010 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@14297 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-21Merge third_party/skia/gyp from ↵Android Chromium Automerger
https://chromium.googlesource.com/external/skia/gyp.git at 148dc93c45b72f210b443735166f69cf2b5d0fd8 This commit was generated by merge_from_chromium.py. Change-Id: I0458019a7c76d906f2fee772cbd3d01ff83bd18c
2014-04-21Fixes for SkPictureShader.commit-bot@chromium.org
Update comment in header to make it more clear that the picture should be unaltered after creating the shader. We want our shaders to be immutable, and this supports that. Make the factory return NULL if the shader would have never drawn anyway i.e. for a null picture or picture with no width/height. Addresses comments I brought up in https://codereview.chromium.org/221923007/#msg16. BUG=skia:1976 R=reed@google.com, fmalita@chromium.org, robertphillips@google.com Author: scroggo@google.com Review URL: https://codereview.chromium.org/238253005 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@14288 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-21Add a .gypi to insulate Chrome from refactorings in src/record.commit-bot@chromium.org
Rather than listing out sources explicitly in skia_library.gypi, I'll add this new .gypi to its includes. BUG=skia:2378 R=fmalita@chromium.org, mtklein@google.com Author: mtklein@chromium.org Review URL: https://codereview.chromium.org/242733005 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@14282 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-21anticipate more optimizations by renaming some files and methodscommit-bot@chromium.org
also, call the new SkRecordOptimize in bench_playback BUG=skia:2378 R=fmalita@chromium.org, mtklein@google.com Author: mtklein@chromium.org Review URL: https://codereview.chromium.org/243243003 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@14277 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-21Support clip to layer flag on Android framework.commit-bot@chromium.org
This flag is being transitioned out, but the Android framework still needs it. R=reed@google.com, fmalita@google.com, robertphillips@google.com Author: scroggo@google.com Review URL: https://codereview.chromium.org/243843002 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@14272 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-18Staging for cleanup of SkPicture-related headersrobertphillips@google.com
https://codereview.chromium.org/243173002 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@14258 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-18rename SkPaintParts.* to SkPaintPart.*reed@google.com
BUG=skia: R=caryclark@google.com Review URL: https://codereview.chromium.org/242943004 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@14255 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-17Staged removal of SkPicture-derived classescommit-bot@chromium.org
This CL removes the SkPicture-derived classes (with a flag to keeps clients working). In the process it also lightens the recording factory function so it is no longer ref counted). The only interesting bits are in SkPicture* and Sk*Picture.* R=reed@google.com Author: robertphillips@google.com Review URL: https://codereview.chromium.org/238273012 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@14251 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-17add SK_SUPPORT_LEGACY_PROCXFERMODE to skia_for_chromium_defines.gypicommit-bot@chromium.org
R=reed@google.com TBR=reed@google.com Author: robertphillips@google.com Review URL: https://codereview.chromium.org/242053002 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@14250 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-17Revert of Roll ANGLE. (https://codereview.chromium.org/237173002/)commit-bot@chromium.org
Reason for revert: http://skbug.com/2437 Original issue's description: > Roll ANGLE. > > BUG=skia:2272 > > Committed: http://code.google.com/p/skia/source/detail?r=14243 R=bsalomon@chromium.org, geofflang@chromium.org TBR=bsalomon@chromium.org, geofflang@chromium.org NOTREECHECKS=true NOTRY=true BUG=skia:2272 Author: bsalomon@google.com Review URL: https://codereview.chromium.org/238863006 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@14248 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-17Roll ANGLE.commit-bot@chromium.org
BUG=skia:2272 R=bsalomon@chromium.org, bsalomon@google.com Author: geofflang@chromium.org Review URL: https://codereview.chromium.org/237173002 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@14243 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-16More flags needed to build Android framework.commit-bot@chromium.org
R=djsollen@google.com TBR=djsollen@google.com NOTREECHECKS=true NOTRY=true Author: scroggo@google.com Review URL: https://codereview.chromium.org/240563005 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@14233 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-16Support picture recording in Android framework.commit-bot@chromium.org
Fixes master-skia build. R=djsollen@google.com TBR=djsollen@google.com NOTREECHECKS=true NOTRY=true Author: scroggo@google.com Review URL: https://codereview.chromium.org/240093007 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@14230 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-16Retract SkPicture::kOptimizeForClippedPlayback_RecordingFlag from public APIcommit-bot@chromium.org
This CL sets the stage for retracting the SkPicture::kOptimizeForClippedPlayback_RecordingFlag flag from the public API (more work needs to be done in Blink & Chrome). In the new world the only way to set this flag (and thus instantiate an SkPicture-derived class) is by passing a factory to the SkPictureRecorder class. This is to get all clients always using factories so that we can then change the factory call used (i.e., so the factory just creates a BBH) and do away with the SkPicture-derived classes. BUG=skia:2315 R=reed@google.com Author: robertphillips@google.com Review URL: https://codereview.chromium.org/239703006 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@14221 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-16Merge third_party/skia/gyp from ↵Android Chromium Automerger
https://chromium.googlesource.com/external/skia/gyp.git at 5e89c5f0360d26a45def86905c9850aba817ccf2 This commit was generated by merge_from_chromium.py. Change-Id: Iad6f9a7a9711b2e2c24997c0e686d9f2854aa05d
2014-04-16Merge from Chromium at DEPS revision 263965Ben Murdoch
This commit was generated by merge_to_master.py. Change-Id: If5e90bc6012d33cc92fc74693cfccfa4c959d35f
2014-04-15Fix size of rotated text with FreeType.bungeman@google.com
This generalizes and shares the solution found for a similar issue with GDI. The issue is that the text size is applied early, and the rest of the transformation late. This allows us to isolate and independently control the text size from the rest of the transformation. R=reed@google.com Review URL: https://codereview.chromium.org/213153006 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@14201 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-15Merge third_party/skia/gyp from ↵Android Chromium Automerger
https://chromium.googlesource.com/external/skia/gyp.git at b62fec7fcb34f152a209dc2184c8f89f4b80b75c This commit was generated by merge_from_chromium.py. Change-Id: I966e6e4fcb95060ff33b7df1ca9966b8e1ba9149
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-28 17:02:56 +0000