From 056997d2223b23b49f682e627fe94c77a358831f Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Wed, 23 Apr 2014 19:18:03 +0000 Subject: Remove guards Chromium no longer needs 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 --- skia_for_chromium_defines.gypi | 2 -- 1 file changed, 2 deletions(-) diff --git a/skia_for_chromium_defines.gypi b/skia_for_chromium_defines.gypi index affd807..cc442ba 100644 --- a/skia_for_chromium_defines.gypi +++ b/skia_for_chromium_defines.gypi @@ -15,8 +15,6 @@ 'skia_for_chromium_defines': [ 'SK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1', 'SK_SUPPORT_LEGACY_GETTOPDEVICE', - 'SK_SUPPORT_LEGACY_PICTURE_CAN_RECORD', - 'SK_SUPPORT_DEPRECATED_RECORD_FLAGS', 'SK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES', 'SK_SUPPORT_LEGACY_N32_NAME', 'SK_SUPPORT_LEGACY_PROCXFERMODE', -- cgit v1.2.3 From 2eb50d59dad21fd318afe5bab6bd0f16bbaf942c Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Thu, 24 Apr 2014 12:51:19 +0000 Subject: Remove 2 SkPicture-related flags Chrome should be able to live without 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 --- skia_for_chromium_defines.gypi | 2 -- 1 file changed, 2 deletions(-) diff --git a/skia_for_chromium_defines.gypi b/skia_for_chromium_defines.gypi index cc442ba..e4903fb 100644 --- a/skia_for_chromium_defines.gypi +++ b/skia_for_chromium_defines.gypi @@ -15,10 +15,8 @@ 'skia_for_chromium_defines': [ 'SK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1', 'SK_SUPPORT_LEGACY_GETTOPDEVICE', - 'SK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES', 'SK_SUPPORT_LEGACY_N32_NAME', 'SK_SUPPORT_LEGACY_PROCXFERMODE', - 'SK_SUPPORT_LEGACY_PICTURE_HEADERS', ], }, } -- cgit v1.2.3 From f187160f1c51a308d9e4007aa4237f88df6813e5 Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Thu, 24 Apr 2014 13:59:18 +0000 Subject: Restore SkPicture-related guard flags for Chrome https://codereview.chromium.org/255543004/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@14349 2bbb7eff-a529-9590-31e7-b0007b416f81 --- skia_for_chromium_defines.gypi | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/skia_for_chromium_defines.gypi b/skia_for_chromium_defines.gypi index e4903fb..eeac1f6 100644 --- a/skia_for_chromium_defines.gypi +++ b/skia_for_chromium_defines.gypi @@ -17,6 +17,10 @@ 'SK_SUPPORT_LEGACY_GETTOPDEVICE', 'SK_SUPPORT_LEGACY_N32_NAME', 'SK_SUPPORT_LEGACY_PROCXFERMODE', + 'SK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES', + 'SK_SUPPORT_LEGACY_PICTURE_HEADERS', + 'SK_SUPPORT_LEGACY_PICTURE_CAN_RECORD', + 'SK_SUPPORT_DEPRECATED_RECORD_FLAGS', ], }, } -- cgit v1.2.3 From ded203b202ba0584eb14cee9870bd138e058265f Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Thu, 24 Apr 2014 21:03:00 +0000 Subject: Add GM that exercises SkCanvas::discard() 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 --- gmslides.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/gmslides.gypi b/gmslides.gypi index 67a9adb..d4c6c1c 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -56,6 +56,7 @@ '../gm/cubicpaths.cpp', '../gm/cmykjpeg.cpp', '../gm/degeneratesegments.cpp', + '../gm/discard.cpp', '../gm/dashcubics.cpp', '../gm/dashing.cpp', '../gm/deviceproperties.cpp', -- cgit v1.2.3 From 1c675c979b35801ef26058c18fc193bf4db0f3d6 Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Thu, 24 Apr 2014 21:51:58 +0000 Subject: Deprecate SaveFlags use in the public SkCanvas API. 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 --- common.gypi | 1 + common_conditions.gypi | 2 ++ 2 files changed, 3 insertions(+) diff --git a/common.gypi b/common.gypi index 2a5bbd4..0846fef 100644 --- a/common.gypi +++ b/common.gypi @@ -12,6 +12,7 @@ 'target_defaults': { 'defines': [ + 'SK_INTERNAL', 'SK_GAMMA_SRGB', 'SK_GAMMA_APPLY_TO_A8', 'SK_SCALAR_TO_FLOAT_EXCLUDED', # temporary to allow Chrome to call SkFloatToScalar diff --git a/common_conditions.gypi b/common_conditions.gypi index 175b8b0..ed30245 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -309,6 +309,8 @@ 'SK_SUPPORT_LEGACY_BLURDRAWLOOPERCONSTRUCTORS', # Needed until we fix skbug.com/2440. 'SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG', + # Transitional, for deprecated SkCanvas::SaveFlags methods. + 'SK_ATTR_DEPRECATED=SK_NOTHING_ARG1', ], }], -- cgit v1.2.3 From 359920658f4dab23d5e167cab8b7855a9f6688a0 Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Fri, 25 Apr 2014 12:59:11 +0000 Subject: fix minor skp-found bugs 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 --- pathops_unittest.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/pathops_unittest.gyp b/pathops_unittest.gyp index 87e125b..51af1e9 100644 --- a/pathops_unittest.gyp +++ b/pathops_unittest.gyp @@ -24,6 +24,7 @@ 'sources': [ '../tests/PathOpsAngleIdeas.cpp', '../tests/PathOpsDebug.cpp', + '../tests/PathOpsOpLoopThreadedTest.cpp', '../tests/PathOpsSkpClipTest.cpp', '../tests/Test.cpp', '../tests/skia_test.cpp', -- cgit v1.2.3 From 465c7b39f7e80d57f7a9253b78c8697f20d6e0b9 Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Mon, 28 Apr 2014 13:19:34 +0000 Subject: gpuveto tool 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 --- tools.gyp | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/tools.gyp b/tools.gyp index 39a7847..0abed7a 100644 --- a/tools.gyp +++ b/tools.gyp @@ -18,6 +18,7 @@ 'bench_record', 'bench_playback', 'filter', + 'gpuveto', 'lua_app', 'lua_pictures', 'pinspect', @@ -198,7 +199,24 @@ 'skia_lib.gyp:skia_lib', ], }, - + { + 'target_name': 'gpuveto', + 'type': 'executable', + 'sources': [ + '../tools/gpuveto.cpp', + '../tools/LazyDecodeBitmap.cpp', + ], + 'include_dirs': [ + '../src/core/', + '../src/images', + '../src/lazy', + '../tools/flags', + ], + 'dependencies': [ + 'flags.gyp:flags', + 'skia_lib.gyp:skia_lib', + ], + }, { 'target_name': 'lua_app', 'type': 'executable', -- cgit v1.2.3 From bc8e2b3a6096fe99f679650f712977b2ed61065d Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Mon, 28 Apr 2014 14:56:32 +0000 Subject: Add pathops and capture stderr so we can get SkDebugf output. 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 --- webtry.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/webtry.gyp b/webtry.gyp index 1f476f3..63f71b9 100644 --- a/webtry.gyp +++ b/webtry.gyp @@ -7,6 +7,7 @@ 'include_dirs' : [ '../src/core', '../src/images', + '../src/pathops', ], 'sources': [ '../experimental/webtry/result.cpp', -- cgit v1.2.3 From 8058cf355b39ef5aca8320d2eac43591d707c366 Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Mon, 28 Apr 2014 15:30:02 +0000 Subject: =?UTF-8?q?use=20BenchTimer,=20print=20in=20=C2=B5s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- bench.gyp | 5 ++++- tools.gyp | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/bench.gyp b/bench.gyp index 43924ab..9e8d1d7 100644 --- a/bench.gyp +++ b/bench.gyp @@ -52,11 +52,14 @@ '../bench/BenchSysTimer_windows.h', '../bench/BenchSysTimer_windows.cpp', ], - 'include_dirs': [ + 'include_dirs': [ '../src/core', '../src/gpu', '../tools', ], + 'direct_dependent_settings': { + 'include_dirs': ['../bench'], + }, 'dependencies': [ 'skia_lib.gyp:skia_lib', ], diff --git a/tools.gyp b/tools.gyp index 0abed7a..7993b50 100644 --- a/tools.gyp +++ b/tools.gyp @@ -321,6 +321,7 @@ '../src/lazy', ], 'dependencies': [ + 'bench.gyp:bench_timer', 'flags.gyp:flags', 'skia_lib.gyp:skia_lib', 'record.gyp:*', @@ -338,6 +339,7 @@ '../src/record', ], 'dependencies': [ + 'bench.gyp:bench_timer', 'flags.gyp:flags', 'skia_lib.gyp:skia_lib', 'record.gyp:*', -- cgit v1.2.3 From e480ea879f72a45858d40a8164dfdd3561a5b649 Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Mon, 28 Apr 2014 16:00:30 +0000 Subject: Generate tests/Android.mk from gyp 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 --- apptype_console.gypi | 2 +- tests.gyp | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/apptype_console.gypi b/apptype_console.gypi index 85cc502..cde8779 100644 --- a/apptype_console.gypi +++ b/apptype_console.gypi @@ -12,7 +12,7 @@ }, }, 'conditions': [ - [ 'skia_os == "android"', { + [ 'skia_os == "android" and not skia_android_framework', { 'dependencies': [ 'android_deps.gyp:Android_EntryPoint', 'android_system.gyp:skia_launcher', diff --git a/tests.gyp b/tests.gyp index d0a898c..0d6ed5a 100644 --- a/tests.gyp +++ b/tests.gyp @@ -15,6 +15,16 @@ '../tests/skia_test.cpp', ], 'conditions': [ + [ 'skia_android_framework == 1', { + 'libraries': [ + '-lskia', + '-lcutils', + ], + 'libraries!': [ + '-lz', + '-llog', + ], + }], [ 'skia_gpu == 1', { 'include_dirs': [ '../src/gpu', -- cgit v1.2.3 From d6f10ed595738bd5fd186aa89deecb187bb482cc Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Mon, 28 Apr 2014 16:19:45 +0000 Subject: Start using type traits in src/record instead of macros. 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 --- record.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/record.gyp b/record.gyp index 0bfd83e..5fa7f81 100644 --- a/record.gyp +++ b/record.gyp @@ -8,6 +8,7 @@ '../include/config', '../include/core', '../include/record', + '../src/utils', ], 'direct_dependent_settings': { 'include_dirs': [ -- cgit v1.2.3 From d4f17c5951b45411721ec1e134b4c59fe15c535d Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Mon, 28 Apr 2014 16:25:35 +0000 Subject: move common blur types into central header 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 --- common_conditions.gypi | 1 + skia_for_chromium_defines.gypi | 1 + 2 files changed, 2 insertions(+) diff --git a/common_conditions.gypi b/common_conditions.gypi index ed30245..77dd925 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -307,6 +307,7 @@ 'SK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES', 'SK_SUPPORT_LEGACY_PICTURE_HEADERS', 'SK_SUPPORT_LEGACY_BLURDRAWLOOPERCONSTRUCTORS', + 'SK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE', # Needed until we fix skbug.com/2440. 'SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG', # Transitional, for deprecated SkCanvas::SaveFlags methods. diff --git a/skia_for_chromium_defines.gypi b/skia_for_chromium_defines.gypi index eeac1f6..1ec908e 100644 --- a/skia_for_chromium_defines.gypi +++ b/skia_for_chromium_defines.gypi @@ -21,6 +21,7 @@ 'SK_SUPPORT_LEGACY_PICTURE_HEADERS', 'SK_SUPPORT_LEGACY_PICTURE_CAN_RECORD', 'SK_SUPPORT_DEPRECATED_RECORD_FLAGS', + 'SK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE', ], }, } -- cgit v1.2.3 From 0e5097beb6e2a8c53aa931a2937654b6d27cc00c Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Mon, 28 Apr 2014 20:17:48 +0000 Subject: Refactor SkPictureStateTree::Iterator to avoid use of kClip_SaveFlag. 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 --- tests.gypi | 1 + 1 file changed, 1 insertion(+) diff --git a/tests.gypi b/tests.gypi index f27b144..982d58d 100644 --- a/tests.gypi +++ b/tests.gypi @@ -129,6 +129,7 @@ '../tests/PathUtilsTest.cpp', '../tests/PictureTest.cpp', '../tests/PictureShaderTest.cpp', + '../tests/PictureStateTreeTest.cpp', '../tests/PictureUtilsTest.cpp', '../tests/PixelRefTest.cpp', '../tests/PointTest.cpp', -- cgit v1.2.3 From 8ecee3cd6742fa45e097e49fae4bb55d398b706d Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Tue, 29 Apr 2014 00:38:39 +0000 Subject: Remove dependency of views on angle 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 --- views.gyp | 1 - views_animated.gyp | 1 - 2 files changed, 2 deletions(-) diff --git a/views.gyp b/views.gyp index b94061a..6db85df 100644 --- a/views.gyp +++ b/views.gyp @@ -13,7 +13,6 @@ 'standalone_static_library': 1, 'dependencies': [ 'skia_lib.gyp:skia_lib', - 'angle.gyp:*', 'xml.gyp:*', ], 'include_dirs': [ diff --git a/views_animated.gyp b/views_animated.gyp index 01ec4fa..c10e9f7 100644 --- a/views_animated.gyp +++ b/views_animated.gyp @@ -7,7 +7,6 @@ 'type': 'static_library', 'dependencies': [ 'skia_lib.gyp:skia_lib', - 'angle.gyp:*', 'animator.gyp:*', 'views.gyp:*', 'xml.gyp:*', -- cgit v1.2.3 From 03ed9f037736458cf06cf8e23d854393703eca83 Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Tue, 29 Apr 2014 20:06:22 +0000 Subject: Move GrGLInterface function ptr setup into a common function for all OpenGL 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 --- gpu.gypi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gpu.gypi b/gpu.gypi index 5eb9a79..efeeb2d 100644 --- a/gpu.gypi +++ b/gpu.gypi @@ -164,6 +164,8 @@ '<(skia_src_path)/gpu/effects/GrTextureStripAtlas.cpp', '<(skia_src_path)/gpu/effects/GrTextureStripAtlas.h', + '<(skia_src_path)/gpu/gl/GrGLAssembleInterface.cpp', + '<(skia_src_path)/gpu/gl/GrGLAssembleInterface.h', '<(skia_src_path)/gpu/gl/GrGLBufferImpl.cpp', '<(skia_src_path)/gpu/gl/GrGLBufferImpl.h', '<(skia_src_path)/gpu/gl/GrGLCaps.cpp', -- cgit v1.2.3 From 02d20333924f3bde163416cac5369174630b7570 Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Wed, 30 Apr 2014 13:18:12 +0000 Subject: Backfill unit tests for SkRecord 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 --- tests.gypi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests.gypi b/tests.gypi index 982d58d..afe256c 100644 --- a/tests.gypi +++ b/tests.gypi @@ -140,8 +140,8 @@ '../tests/ReadPixelsTest.cpp', '../tests/ReadWriteAlphaTest.cpp', '../tests/Reader32Test.cpp', - '../tests/RecordCullingTest.cpp', '../tests/RecordDrawTest.cpp', + '../tests/RecordOptsTest.cpp', '../tests/RecordTest.cpp', '../tests/RecorderTest.cpp', '../tests/RecordingTest.cpp', -- cgit v1.2.3 From ad64fe80988d6bd5b1467ecfab1341bc71aab706 Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Wed, 30 Apr 2014 13:20:45 +0000 Subject: Turn on quilt mode in DM. - 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 --- dm.gyp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dm.gyp b/dm.gyp index 8bb8ddf..4cfcdc6 100644 --- a/dm.gyp +++ b/dm.gyp @@ -33,6 +33,7 @@ '../dm/DMExpectationsTask.cpp', '../dm/DMGpuGMTask.cpp', '../dm/DMPipeTask.cpp', + '../dm/DMQuiltTask.cpp', '../dm/DMRecordTask.cpp', '../dm/DMReplayTask.cpp', '../dm/DMReporter.cpp', @@ -40,7 +41,6 @@ '../dm/DMTask.cpp', '../dm/DMTaskRunner.cpp', '../dm/DMTestTask.cpp', - '../dm/DMTileGridTask.cpp', '../dm/DMUtil.cpp', '../dm/DMWriteTask.cpp', '../gm/gm.cpp', -- cgit v1.2.3