Fix up all the easy virtual ... SK_OVERRIDE cases.
This fixes every case where virtual and SK_OVERRIDE were on the same line,
which should be the bulk of cases. We'll have to manually clean up the rest
over time unless I level up in regexes.
for f in (find . -type f); perl -p -i -e 's/virtual (.*)SK_OVERRIDE/\1SK_OVERRIDE/g' $f; end
BUG=skia:
Review URL: https://codereview.chromium.org/806653007
diff --git a/tests/PictureTest.cpp b/tests/PictureTest.cpp
index c2e1bb1..d69de45 100644
--- a/tests/PictureTest.cpp
+++ b/tests/PictureTest.cpp
@@ -1165,12 +1165,12 @@
return this->INHERITED::willSaveLayer(bounds, paint, flags);
}
- virtual void willSave() SK_OVERRIDE {
+ void willSave() SK_OVERRIDE {
++fSaveCount;
this->INHERITED::willSave();
}
- virtual void willRestore() SK_OVERRIDE {
+ void willRestore() SK_OVERRIDE {
++fRestoreCount;
this->INHERITED::willRestore();
}
@@ -1637,7 +1637,7 @@
this->INHERITED::onClipPath(path, op, edgeStyle);
}
- virtual void onClipRegion(const SkRegion& deviceRgn, SkRegion::Op op) SK_OVERRIDE {
+ void onClipRegion(const SkRegion& deviceRgn, SkRegion::Op op) SK_OVERRIDE {
fClipCount += 1;
this->INHERITED::onClipRegion(deviceRgn, op);
}
@@ -1866,11 +1866,11 @@
CountingBBH() : searchCalls(0) {}
- virtual void search(const SkRect& query, SkTDArray<unsigned>* results) const SK_OVERRIDE {
+ void search(const SkRect& query, SkTDArray<unsigned>* results) const SK_OVERRIDE {
this->searchCalls++;
}
- virtual void insert(SkAutoTMalloc<SkRect>*, int) SK_OVERRIDE {}
+ void insert(SkAutoTMalloc<SkRect>*, int) SK_OVERRIDE {}
virtual size_t bytesUsed() const { return 0; }
};