more rect api simplifications
set --> setLTRB
set(pts, count) --> setBounds
Bug: skia:9328
Change-Id: I807c0598a8b23b2f721db118ec41c1607114205a
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/237038
Reviewed-by: Mike Reed <[email protected]>
Commit-Queue: Mike Reed <[email protected]>
Auto-Submit: Mike Reed <[email protected]>
diff --git a/docs/examples/Canvas_drawRegion.cpp b/docs/examples/Canvas_drawRegion.cpp
index 4fd3907..84e4467 100644
--- a/docs/examples/Canvas_drawRegion.cpp
+++ b/docs/examples/Canvas_drawRegion.cpp
@@ -5,8 +5,8 @@
REG_FIDDLE(Canvas_drawRegion, 256, 256, false, 0) {
void draw(SkCanvas* canvas) {
SkRegion region;
- region.op( 10, 10, 50, 50, SkRegion::kUnion_Op);
- region.op( 10, 50, 90, 90, SkRegion::kUnion_Op);
+ region.op({10, 10, 50, 50}, SkRegion::kUnion_Op);
+ region.op({10, 50, 90, 90}, SkRegion::kUnion_Op);
SkPaint paint;
paint.setAntiAlias(true);
paint.setStyle(SkPaint::kStroke_Style);
diff --git a/docs/examples/IRect_containsNoEmptyCheck.cpp b/docs/examples/IRect_containsNoEmptyCheck.cpp
index 6c51f91..5a5d274 100644
--- a/docs/examples/IRect_containsNoEmptyCheck.cpp
+++ b/docs/examples/IRect_containsNoEmptyCheck.cpp
@@ -8,7 +8,7 @@
SkIRect tests[] = { { 30, 50, 31, 51}, { 39, 49, 40, 50}, { 29, 59, 30, 60} };
for (auto contained : tests) {
bool success = rect.containsNoEmptyCheck(
- contained.left(), contained.top(), contained.right(), contained.bottom());
+ {contained.left(), contained.top(), contained.right(), contained.bottom()});
SkDebugf("rect: (%d, %d, %d, %d) %s (%d, %d, %d, %d)\n",
rect.left(), rect.top(), rect.right(), rect.bottom(),
success ? "contains" : "does not contain",
diff --git a/docs/examples/IRect_contains_2.cpp b/docs/examples/IRect_contains_2.cpp
deleted file mode 100644
index b2926cf..0000000
--- a/docs/examples/IRect_contains_2.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2019 Google LLC.
-// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
-#include "tools/fiddle/examples.h"
-// HASH=eae55f284818d9965ec5834747d14a48
-REG_FIDDLE(IRect_contains_2, 256, 256, true, 0) {
-void draw(SkCanvas* canvas) {
- SkIRect rect = { 30, 50, 40, 60 };
- SkIRect tests[] = { { 30, 50, 31, 51}, { 39, 49, 40, 50}, { 29, 59, 30, 60} };
- for (auto contained : tests) {
- bool success = rect.contains(
- contained.left(), contained.top(), contained.right(), contained.bottom());
- SkDebugf("rect: (%d, %d, %d, %d) %s (%d, %d, %d, %d)\n",
- rect.left(), rect.top(), rect.right(), rect.bottom(),
- success ? "contains" : "does not contain",
- contained.left(), contained.top(), contained.right(), contained.bottom());
- }
-}
-} // END FIDDLE
diff --git a/docs/examples/IRect_intersect_3.cpp b/docs/examples/IRect_intersect_3.cpp
deleted file mode 100644
index 4719bad..0000000
--- a/docs/examples/IRect_intersect_3.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright 2019 Google LLC.
-// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
-#include "tools/fiddle/examples.h"
-// HASH=200422990eded2f754ab9893118f2645
-REG_FIDDLE(IRect_intersect_3, 256, 256, true, 0) {
-void draw(SkCanvas* canvas) {
- SkIRect leftRect = { 10, 40, 50, 80 };
- SkDebugf("%s intersection: ", leftRect.intersect(30, 60, 70, 90) ? "" : "no ");
- SkDebugf("%d, %d, %d, %d\n", leftRect.left(), leftRect.top(),
- leftRect.right(), leftRect.bottom());
-}
-} // END FIDDLE
diff --git a/docs/examples/IRect_join.cpp b/docs/examples/IRect_join.cpp
deleted file mode 100644
index 80bbc95..0000000
--- a/docs/examples/IRect_join.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2019 Google LLC.
-// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
-#include "tools/fiddle/examples.h"
-// HASH=c00ef06289d21db70340e465690e0e08
-REG_FIDDLE(IRect_join, 256, 256, true, 0) {
-void draw(SkCanvas* canvas) {
- SkIRect rect = { 10, 20, 15, 25};
- rect.join(50, 60, 55, 65);
- SkDebugf("join: %d, %d, %d, %d\n", rect.fLeft, rect.fTop, rect.fRight, rect.fBottom);
-}
-} // END FIDDLE
diff --git a/docs/examples/IRect_set.cpp b/docs/examples/IRect_set.cpp
deleted file mode 100644
index aaad9cf..0000000
--- a/docs/examples/IRect_set.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2019 Google LLC.
-// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
-#include "tools/fiddle/examples.h"
-// HASH=1912c37076b7f3bf6aebfa167e971bec
-REG_FIDDLE(IRect_set, 256, 256, true, 0) {
-void draw(SkCanvas* canvas) {
- SkIRect rect1 = {3, 4, 1, 2};
- SkDebugf("rect1: {%d, %d, %d, %d}\n", rect1.fLeft, rect1.fTop, rect1.fRight, rect1.fBottom);
- SkIRect rect2;
- rect2.set(3, 4, 1, 2);
- SkDebugf("rect2: {%d, %d, %d, %d}\n", rect2.fLeft, rect2.fTop, rect2.fRight, rect2.fBottom);
-}
-} // END FIDDLE
diff --git a/docs/examples/Image_Filter_Methods.cpp b/docs/examples/Image_Filter_Methods.cpp
index 5d747ae..25c0619 100644
--- a/docs/examples/Image_Filter_Methods.cpp
+++ b/docs/examples/Image_Filter_Methods.cpp
@@ -10,8 +10,8 @@
paint.setStyle(SkPaint::kStroke_Style);
paint.setStrokeWidth(2);
SkRegion region;
- region.op( 10, 10, 50, 50, SkRegion::kUnion_Op);
- region.op( 10, 50, 90, 90, SkRegion::kUnion_Op);
+ region.op({10, 10, 50, 50}, SkRegion::kUnion_Op);
+ region.op({10, 50, 90, 90}, SkRegion::kUnion_Op);
paint.setImageFilter(SkImageFilters::Blur(5.0f, 5.0f, nullptr));
canvas->drawRegion(region, paint);
paint.setImageFilter(nullptr);
diff --git a/docs/examples/Paint_setStyle.cpp b/docs/examples/Paint_setStyle.cpp
index b720aff..0f8dba4 100644
--- a/docs/examples/Paint_setStyle.cpp
+++ b/docs/examples/Paint_setStyle.cpp
@@ -7,8 +7,8 @@
SkPaint paint;
paint.setStrokeWidth(5);
SkRegion region;
- region.op(140, 10, 160, 30, SkRegion::kUnion_Op);
- region.op(170, 40, 190, 60, SkRegion::kUnion_Op);
+ region.op({140, 10, 160, 30}, SkRegion::kUnion_Op);
+ region.op({170, 40, 190, 60}, SkRegion::kUnion_Op);
SkBitmap bitmap;
bitmap.setInfo(SkImageInfo::MakeA8(50, 50), 50);
uint8_t pixels[50][50];
diff --git a/docs/examples/Rect_iset.cpp b/docs/examples/Rect_iset.cpp
deleted file mode 100644
index 28e6d79..0000000
--- a/docs/examples/Rect_iset.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2019 Google LLC.
-// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
-#include "tools/fiddle/examples.h"
-// HASH=18532f1aa90b76364fb8d7ea072f1892
-REG_FIDDLE(Rect_iset, 256, 256, true, 0) {
-void draw(SkCanvas* canvas) {
- SkRect rect1 = {3, 4, 1, 2};
- SkDebugf("rect1: {%g, %g, %g, %g}\n", rect1.fLeft, rect1.fTop, rect1.fRight, rect1.fBottom);
- SkRect rect2;
- rect2.iset(3, 4, 1, 2);
- SkDebugf("rect2: {%g, %g, %g, %g}\n", rect2.fLeft, rect2.fTop, rect2.fRight, rect2.fBottom);
-}
-} // END FIDDLE
diff --git a/docs/examples/Rect_isetWH.cpp b/docs/examples/Rect_isetWH.cpp
deleted file mode 100644
index 19a23f9..0000000
--- a/docs/examples/Rect_isetWH.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2019 Google LLC.
-// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
-#include "tools/fiddle/examples.h"
-// HASH=ee6000080fc7123214ea404018cf9176
-REG_FIDDLE(Rect_isetWH, 256, 256, true, 0) {
-void draw(SkCanvas* canvas) {
- SkRect rect1 = {0, 0, 1, 2};
- SkDebugf("rect1: {%g, %g, %g, %g}\n", rect1.fLeft, rect1.fTop, rect1.fRight, rect1.fBottom);
- SkRect rect2;
- rect2.isetWH(1, 2);
- SkDebugf("rect2: {%g, %g, %g, %g}\n", rect2.fLeft, rect2.fTop, rect2.fRight, rect2.fBottom);
-}
-} // END FIDDLE
diff --git a/docs/examples/Rect_set_2.cpp b/docs/examples/Rect_set_2.cpp
deleted file mode 100644
index 0179a3e..0000000
--- a/docs/examples/Rect_set_2.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2019 Google LLC.
-// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
-#include "tools/fiddle/examples.h"
-// HASH=9b29ea460d69b4d47323fd9e3e17721e
-REG_FIDDLE(Rect_set_2, 256, 256, true, 0) {
-void draw(SkCanvas* canvas) {
- SkRect rect1 = {3, 4, 1, 2};
- SkDebugf("rect1: {%g, %g, %g, %g}\n", rect1.fLeft, rect1.fTop, rect1.fRight, rect1.fBottom);
- SkRect rect2;
- rect2.set(3, 4, 1, 2);
- SkDebugf("rect2: {%g, %g, %g, %g}\n", rect2.fLeft, rect2.fTop, rect2.fRight, rect2.fBottom);
-}
-} // END FIDDLE
diff --git a/docs/examples/Rect_set_3.cpp b/docs/examples/Rect_set_3.cpp
deleted file mode 100644
index 0a78941..0000000
--- a/docs/examples/Rect_set_3.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2019 Google LLC.
-// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
-#include "tools/fiddle/examples.h"
-// HASH=94295fa5197e21256171b99b4023dd48
-REG_FIDDLE(Rect_set_3, 256, 256, true, 0) {
-void draw(SkCanvas* canvas) {
- SkPoint points[] = {{3, 4}, {1, 2}, {5, 6}, {SK_ScalarNaN, 8}};
- for (int count = 0; count <= (int) SK_ARRAY_COUNT(points); ++count) {
- SkRect rect;
- rect.set(points, count);
- if (count > 0) {
- SkDebugf("added: %3g, %g ", points[count - 1].fX, points[count - 1].fY);
- } else {
- SkDebugf("%14s", " ");
- }
- SkDebugf("count: %d rect: %g, %g, %g, %g\n", count,
- rect.fLeft, rect.fTop, rect.fRight, rect.fBottom);
- }
-}
-} // END FIDDLE
diff --git a/docs/examples/Region_quickContains_2.cpp b/docs/examples/Region_quickContains_2.cpp
deleted file mode 100644
index f3ae2b60..0000000
--- a/docs/examples/Region_quickContains_2.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2019 Google LLC.
-// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
-#include "tools/fiddle/examples.h"
-// HASH=eb6d290887e1a3a0b051b4d7b012f5e1
-REG_FIDDLE(Region_quickContains_2, 256, 256, true, 0) {
-void draw(SkCanvas* canvas) {
- auto debugster = [](const char* label, SkRegion& region) -> void {
- SkDebugf("%s: %s\n", label, region.quickContains(2, 2, 3, 3) ? "true" : "false");
- };
- SkRegion region({1, 2, 3, 4});
- debugster("quickContains 1", region);
- region.op({1, 4, 3, 6}, SkRegion::kUnion_Op);
- debugster("quickContains 2", region);
- region.op({1, 7, 3, 8}, SkRegion::kUnion_Op);
- debugster("quickContains 3", region);
-}
-} // END FIDDLE
diff --git a/docs/examples/Region_setRect_2.cpp b/docs/examples/Region_setRect_2.cpp
deleted file mode 100644
index 7c9c973..0000000
--- a/docs/examples/Region_setRect_2.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2019 Google LLC.
-// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
-#include "tools/fiddle/examples.h"
-// HASH=5b31a1b077818a8150ad50f3b19e7bfe
-REG_FIDDLE(Region_setRect_2, 256, 256, true, 0) {
-void draw(SkCanvas* canvas) {
- auto debugster = [](const char* label, bool success, SkRegion& region) -> void {
- auto r = region.getBounds();
- SkDebugf("%14s: success:%s {%d,%d,%d,%d}\n", label, success ? "true" : "false",
- r.fLeft, r.fTop, r.fRight, r.fBottom);
- };
- SkRegion region;
- bool success = region.setRect(1, 2, 3, 4);
- debugster("set to: 1,2,3,4", success, region);
- success = region.setRect(3, 2, 1, 4);
- debugster("set to: 3,2,1,4", success, region);
-}
-} // END FIDDLE
