| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  * Copyright 2013 Google Inc. | 2  * Copyright 2013 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 #include "gm.h" | 8 #include "gm.h" | 
| 9 #include "SkBitmap.h" | 9 #include "SkBitmap.h" | 
| 10 #include "SkCanvas.h" | 10 #include "SkCanvas.h" | 
| (...skipping 29 matching lines...) Expand all  Loading... | 
| 40             SkIntToScalar(100), | 40             SkIntToScalar(100), | 
| 41             SkIntToScalar(200), | 41             SkIntToScalar(200), | 
| 42             SkIntToScalar(400), | 42             SkIntToScalar(400), | 
| 43             SkIntToScalar(700) | 43             SkIntToScalar(700) | 
| 44         }; | 44         }; | 
| 45         p.addRoundRect(r, SkIntToScalar(50), SkIntToScalar(50)); | 45         p.addRoundRect(r, SkIntToScalar(50), SkIntToScalar(50)); | 
| 46         rec->clipPath(p, SkRegion::kIntersect_Op, true); | 46         rec->clipPath(p, SkRegion::kIntersect_Op, true); | 
| 47         rec->translate(SkIntToScalar(250), SkIntToScalar(250)); | 47         rec->translate(SkIntToScalar(250), SkIntToScalar(250)); | 
| 48         rec->clipPath(p, SkRegion::kIntersect_Op, true); | 48         rec->clipPath(p, SkRegion::kIntersect_Op, true); | 
| 49         rec->drawColor(0xffff0000); | 49         rec->drawColor(0xffff0000); | 
| 50         SkAutoTUnref<SkPicture> pict(recorder.endRecording()); | 50         sk_sp<SkPicture> pict(recorder.finishRecordingAsPicture()); | 
| 51 | 51 | 
| 52         canvas->setAllowSimplifyClip(true); | 52         canvas->setAllowSimplifyClip(true); | 
| 53         canvas->save(); | 53         canvas->save(); | 
| 54         canvas->drawPicture(pict); | 54         canvas->drawPicture(pict); | 
| 55         canvas->restore(); | 55         canvas->restore(); | 
| 56 | 56 | 
| 57         canvas->setAllowSimplifyClip(false); | 57         canvas->setAllowSimplifyClip(false); | 
| 58         canvas->save(); | 58         canvas->save(); | 
| 59         canvas->translate(SkIntToScalar(1200 / 2), 0); | 59         canvas->translate(SkIntToScalar(1200 / 2), 0); | 
| 60         canvas->drawPicture(pict); | 60         canvas->drawPicture(pict); | 
| 61         canvas->restore(); | 61         canvas->restore(); | 
| 62     } | 62     } | 
| 63 | 63 | 
| 64 private: | 64 private: | 
| 65     typedef GM INHERITED; | 65     typedef GM INHERITED; | 
| 66 }; | 66 }; | 
| 67 | 67 | 
| 68 ////////////////////////////////////////////////////////////////////////////// | 68 ////////////////////////////////////////////////////////////////////////////// | 
| 69 | 69 | 
| 70 static GM* MyFactory(void*) { return new PathOpsSkpClipGM; } | 70 static GM* MyFactory(void*) { return new PathOpsSkpClipGM; } | 
| 71 static GMRegistry reg(MyFactory); | 71 static GMRegistry reg(MyFactory); | 
| 72 | 72 | 
| 73 } | 73 } | 
| OLD | NEW | 
|---|