Index: skia/ext/benchmarking_canvas.cc |
diff --git a/skia/ext/benchmarking_canvas.cc b/skia/ext/benchmarking_canvas.cc |
index fb9845fe85e43fda827ebb1e26b0094c16128948..5cb36b253cafdaa0bdf8b2e0f20e5c8c1a9f16bb 100644 |
--- a/skia/ext/benchmarking_canvas.cc |
+++ b/skia/ext/benchmarking_canvas.cc |
@@ -8,6 +8,7 @@ |
#include <utility> |
#include "base/logging.h" |
+#include "base/memory/ptr_util.h" |
#include "base/strings/stringprintf.h" |
#include "base/time/time.h" |
#include "third_party/skia/include/core/SkColorFilter.h" |
@@ -46,14 +47,12 @@ private: |
std::ostringstream oss_; |
}; |
-WARN_UNUSED_RESULT |
std::unique_ptr<base::Value> AsValue(bool b) { |
std::unique_ptr<base::FundamentalValue> val(new base::FundamentalValue(b)); |
return std::move(val); |
} |
-WARN_UNUSED_RESULT |
std::unique_ptr<base::Value> AsValue(SkScalar scalar) { |
std::unique_ptr<base::FundamentalValue> val( |
new base::FundamentalValue(scalar)); |
@@ -61,7 +60,6 @@ std::unique_ptr<base::Value> AsValue(SkScalar scalar) { |
return std::move(val); |
} |
-WARN_UNUSED_RESULT |
std::unique_ptr<base::Value> AsValue(const SkSize& size) { |
std::unique_ptr<base::DictionaryValue> val(new base::DictionaryValue()); |
val->Set("width", AsValue(size.width())); |
@@ -70,7 +68,6 @@ std::unique_ptr<base::Value> AsValue(const SkSize& size) { |
return std::move(val); |
} |
-WARN_UNUSED_RESULT |
std::unique_ptr<base::Value> AsValue(const SkPoint& point) { |
std::unique_ptr<base::DictionaryValue> val(new base::DictionaryValue()); |
val->Set("x", AsValue(point.x())); |
@@ -79,7 +76,6 @@ std::unique_ptr<base::Value> AsValue(const SkPoint& point) { |
return std::move(val); |
} |
-WARN_UNUSED_RESULT |
std::unique_ptr<base::Value> AsValue(const SkRect& rect) { |
std::unique_ptr<base::DictionaryValue> val(new base::DictionaryValue()); |
val->Set("left", AsValue(rect.fLeft)); |
@@ -90,7 +86,6 @@ std::unique_ptr<base::Value> AsValue(const SkRect& rect) { |
return std::move(val); |
} |
-WARN_UNUSED_RESULT |
std::unique_ptr<base::Value> AsValue(const SkRRect& rrect) { |
std::unique_ptr<base::DictionaryValue> radii_val(new base::DictionaryValue()); |
radii_val->Set("upper-left", AsValue(rrect.radii(SkRRect::kUpperLeft_Corner))); |
@@ -105,16 +100,14 @@ std::unique_ptr<base::Value> AsValue(const SkRRect& rrect) { |
return std::move(val); |
} |
-WARN_UNUSED_RESULT |
std::unique_ptr<base::Value> AsValue(const SkMatrix& matrix) { |
std::unique_ptr<base::ListValue> val(new base::ListValue()); |
for (int i = 0; i < 9; ++i) |
- val->Append(AsValue(matrix[i])); // no scoped_ptr-aware Append() variant |
+ val->Append(AsValue(matrix[i])); |
return std::move(val); |
} |
-WARN_UNUSED_RESULT |
std::unique_ptr<base::Value> AsValue(SkColor color) { |
std::unique_ptr<base::DictionaryValue> val(new base::DictionaryValue()); |
val->SetInteger("a", SkColorGetA(color)); |
@@ -125,7 +118,6 @@ std::unique_ptr<base::Value> AsValue(SkColor color) { |
return std::move(val); |
} |
-WARN_UNUSED_RESULT |
std::unique_ptr<base::Value> AsValue(SkXfermode::Mode mode) { |
std::unique_ptr<base::StringValue> val( |
new base::StringValue(SkXfermode::ModeName(mode))); |
@@ -133,7 +125,6 @@ std::unique_ptr<base::Value> AsValue(SkXfermode::Mode mode) { |
return std::move(val); |
} |
-WARN_UNUSED_RESULT |
std::unique_ptr<base::Value> AsValue(SkCanvas::PointMode mode) { |
static const char* gModeStrings[] = { "Points", "Lines", "Polygon" }; |
DCHECK_LT(static_cast<size_t>(mode), SK_ARRAY_COUNT(gModeStrings)); |
@@ -144,7 +135,6 @@ std::unique_ptr<base::Value> AsValue(SkCanvas::PointMode mode) { |
return std::move(val); |
} |
-WARN_UNUSED_RESULT |
std::unique_ptr<base::Value> AsValue(const SkXfermode& xfermode) { |
SkXfermode::Mode mode; |
if (xfermode.asMode(&mode)) |
@@ -154,7 +144,6 @@ std::unique_ptr<base::Value> AsValue(const SkXfermode& xfermode) { |
return std::move(val); |
} |
-WARN_UNUSED_RESULT |
std::unique_ptr<base::Value> AsValue(const SkColorFilter& filter) { |
std::unique_ptr<base::DictionaryValue> val(new base::DictionaryValue()); |
@@ -196,7 +185,6 @@ std::unique_ptr<base::Value> AsValue(const SkColorFilter& filter) { |
return std::move(val); |
} |
-WARN_UNUSED_RESULT |
std::unique_ptr<base::Value> AsValue(const SkImageFilter& filter) { |
std::unique_ptr<base::DictionaryValue> val(new base::DictionaryValue()); |
val->SetInteger("inputs", filter.countInputs()); |
@@ -210,7 +198,6 @@ std::unique_ptr<base::Value> AsValue(const SkImageFilter& filter) { |
return std::move(val); |
} |
-WARN_UNUSED_RESULT |
std::unique_ptr<base::Value> AsValue(const SkPaint& paint) { |
std::unique_ptr<base::DictionaryValue> val(new base::DictionaryValue()); |
SkPaint default_paint; |
@@ -275,7 +262,6 @@ std::unique_ptr<base::Value> AsValue(const SkPaint& paint) { |
return std::move(val); |
} |
-WARN_UNUSED_RESULT |
std::unique_ptr<base::Value> SaveLayerFlagsAsValue( |
SkCanvas::SaveLayerFlags flags) { |
FlagsBuilder builder('|'); |
@@ -289,7 +275,6 @@ std::unique_ptr<base::Value> SaveLayerFlagsAsValue( |
return std::move(val); |
} |
-WARN_UNUSED_RESULT |
std::unique_ptr<base::Value> AsValue(SkRegion::Op op) { |
static const char* gOpStrings[] = { "Difference", |
"Intersect", |
@@ -303,7 +288,6 @@ std::unique_ptr<base::Value> AsValue(SkRegion::Op op) { |
return std::move(val); |
} |
-WARN_UNUSED_RESULT |
std::unique_ptr<base::Value> AsValue(const SkRegion& region) { |
std::unique_ptr<base::DictionaryValue> val(new base::DictionaryValue()); |
val->Set("bounds", AsValue(SkRect::Make(region.getBounds()))); |
@@ -311,7 +295,6 @@ std::unique_ptr<base::Value> AsValue(const SkRegion& region) { |
return std::move(val); |
} |
-WARN_UNUSED_RESULT |
std::unique_ptr<base::Value> AsValue(const SkBitmap& bitmap) { |
std::unique_ptr<base::DictionaryValue> val(new base::DictionaryValue()); |
val->Set("size", AsValue(SkSize::Make(bitmap.width(), bitmap.height()))); |
@@ -319,7 +302,6 @@ std::unique_ptr<base::Value> AsValue(const SkBitmap& bitmap) { |
return std::move(val); |
} |
-WARN_UNUSED_RESULT |
std::unique_ptr<base::Value> AsValue(const SkImage& image) { |
std::unique_ptr<base::DictionaryValue> val(new base::DictionaryValue()); |
val->Set("size", AsValue(SkSize::Make(image.width(), image.height()))); |
@@ -327,7 +309,6 @@ std::unique_ptr<base::Value> AsValue(const SkImage& image) { |
return std::move(val); |
} |
-WARN_UNUSED_RESULT |
std::unique_ptr<base::Value> AsValue(const SkTextBlob& blob) { |
std::unique_ptr<base::DictionaryValue> val(new base::DictionaryValue()); |
val->Set("bounds", AsValue(blob.bounds())); |
@@ -335,7 +316,6 @@ std::unique_ptr<base::Value> AsValue(const SkTextBlob& blob) { |
return std::move(val); |
} |
-WARN_UNUSED_RESULT |
std::unique_ptr<base::Value> AsValue(const SkPath& path) { |
std::unique_ptr<base::DictionaryValue> val(new base::DictionaryValue()); |
@@ -395,8 +375,7 @@ std::unique_ptr<base::Value> AsValue(const SkPath& path) { |
} |
template <typename T> |
-WARN_UNUSED_RESULT std::unique_ptr<base::Value> AsListValue(const T array[], |
- size_t count) { |
+std::unique_ptr<base::Value> AsListValue(const T array[], size_t count) { |
std::unique_ptr<base::ListValue> val(new base::ListValue()); |
for (size_t i = 0; i < count; ++i) |
@@ -485,7 +464,7 @@ public: |
base::TimeDelta ticks = base::TimeTicks::Now() - start_ticks_; |
op_record_->SetDouble("cmd_time", ticks.InMillisecondsF()); |
- canvas_->op_records_.Append(op_record_); |
+ canvas_->op_records_.Append(std::move(op_record_)); |
} |
void addParam(const char name[], std::unique_ptr<base::Value> value) { |
@@ -499,7 +478,7 @@ public: |
private: |
BenchmarkingCanvas* canvas_; |
- base::DictionaryValue* op_record_; |
+ std::unique_ptr<base::DictionaryValue> op_record_; |
base::ListValue* op_params_; |
base::TimeTicks start_ticks_; |