AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Unbreak -z. The LocalReporter shim layer was forcing the pathops options back to defaults.

Browse Source 
BUG=
R=caryclark@google.com

Author: mtklein@google.com

Review URL: https://chromiumcodereview.appspot.com/13849013

git-svn-id: http://skia.googlecode.com/svn/trunk@8804 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
commit-bot@chromium.org 2013-04-22 17:35:55 +00:00
parent 0506b9d7d5
commit e1c5429027
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/Test.cpp
View File

@ -60,7 +60,7 @@ const char* Test::getName() {
namespace {
class LocalReporter : public Reporter {
public:
LocalReporter() {}
explicit LocalReporter(const Reporter& reporterToMimic) : fReporter(reporterToMimic) {}
int failure_size() const { return fFailures.count(); }
const char* failure(int i) const { return fFailures[i].c_str(); }
@ -72,7 +72,16 @@ namespace {
}
}
virtual bool allowExtendedTest() const SK_OVERRIDE {
return fReporter.allowExtendedTest();
}
virtual bool allowThreaded() const SK_OVERRIDE {
return fReporter.allowThreaded();
}
private:
const Reporter& fReporter;
SkTArray<SkString> fFailures;
};
} // namespace
@ -84,7 +93,7 @@ void Test::run() {
const SkMSec start = SkTime::GetMSecs();
// Run the test into a LocalReporter so we know if it's passed or failed without interference
// from other tests that might share fReporter.
LocalReporter local;
LocalReporter local(*fReporter);
this->onRun(&local);
fPassed = local.failure_size() == 0;
fElapsed = SkTime::GetMSecs() - start;

4
tests/skia_test.cpp
View File

@ -73,11 +73,11 @@ public:
fTotal = total;
}
virtual bool allowExtendedTest() const {
virtual bool allowExtendedTest() const SK_OVERRIDE {
return fAllowExtendedTest;
}
virtual bool allowThreaded() const {
virtual bool allowThreaded() const SK_OVERRIDE {
return fAllowThreaded;
}