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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/output/filter_operations_unittest.cc

Issue 638353002: [C++11 Allowed Features] Declares a type-safe null pointer converting from NULL to nullptr in src/… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Formating. Created 6 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/output/filter_operations.cc ('k') | cc/output/gl_renderer.cc » ('j') | cc/output/software_output_device.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/output/filter_operations_unittest.cc
diff --git a/cc/output/filter_operations_unittest.cc b/cc/output/filter_operations_unittest.cc
index e97379cbd2a6c38b53cb97bb7802997ffd700833..c6a679ab88bea6acc67c034c7f7aedc9ed17e4fa 100644
--- a/cc/output/filter_operations_unittest.cc
+++ b/cc/output/filter_operations_unittest.cc
@@ -160,11 +160,11 @@ TEST(FilterOperationsTest, BlendGrayscaleFilters) {
TEST(FilterOperationsTest, BlendGrayscaleWithNull) {
FilterOperation filter = FilterOperation::CreateGrayscaleFilter(1.f);
- FilterOperation blended = FilterOperation::Blend(&filter, NULL, 0.25);
+ FilterOperation blended = FilterOperation::Blend(&filter, nullptr, 0.25);
FilterOperation expected = FilterOperation::CreateGrayscaleFilter(0.75f);
EXPECT_EQ(expected, blended);
- blended = FilterOperation::Blend(NULL, &filter, 0.25);
+ blended = FilterOperation::Blend(nullptr, &filter, 0.25);
expected = FilterOperation::CreateGrayscaleFilter(0.25f);
EXPECT_EQ(expected, blended);
}
@@ -189,11 +189,11 @@ TEST(FilterOperationsTest, BlendSepiaFilters) {
TEST(FilterOperationsTest, BlendSepiaWithNull) {
FilterOperation filter = FilterOperation::CreateSepiaFilter(1.f);
- FilterOperation blended = FilterOperation::Blend(&filter, NULL, 0.25);
+ FilterOperation blended = FilterOperation::Blend(&filter, nullptr, 0.25);
FilterOperation expected = FilterOperation::CreateSepiaFilter(0.75f);
EXPECT_EQ(expected, blended);
- blended = FilterOperation::Blend(NULL, &filter, 0.25);
+ blended = FilterOperation::Blend(nullptr, &filter, 0.25);
expected = FilterOperation::CreateSepiaFilter(0.25f);
EXPECT_EQ(expected, blended);
}
@@ -218,11 +218,11 @@ TEST(FilterOperationsTest, BlendSaturateFilters) {
TEST(FilterOperationsTest, BlendSaturateWithNull) {
FilterOperation filter = FilterOperation::CreateSaturateFilter(0.f);
- FilterOperation blended = FilterOperation::Blend(&filter, NULL, 0.25);
+ FilterOperation blended = FilterOperation::Blend(&filter, nullptr, 0.25);
FilterOperation expected = FilterOperation::CreateSaturateFilter(0.25f);
EXPECT_EQ(expected, blended);
- blended = FilterOperation::Blend(NULL, &filter, 0.25);
+ blended = FilterOperation::Blend(nullptr, &filter, 0.25);
expected = FilterOperation::CreateSaturateFilter(0.75f);
EXPECT_EQ(expected, blended);
}
@@ -247,11 +247,11 @@ TEST(FilterOperationsTest, BlendHueRotateFilters) {
TEST(FilterOperationsTest, BlendHueRotateWithNull) {
FilterOperation filter = FilterOperation::CreateHueRotateFilter(1.f);
- FilterOperation blended = FilterOperation::Blend(&filter, NULL, 0.25);
+ FilterOperation blended = FilterOperation::Blend(&filter, nullptr, 0.25);
FilterOperation expected = FilterOperation::CreateHueRotateFilter(0.75f);
EXPECT_EQ(expected, blended);
- blended = FilterOperation::Blend(NULL, &filter, 0.25);
+ blended = FilterOperation::Blend(nullptr, &filter, 0.25);
expected = FilterOperation::CreateHueRotateFilter(0.25f);
EXPECT_EQ(expected, blended);
}
@@ -276,11 +276,11 @@ TEST(FilterOperationsTest, BlendInvertFilters) {
TEST(FilterOperationsTest, BlendInvertWithNull) {
FilterOperation filter = FilterOperation::CreateInvertFilter(1.f);
- FilterOperation blended = FilterOperation::Blend(&filter, NULL, 0.25);
+ FilterOperation blended = FilterOperation::Blend(&filter, nullptr, 0.25);
FilterOperation expected = FilterOperation::CreateInvertFilter(0.75f);
EXPECT_EQ(expected, blended);
- blended = FilterOperation::Blend(NULL, &filter, 0.25);
+ blended = FilterOperation::Blend(nullptr, &filter, 0.25);
expected = FilterOperation::CreateInvertFilter(0.25f);
EXPECT_EQ(expected, blended);
}
@@ -305,11 +305,11 @@ TEST(FilterOperationsTest, BlendBrightnessFilters) {
TEST(FilterOperationsTest, BlendBrightnessWithNull) {
FilterOperation filter = FilterOperation::CreateBrightnessFilter(0.f);
- FilterOperation blended = FilterOperation::Blend(&filter, NULL, 0.25);
+ FilterOperation blended = FilterOperation::Blend(&filter, nullptr, 0.25);
FilterOperation expected = FilterOperation::CreateBrightnessFilter(0.25f);
EXPECT_EQ(expected, blended);
- blended = FilterOperation::Blend(NULL, &filter, 0.25);
+ blended = FilterOperation::Blend(nullptr, &filter, 0.25);
expected = FilterOperation::CreateBrightnessFilter(0.75f);
EXPECT_EQ(expected, blended);
}
@@ -334,11 +334,11 @@ TEST(FilterOperationsTest, BlendContrastFilters) {
TEST(FilterOperationsTest, BlendContrastWithNull) {
FilterOperation filter = FilterOperation::CreateContrastFilter(0.f);
- FilterOperation blended = FilterOperation::Blend(&filter, NULL, 0.25);
+ FilterOperation blended = FilterOperation::Blend(&filter, nullptr, 0.25);
FilterOperation expected = FilterOperation::CreateContrastFilter(0.25f);
EXPECT_EQ(expected, blended);
- blended = FilterOperation::Blend(NULL, &filter, 0.25);
+ blended = FilterOperation::Blend(nullptr, &filter, 0.25);
expected = FilterOperation::CreateContrastFilter(0.75f);
EXPECT_EQ(expected, blended);
}
@@ -363,11 +363,11 @@ TEST(FilterOperationsTest, BlendOpacityFilters) {
TEST(FilterOperationsTest, BlendOpacityWithNull) {
FilterOperation filter = FilterOperation::CreateOpacityFilter(0.f);
- FilterOperation blended = FilterOperation::Blend(&filter, NULL, 0.25);
+ FilterOperation blended = FilterOperation::Blend(&filter, nullptr, 0.25);
FilterOperation expected = FilterOperation::CreateOpacityFilter(0.25f);
EXPECT_EQ(expected, blended);
- blended = FilterOperation::Blend(NULL, &filter, 0.25);
+ blended = FilterOperation::Blend(nullptr, &filter, 0.25);
expected = FilterOperation::CreateOpacityFilter(0.75f);
EXPECT_EQ(expected, blended);
}
@@ -392,11 +392,11 @@ TEST(FilterOperationsTest, BlendBlurFilters) {
TEST(FilterOperationsTest, BlendBlurWithNull) {
FilterOperation filter = FilterOperation::CreateBlurFilter(1.f);
- FilterOperation blended = FilterOperation::Blend(&filter, NULL, 0.25);
+ FilterOperation blended = FilterOperation::Blend(&filter, nullptr, 0.25);
FilterOperation expected = FilterOperation::CreateBlurFilter(0.75f);
EXPECT_EQ(expected, blended);
- blended = FilterOperation::Blend(NULL, &filter, 0.25);
+ blended = FilterOperation::Blend(nullptr, &filter, 0.25);
expected = FilterOperation::CreateBlurFilter(0.25f);
EXPECT_EQ(expected, blended);
}
@@ -432,12 +432,12 @@ TEST(FilterOperationsTest, BlendDropShadowWithNull) {
FilterOperation filter = FilterOperation::CreateDropShadowFilter(
gfx::Point(4, 4), 4.f, SkColorSetARGB(255, 40, 0, 0));
- FilterOperation blended = FilterOperation::Blend(&filter, NULL, 0.25);
+ FilterOperation blended = FilterOperation::Blend(&filter, nullptr, 0.25);
FilterOperation expected = FilterOperation::CreateDropShadowFilter(
gfx::Point(3, 3), 3.f, SkColorSetARGB(191, 40, 0, 0));
EXPECT_EQ(expected, blended);
- blended = FilterOperation::Blend(NULL, &filter, 0.25);
+ blended = FilterOperation::Blend(nullptr, &filter, 0.25);
expected = FilterOperation::CreateDropShadowFilter(
gfx::Point(1, 1), 1.f, SkColorSetARGB(64, 40, 0, 0));
EXPECT_EQ(expected, blended);
@@ -463,11 +463,11 @@ TEST(FilterOperationsTest, BlendZoomFilters) {
TEST(FilterOperationsTest, BlendZoomWithNull) {
FilterOperation filter = FilterOperation::CreateZoomFilter(2.f, 1);
- FilterOperation blended = FilterOperation::Blend(&filter, NULL, 0.25);
+ FilterOperation blended = FilterOperation::Blend(&filter, nullptr, 0.25);
FilterOperation expected = FilterOperation::CreateZoomFilter(1.75f, 1);
EXPECT_EQ(expected, blended);
- blended = FilterOperation::Blend(NULL, &filter, 0.25);
+ blended = FilterOperation::Blend(nullptr, &filter, 0.25);
expected = FilterOperation::CreateZoomFilter(1.25f, 0);
EXPECT_EQ(expected, blended);
}
@@ -494,12 +494,12 @@ TEST(FilterOperationsTest, BlendSaturatingBrightnessWithNull) {
FilterOperation filter =
FilterOperation::CreateSaturatingBrightnessFilter(1.f);
- FilterOperation blended = FilterOperation::Blend(&filter, NULL, 0.25);
+ FilterOperation blended = FilterOperation::Blend(&filter, nullptr, 0.25);
FilterOperation expected =
FilterOperation::CreateSaturatingBrightnessFilter(0.75f);
EXPECT_EQ(expected, blended);
- blended = FilterOperation::Blend(NULL, &filter, 0.25);
+ blended = FilterOperation::Blend(nullptr, &filter, 0.25);
expected = FilterOperation::CreateSaturatingBrightnessFilter(0.25f);
EXPECT_EQ(expected, blended);
}
@@ -532,14 +532,14 @@ TEST(FilterOperationsTest, BlendReferenceWithNull) {
FilterOperation null_filter =
FilterOperation::CreateReferenceFilter(skia::RefPtr<SkImageFilter>());
- FilterOperation blended = FilterOperation::Blend(&filter, NULL, 0.25);
+ FilterOperation blended = FilterOperation::Blend(&filter, nullptr, 0.25);
EXPECT_EQ(filter, blended);
- blended = FilterOperation::Blend(&filter, NULL, 0.75);
+ blended = FilterOperation::Blend(&filter, nullptr, 0.75);
EXPECT_EQ(null_filter, blended);
- blended = FilterOperation::Blend(NULL, &filter, 0.25);
+ blended = FilterOperation::Blend(nullptr, &filter, 0.25);
EXPECT_EQ(null_filter, blended);
- blended = FilterOperation::Blend(NULL, &filter, 0.75);
+ blended = FilterOperation::Blend(nullptr, &filter, 0.75);
EXPECT_EQ(filter, blended);
}
« no previous file with comments | « cc/output/filter_operations.cc ('k') | cc/output/gl_renderer.cc » ('j') | cc/output/software_output_device.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698