Revert "Revert "add SK_ATTR_DEPRECATED -- will need to disable for chrome, since it triggers a warning""
This reverts commit 1e787c38fa71f2a21fd728f1b1d620b9b09b0d3d.
BUG=
Review URL: https://codereview.chromium.org/54603004
git-svn-id: http://skia.googlecode.com/svn/trunk@12057 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/gpu/GrClipMaskManager.cpp b/src/gpu/GrClipMaskManager.cpp
index c8713b6..e2597df 100644
--- a/src/gpu/GrClipMaskManager.cpp
+++ b/src/gpu/GrClipMaskManager.cpp
@@ -366,7 +366,7 @@
GrTextureDomainEffect::MakeTexelDomain(srcMask, srcBound),
GrTextureDomainEffect::kDecal_WrapMode,
GrTextureParams::kNone_FilterMode))->unref();
- fGpu->drawSimpleRect(SkRect::MakeFromIRect(dstBound), NULL);
+ fGpu->drawSimpleRect(SkRect::Make(dstBound), NULL);
}
// get a texture to act as a temporary buffer for AA clip boolean operations
@@ -722,7 +722,7 @@
SET_RANDOM_COLOR
// The view matrix is setup to do clip space -> stencil space translation, so
// draw rect in clip space.
- fGpu->drawSimpleRect(SkRect::MakeFromIRect(clipSpaceIBounds), NULL);
+ fGpu->drawSimpleRect(SkRect::Make(clipSpaceIBounds), NULL);
}
}
}
@@ -961,7 +961,7 @@
// but leave the pixels inside the geometry alone. For reverse difference we invert all
// the pixels before clearing the ones outside the geometry.
if (SkRegion::kReverseDifference_Op == op) {
- SkRect temp = SkRect::MakeFromIRect(clipSpaceIBounds);
+ SkRect temp = SkRect::Make(clipSpaceIBounds);
// invert the entire scene
helper.draw(temp, SkRegion::kXOR_Op, false, 0xFF);
}
diff --git a/src/gpu/GrDrawTarget.h b/src/gpu/GrDrawTarget.h
index c75bba2..6a1cc02 100644
--- a/src/gpu/GrDrawTarget.h
+++ b/src/gpu/GrDrawTarget.h
@@ -362,7 +362,7 @@
this->drawRect(rect, matrix, NULL, NULL);
}
void drawSimpleRect(const SkIRect& irect, const SkMatrix* matrix = NULL) {
- SkRect rect = SkRect::MakeFromIRect(irect);
+ SkRect rect = SkRect::Make(irect);
this->drawRect(rect, matrix, NULL, NULL);
}
diff --git a/src/gpu/GrInOrderDrawBuffer.cpp b/src/gpu/GrInOrderDrawBuffer.cpp
index e426de3..a299512 100644
--- a/src/gpu/GrInOrderDrawBuffer.cpp
+++ b/src/gpu/GrInOrderDrawBuffer.cpp
@@ -213,7 +213,7 @@
// free via the viewport. We don't want to think that clipping must be enabled in this
// case. So we extend the clip outward from the edge to avoid these false negatives.
fClipProxyState = kValid_ClipProxyState;
- fClipProxy = SkRect::MakeFromIRect(rect);
+ fClipProxy = SkRect::Make(rect);
if (fClipProxy.fLeft <= 0) {
fClipProxy.fLeft = SK_ScalarMin;
diff --git a/src/gpu/GrReducedClip.cpp b/src/gpu/GrReducedClip.cpp
index 2b6583e..a5f4519 100644
--- a/src/gpu/GrReducedClip.cpp
+++ b/src/gpu/GrReducedClip.cpp
@@ -51,7 +51,7 @@
const SkIRect* bounds = &queryBounds;
- SkRect scalarQueryBounds = SkRect::MakeFromIRect(queryBounds);
+ SkRect scalarQueryBounds = SkRect::Make(queryBounds);
if (iior) {
SkASSERT(SkClipStack::kNormal_BoundsType == stackBoundsType);
@@ -67,7 +67,7 @@
} else if (isectRect.intersect(stackBounds, scalarQueryBounds)) {
if (NULL != tighterBounds) {
isectRect.roundOut(tighterBounds);
- SkRect scalarTighterBounds = SkRect::MakeFromIRect(*tighterBounds);
+ SkRect scalarTighterBounds = SkRect::Make(*tighterBounds);
if (scalarTighterBounds == isectRect) {
// the round-out didn't add any area outside the clip rect.
*requiresAA = false;
@@ -119,7 +119,7 @@
}
}
- SkRect scalarBounds = SkRect::MakeFromIRect(*bounds);
+ SkRect scalarBounds = SkRect::Make(*bounds);
// Now that we have determined the bounds to use and filtered out the trivial cases, call the
// helper that actually walks the stack.
diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp
index 730dad6..f47a91b 100644
--- a/src/gpu/SkGpuDevice.cpp
+++ b/src/gpu/SkGpuDevice.cpp
@@ -53,8 +53,8 @@
///////////////////////////////////////////////////////////////////////////////
-#define CHECK_FOR_NODRAW_ANNOTATION(paint) \
- do { if (paint.isNoDrawAnnotation()) { return; } } while (0)
+#define CHECK_FOR_ANNOTATION(paint) \
+ do { if (paint.getAnnotation()) { return; } } while (0)
///////////////////////////////////////////////////////////////////////////////
@@ -572,7 +572,7 @@
void SkGpuDevice::drawPoints(const SkDraw& draw, SkCanvas::PointMode mode,
size_t count, const SkPoint pts[], const SkPaint& paint) {
- CHECK_FOR_NODRAW_ANNOTATION(paint);
+ CHECK_FOR_ANNOTATION(paint);
CHECK_SHOULD_DRAW(draw, false);
SkScalar width = paint.getStrokeWidth();
@@ -606,7 +606,7 @@
void SkGpuDevice::drawRect(const SkDraw& draw, const SkRect& rect,
const SkPaint& paint) {
- CHECK_FOR_NODRAW_ANNOTATION(paint);
+ CHECK_FOR_ANNOTATION(paint);
CHECK_SHOULD_DRAW(draw, false);
bool doStroke = paint.getStyle() != SkPaint::kFill_Style;
@@ -662,7 +662,7 @@
void SkGpuDevice::drawRRect(const SkDraw& draw, const SkRRect& rect,
const SkPaint& paint) {
- CHECK_FOR_NODRAW_ANNOTATION(paint);
+ CHECK_FOR_ANNOTATION(paint);
CHECK_SHOULD_DRAW(draw, false);
bool usePath = !rect.isSimple();
@@ -695,7 +695,7 @@
void SkGpuDevice::drawOval(const SkDraw& draw, const SkRect& oval,
const SkPaint& paint) {
- CHECK_FOR_NODRAW_ANNOTATION(paint);
+ CHECK_FOR_ANNOTATION(paint);
CHECK_SHOULD_DRAW(draw, false);
bool usePath = false;
@@ -787,7 +787,7 @@
texture->writePixels(0, 0, desc.fWidth, desc.fHeight, desc.fConfig,
dstM.fImage, dstM.fRowBytes);
- SkRect maskRect = SkRect::MakeFromIRect(dstM.fBounds);
+ SkRect maskRect = SkRect::Make(dstM.fBounds);
return draw_mask(context, maskRect, grp, texture);
}
@@ -860,7 +860,7 @@
void SkGpuDevice::drawPath(const SkDraw& draw, const SkPath& origSrcPath,
const SkPaint& paint, const SkMatrix* prePathMatrix,
bool pathIsMutable) {
- CHECK_FOR_NODRAW_ANNOTATION(paint);
+ CHECK_FOR_ANNOTATION(paint);
CHECK_SHOULD_DRAW(draw, false);
GrPaint grPaint;
@@ -1017,7 +1017,7 @@
clippedSrcIRect->setEmpty();
return;
}
- SkRect clippedSrcRect = SkRect::MakeFromIRect(*clippedSrcIRect);
+ SkRect clippedSrcRect = SkRect::Make(*clippedSrcIRect);
inv.mapRect(&clippedSrcRect);
if (NULL != srcRectPtr) {
if (!clippedSrcRect.intersect(*srcRectPtr)) {
@@ -1236,7 +1236,7 @@
const SkPaint& paint,
SkCanvas::DrawBitmapRectFlags flags,
int tileSize) {
- SkRect clippedSrcRect = SkRect::MakeFromIRect(clippedSrcIRect);
+ SkRect clippedSrcRect = SkRect::Make(clippedSrcIRect);
int nx = bitmap.width() / tileSize;
int ny = bitmap.height() / tileSize;