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

Unified Diff: debugger/debuggermain.cpp

Issue 822583003: debugger: Move Skia initialization out of the GUI widget class (Closed) Base URL: https://skia.googlesource.com/skia.git@scratch-key-uint-warning-fix
Patch Set: Created 5 years, 12 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 | « debugger/QT/SkDebuggerGUI.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: debugger/debuggermain.cpp
diff --git a/debugger/debuggermain.cpp b/debugger/debuggermain.cpp
index d537d363c9818a8111e91e700fb3b8393541bbbf..0aec02b9b229148fe4c5135ee7a798e3e69d3527 100644
--- a/debugger/debuggermain.cpp
+++ b/debugger/debuggermain.cpp
@@ -7,8 +7,13 @@
*/
#include "SkDebuggerGUI.h"
+#include "SkForceLinking.h"
+#include "SkGraphics.h"
#include <QApplication>
+__SK_FORCE_IMAGE_DECODER_LINKING;
+
+
static void usage(const char * argv0) {
SkDebugf("%s <input> \n", argv0);
SkDebugf(" [--help|-h]: show this help message\n");
@@ -23,6 +28,7 @@ int main(int argc, char *argv[]) {
// constuction. However, the components Qt calls (X11 libs, ..) will override that.
setenv("LC_NUMERIC", "C", 1);
#endif
+ SkGraphics::Init();
QApplication a(argc, argv);
QStringList argList = a.arguments();
@@ -60,5 +66,7 @@ int main(int argc, char *argv[]) {
}
w.show();
- return a.exec();
+ int result = a.exec();
+ SkGraphics::Term();
+ return result;
}
« no previous file with comments | « debugger/QT/SkDebuggerGUI.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698