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

Unified Diff: experimental/SimpleiOSApp/SimpleApp.mm

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 | « dm/DMWriteTask.cpp ('k') | experimental/iOSSampleApp/Shared/skia_ios.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: experimental/SimpleiOSApp/SimpleApp.mm
diff --git a/experimental/SimpleiOSApp/SimpleApp.mm b/experimental/SimpleiOSApp/SimpleApp.mm
index 44b646f54fdbddbf1ac2d29d3766dd3b00cad17c..040472cfe371b61760bacde6b2ce19ff8ca5f0cf 100644
--- a/experimental/SimpleiOSApp/SimpleApp.mm
+++ b/experimental/SimpleiOSApp/SimpleApp.mm
@@ -1,11 +1,12 @@
+#include "SkApplication.h"
#import "SkCanvas.h"
#import "SkPaint.h"
#import "SkWindow.h"
#include "SkGraphics.h"
#include "SkCGUtils.h"
-extern void tool_main(int argc, char *argv[]);
-extern bool set_cmd_line_args(int argc, char *argv[], const char* dir);
+void dummy_main(int , char *[]) {
+}
class SkSampleView : public SkView {
public:
@@ -41,10 +42,10 @@ void application_term() {
int saved_argc;
char** saved_argv;
-bool set_cmd_line_args(int argc, char *argv[], const char* ) {
+IOS_launch_type set_cmd_line_args(int argc, char *argv[], const char* ) {
saved_argc = argc;
saved_argv = argv;
- return true;
+ return kTool_iOSLaunchType;
}
class FillLayout : public SkView::Layout {
@@ -59,7 +60,7 @@ protected:
@implementation SimpleApp
- (id)initWithDefaults {
- (void) tool_main(saved_argc, saved_argv);
+ dummy_main(saved_argc, saved_argv);
if (self = [super initWithDefaults]) {
fWind = new SkOSWindow(self);
fWind->setLayout(new FillLayout, false);
« no previous file with comments | « dm/DMWriteTask.cpp ('k') | experimental/iOSSampleApp/Shared/skia_ios.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698