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

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: 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
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 1653 matching lines...) Expand 10 before | Expand all | Expand 10 after
1664 (gmFlags & GM::kSkipTiled_Flag) || 1664 (gmFlags & GM::kSkipTiled_Flag) ||
1665 ((gmFlags & GM::kSkipScaledReplay_Flag) && replayScale != 1)) { 1665 ((gmFlags & GM::kSkipScaledReplay_Flag) && replayScale != 1)) {
1666 gmmain.RecordTestResults(kIntentionallySkipped_ErrorType, shortN amePlusConfig, 1666 gmmain.RecordTestResults(kIntentionallySkipped_ErrorType, shortN amePlusConfig,
1667 renderModeDescriptor.c_str()); 1667 renderModeDescriptor.c_str());
1668 errorsForAllModes.add(kIntentionallySkipped_ErrorType); 1668 errorsForAllModes.add(kIntentionallySkipped_ErrorType);
1669 } else { 1669 } else {
1670 // We record with the reciprocal scale to obtain a replay 1670 // We record with the reciprocal scale to obtain a replay
1671 // result that can be validated against comparisonBitmap. 1671 // result that can be validated against comparisonBitmap.
1672 SkScalar recordScale = SkScalarInvert(replayScale); 1672 SkScalar recordScale = SkScalarInvert(replayScale);
1673 SkPicture* pict = gmmain.generate_new_picture( 1673 SkPicture* pict = gmmain.generate_new_picture(
1674 gm, kTileGrid_BbhType, SkPicture::kUsePathBoundsForClip_Reco rdingFlag, 1674 gm, kTileGrid_BbhType, 0, recordScale);
1675 recordScale);
1676 SkAutoUnref aur(pict); 1675 SkAutoUnref aur(pict);
1677 SkBitmap bitmap; 1676 SkBitmap bitmap;
1678 // We cannot yet pass 'true' to generate_image_from_picture to 1677 // We cannot yet pass 'true' to generate_image_from_picture to
1679 // perform actual tiled rendering (see Issue 1198 - 1678 // perform actual tiled rendering (see Issue 1198 -
1680 // https://code.google.com/p/skia/issues/detail?id=1198) 1679 // https://code.google.com/p/skia/issues/detail?id=1198)
1681 gmmain.generate_image_from_picture(gm, compareConfig, pict, &bit map, 1680 gmmain.generate_image_from_picture(gm, compareConfig, pict, &bit map,
1682 replayScale /*, true */); 1681 replayScale /*, true */);
1683 errorsForAllModes.add(gmmain.compare_test_results_to_reference_b itmap( 1682 errorsForAllModes.add(gmmain.compare_test_results_to_reference_b itmap(
1684 gm->getName(), compareConfig.fName, renderModeDescriptor.c_s tr(), bitmap, 1683 gm->getName(), compareConfig.fName, renderModeDescriptor.c_s tr(), bitmap,
1685 &comparisonBitmap)); 1684 &comparisonBitmap));
(...skipping 780 matching lines...) Expand 10 before | Expand all | Expand 10 after
2466 if (FLAGS_forceBWtext) { 2465 if (FLAGS_forceBWtext) {
2467 canvas->setDrawFilter(SkNEW(BWTextDrawFilter))->unref(); 2466 canvas->setDrawFilter(SkNEW(BWTextDrawFilter))->unref();
2468 } 2467 }
2469 } 2468 }
2470 2469
2471 #if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL) 2470 #if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL)
2472 int main(int argc, char * const argv[]) { 2471 int main(int argc, char * const argv[]) {
2473 return tool_main(argc, (char**) argv); 2472 return tool_main(argc, (char**) argv);
2474 } 2473 }
2475 #endif 2474 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698