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

Unified Diff: samplecode/SampleApp.cpp

Issue 389653004: share dm and command flags (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: sync up with latest dm Created 6 years, 5 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 | « include/views/SkApplication.h ('k') | tests/skia_test.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: samplecode/SampleApp.cpp
diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp
index 3f37d358ab0825c62450b387b9802dbc579c0b94..27365e0b879307aa50cc70d660ea2126caf4992b 100644
--- a/samplecode/SampleApp.cpp
+++ b/samplecode/SampleApp.cpp
@@ -2386,14 +2386,12 @@ void get_preferred_size(int* x, int* y, int* width, int* height) {
}
#ifdef SK_BUILD_FOR_IOS
-bool set_cmd_line_args(int , char *[], const char* resourceDir) {
+IOS_launch_type set_cmd_line_args(int , char *[], const char* resourceDir) {
SetResourcePath(resourceDir);
- return false;
+ return kApplication__iOSLaunchType;
}
#endif
-// FIXME: this should be in a header
-void application_init();
void application_init() {
// setenv("ANDROID_ROOT", "../../../data", 0);
#ifdef SK_BUILD_FOR_MAC
@@ -2403,8 +2401,6 @@ void application_init() {
SkEvent::Init();
}
-// FIXME: this should be in a header
-void application_term();
void application_term() {
SkEvent::Term();
SkGraphics::Term();
« no previous file with comments | « include/views/SkApplication.h ('k') | tests/skia_test.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698