aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar tfarina <tfarina@chromium.org>2014-11-07 06:12:30 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2014-11-07 06:12:30 -0800
commita71d3af100baa6756a87f7ef42a0ae5f4cb0991a (patch)
tree376be08371a55e91e71575e6aeed8c0f5142b5c3
parent0ee2627026370bbb25e4efda490e14e468ac86fb (diff)
Cleanup: Use SkAutoGraphics in gm and tests.
BUG=None R=bsalomon@google.com Review URL: https://codereview.chromium.org/704413002
-rw-r--r--gm/gmmain.cpp3
-rw-r--r--tests/skia_test.cpp3
2 files changed, 2 insertions, 4 deletions
diff --git a/gm/gmmain.cpp b/gm/gmmain.cpp
index da0f38f4e3..cd3f03a599 100644
--- a/gm/gmmain.cpp
+++ b/gm/gmmain.cpp
@@ -2257,7 +2257,7 @@ int tool_main(int argc, char** argv) {
}
#endif
- SkGraphics::Init();
+ SkAutoGraphics ag;
setSystemPreferences();
GMMain gmmain;
@@ -2474,7 +2474,6 @@ int tool_main(int argc, char** argv) {
delete grFactory;
#endif
- SkGraphics::Term();
return (reportError) ? -1 : 0;
}
diff --git a/tests/skia_test.cpp b/tests/skia_test.cpp
index 3d76c3a095..1b5584b6a6 100644
--- a/tests/skia_test.cpp
+++ b/tests/skia_test.cpp
@@ -127,7 +127,7 @@ int test_main() {
}
#endif
- SkGraphics::Init();
+ SkAutoGraphics ag;
{
SkString header("Skia UnitTests:");
@@ -213,7 +213,6 @@ int test_main() {
SkDebugf("\nFinished %d tests, %d failures, %d skipped. (%d internal tests)",
toRun, failCount, skipCount, reporter.countTests());
}
- SkGraphics::Term();
SkDebugf("\n");
return (failCount == 0) ? 0 : 1;