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

Side by Side Diff: src/core/SkCanvas.cpp

Issue 51033004: add SK_ATTR_DEPRECATED -- will need to disable for chrome, since it triggers a warning (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 7 years, 1 month 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
« no previous file with comments | « src/core/SkBlitter_Sprite.cpp ('k') | src/core/SkDraw.cpp » ('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 /* 2 /*
3 * Copyright 2008 The Android Open Source Project 3 * Copyright 2008 The Android Open Source Project
4 * 4 *
5 * Use of this source code is governed by a BSD-style license that can be 5 * Use of this source code is governed by a BSD-style license that can be
6 * found in the LICENSE file. 6 * found in the LICENSE file.
7 */ 7 */
8 8
9 9
10 #include "SkCanvas.h" 10 #include "SkCanvas.h"
(...skipping 1289 matching lines...) Expand 10 before | Expand all | Expand 10 after
1300 case SkRegion::kReplace_Op: 1300 case SkRegion::kReplace_Op:
1301 case SkRegion::kReverseDifference_Op: 1301 case SkRegion::kReverseDifference_Op:
1302 case SkRegion::kXOR_Op: 1302 case SkRegion::kXOR_Op:
1303 { 1303 {
1304 // These ops can grow the current clip up to the extents of 1304 // These ops can grow the current clip up to the extents of
1305 // the input clip, which is inverse filled, so we just set 1305 // the input clip, which is inverse filled, so we just set
1306 // the current clip to the device bounds. 1306 // the current clip to the device bounds.
1307 SkRect deviceBounds; 1307 SkRect deviceBounds;
1308 SkIRect deviceIBounds; 1308 SkIRect deviceIBounds;
1309 this->getDevice()->getGlobalBounds(&deviceIBounds); 1309 this->getDevice()->getGlobalBounds(&deviceIBounds);
1310 deviceBounds = SkRect::MakeFromIRect(deviceIBounds); 1310 deviceBounds = SkRect::Make(deviceIBounds);
1311 this->SkCanvas::save(SkCanvas::kMatrix_SaveFlag); 1311 this->SkCanvas::save(SkCanvas::kMatrix_SaveFlag);
1312 // set the clip in device space 1312 // set the clip in device space
1313 this->SkCanvas::setMatrix(SkMatrix::I()); 1313 this->SkCanvas::setMatrix(SkMatrix::I());
1314 bool result = this->SkCanvas::clipRect(deviceBounds, 1314 bool result = this->SkCanvas::clipRect(deviceBounds,
1315 SkRegion::kReplace_Op, false); 1315 SkRegion::kReplace_Op, false);
1316 this->SkCanvas::restore(); //pop the matrix, but keep the cl ip 1316 this->SkCanvas::restore(); //pop the matrix, but keep the cl ip
1317 return result; 1317 return result;
1318 } 1318 }
1319 default: 1319 default:
1320 SkASSERT(0); // unhandled op? 1320 SkASSERT(0); // unhandled op?
(...skipping 901 matching lines...) Expand 10 before | Expand all | Expand 10 after
2222 return *paint; 2222 return *paint;
2223 } 2223 }
2224 2224
2225 const SkRegion& SkCanvas::LayerIter::clip() const { return fImpl->getClip(); } 2225 const SkRegion& SkCanvas::LayerIter::clip() const { return fImpl->getClip(); }
2226 int SkCanvas::LayerIter::x() const { return fImpl->getX(); } 2226 int SkCanvas::LayerIter::x() const { return fImpl->getX(); }
2227 int SkCanvas::LayerIter::y() const { return fImpl->getY(); } 2227 int SkCanvas::LayerIter::y() const { return fImpl->getY(); }
2228 2228
2229 /////////////////////////////////////////////////////////////////////////////// 2229 ///////////////////////////////////////////////////////////////////////////////
2230 2230
2231 SkCanvas::ClipVisitor::~ClipVisitor() { } 2231 SkCanvas::ClipVisitor::~ClipVisitor() { }
OLDNEW
« no previous file with comments | « src/core/SkBlitter_Sprite.cpp ('k') | src/core/SkDraw.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698