Revert "Revert "Merge remote-tracking branch 'goog/master-skia' into goog/master""
When I broke android yesterday we reverted this merge to fix the breakage.
Undoing that revert so we can pull in the fix from Skia.
diff --git a/samplecode/OverView.cpp b/samplecode/OverView.cpp
index bdb8ddd..d763345 100644
--- a/samplecode/OverView.cpp
+++ b/samplecode/OverView.cpp
@@ -60,7 +60,7 @@
SkUnichar uni;
if (SampleCode::CharQ(*evt, &uni)) {
fMatchStr.appendUnichar(uni);
- this->inval(NULL);
+ this->inval(nullptr);
return true;
}
return this->INHERITED::onQuery(evt);
@@ -86,7 +86,7 @@
this->next(&loc);
}
}
- return NULL;
+ return nullptr;
}
private:
@@ -119,7 +119,7 @@
};
SkView* create_overview(int count, const SkViewFactory* factories[]) {
- return SkNEW_ARGS(OverView, (count, factories));
+ return new OverView(count, factories);
}
bool is_overview(SkView* view) {
