Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(152)

Side by Side Diff: gm/gmmain.cpp

Issue 316143003: Remove SkPicture::kUsePathBoundsForClip_RecordingFlag (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Add suppression for fixed GM Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « expectations/gm/ignored-tests.txt ('k') | include/core/SkPicture.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2011 Google Inc. 2 * Copyright 2011 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 /* 8 /*
9 * Code for the "gm" (Golden Master) rendering comparison tool. 9 * Code for the "gm" (Golden Master) rendering comparison tool.
10 * 10 *
(...skipping 1651 matching lines...) Expand 10 before | Expand all | Expand 10 after
1662 (gmFlags & GM::kSkipTiled_Flag) || 1662 (gmFlags & GM::kSkipTiled_Flag) ||
1663 ((gmFlags & GM::kSkipScaledReplay_Flag) && replayScale != 1)) { 1663 ((gmFlags & GM::kSkipScaledReplay_Flag) && replayScale != 1)) {
1664 gmmain.RecordTestResults(kIntentionallySkipped_ErrorType, shortN amePlusConfig, 1664 gmmain.RecordTestResults(kIntentionallySkipped_ErrorType, shortN amePlusConfig,
1665 renderModeDescriptor.c_str()); 1665 renderModeDescriptor.c_str());
1666 errorsForAllModes.add(kIntentionallySkipped_ErrorType); 1666 errorsForAllModes.add(kIntentionallySkipped_ErrorType);
1667 } else { 1667 } else {
1668 // We record with the reciprocal scale to obtain a replay 1668 // We record with the reciprocal scale to obtain a replay
1669 // result that can be validated against comparisonBitmap. 1669 // result that can be validated against comparisonBitmap.
1670 SkScalar recordScale = SkScalarInvert(replayScale); 1670 SkScalar recordScale = SkScalarInvert(replayScale);
1671 SkPicture* pict = gmmain.generate_new_picture( 1671 SkPicture* pict = gmmain.generate_new_picture(
1672 gm, kTileGrid_BbhType, SkPicture::kUsePathBoundsForClip_Reco rdingFlag, 1672 gm, kTileGrid_BbhType, 0, recordScale);
1673 recordScale);
1674 SkAutoUnref aur(pict); 1673 SkAutoUnref aur(pict);
1675 SkBitmap bitmap; 1674 SkBitmap bitmap;
1676 // We cannot yet pass 'true' to generate_image_from_picture to 1675 // We cannot yet pass 'true' to generate_image_from_picture to
1677 // perform actual tiled rendering (see Issue 1198 - 1676 // perform actual tiled rendering (see Issue 1198 -
1678 // https://code.google.com/p/skia/issues/detail?id=1198) 1677 // https://code.google.com/p/skia/issues/detail?id=1198)
1679 gmmain.generate_image_from_picture(gm, compareConfig, pict, &bit map, 1678 gmmain.generate_image_from_picture(gm, compareConfig, pict, &bit map,
1680 replayScale /*, true */); 1679 replayScale /*, true */);
1681 errorsForAllModes.add(gmmain.compare_test_results_to_reference_b itmap( 1680 errorsForAllModes.add(gmmain.compare_test_results_to_reference_b itmap(
1682 gm->getName(), compareConfig.fName, renderModeDescriptor.c_s tr(), bitmap, 1681 gm->getName(), compareConfig.fName, renderModeDescriptor.c_s tr(), bitmap,
1683 &comparisonBitmap)); 1682 &comparisonBitmap));
(...skipping 780 matching lines...) Expand 10 before | Expand all | Expand 10 after
2464 if (FLAGS_forceBWtext) { 2463 if (FLAGS_forceBWtext) {
2465 canvas->setDrawFilter(SkNEW(BWTextDrawFilter))->unref(); 2464 canvas->setDrawFilter(SkNEW(BWTextDrawFilter))->unref();
2466 } 2465 }
2467 } 2466 }
2468 2467
2469 #if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL) 2468 #if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL)
2470 int main(int argc, char * const argv[]) { 2469 int main(int argc, char * const argv[]) {
2471 return tool_main(argc, (char**) argv); 2470 return tool_main(argc, (char**) argv);
2472 } 2471 }
2473 #endif 2472 #endif
OLDNEW
« no previous file with comments | « expectations/gm/ignored-tests.txt ('k') | include/core/SkPicture.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698