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

Side by Side Diff: src/device/xps/SkXPSDevice.cpp

Issue 200223008: Remove SkCanvas matrix ops return value. (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Updated per comments Created 6 years, 9 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 | Annotate | Revision Log
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 #ifndef UNICODE 8 #ifndef UNICODE
9 #define UNICODE 9 #define UNICODE
10 #endif 10 #endif
(...skipping 1678 matching lines...) Expand 10 before | Expand all | Expand 10 after
1689 SkMatrix matrix = *d.fMatrix; 1689 SkMatrix matrix = *d.fMatrix;
1690 SkPath* skeletalPath = const_cast<SkPath*>(&platonicPath); 1690 SkPath* skeletalPath = const_cast<SkPath*>(&platonicPath);
1691 if (prePathMatrix) { 1691 if (prePathMatrix) {
1692 if (paintHasPathEffect || paint->getRasterizer()) { 1692 if (paintHasPathEffect || paint->getRasterizer()) {
1693 if (!pathIsMutable) { 1693 if (!pathIsMutable) {
1694 skeletalPath = &modifiedPath; 1694 skeletalPath = &modifiedPath;
1695 pathIsMutable = true; 1695 pathIsMutable = true;
1696 } 1696 }
1697 platonicPath.transform(*prePathMatrix, skeletalPath); 1697 platonicPath.transform(*prePathMatrix, skeletalPath);
1698 } else { 1698 } else {
1699 if (!matrix.preConcat(*prePathMatrix)) { 1699 matrix.preConcat(*prePathMatrix);
1700 return;
1701 }
1702 } 1700 }
1703 } 1701 }
1704 1702
1705 //Apply path effect [Skeletal-path -> Fillable-path]. 1703 //Apply path effect [Skeletal-path -> Fillable-path].
1706 SkPath* fillablePath = skeletalPath; 1704 SkPath* fillablePath = skeletalPath;
1707 if (paintHasPathEffect) { 1705 if (paintHasPathEffect) {
1708 if (!pathIsMutable) { 1706 if (!pathIsMutable) {
1709 fillablePath = &modifiedPath; 1707 fillablePath = &modifiedPath;
1710 pathIsMutable = true; 1708 pathIsMutable = true;
1711 } 1709 }
(...skipping 730 matching lines...) Expand 10 before | Expand all | Expand 10 after
2442 IID_PPV_ARGS(&this->fXpsFactory)), 2440 IID_PPV_ARGS(&this->fXpsFactory)),
2443 "Could not create factory for layer."); 2441 "Could not create factory for layer.");
2444 2442
2445 HRVM(this->fXpsFactory->CreateCanvas(&this->fCurrentXpsCanvas), 2443 HRVM(this->fXpsFactory->CreateCanvas(&this->fCurrentXpsCanvas),
2446 "Could not create canvas for layer."); 2444 "Could not create canvas for layer.");
2447 } 2445 }
2448 2446
2449 bool SkXPSDevice::allowImageFilter(const SkImageFilter*) { 2447 bool SkXPSDevice::allowImageFilter(const SkImageFilter*) {
2450 return false; 2448 return false;
2451 } 2449 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698