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

Side by Side Diff: experimental/SimpleiOSApp/SimpleApp.mm

Issue 1329853005: Make SkGraphics::Term a no-op, stop calling it. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 3 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 unified diff | Download patch
OLDNEW
1 #include "SkApplication.h" 1 #include "SkApplication.h"
2 #import "SkCanvas.h" 2 #import "SkCanvas.h"
3 #import "SkPaint.h" 3 #import "SkPaint.h"
4 #import "SkWindow.h" 4 #import "SkWindow.h"
5 #include "SkGraphics.h" 5 #include "SkGraphics.h"
6 #include "SkCGUtils.h" 6 #include "SkCGUtils.h"
7 7
8 void dummy_main(int , char *[]) { 8 void dummy_main(int , char *[]) {
9 } 9 }
10 10
11 class SkSampleView : public SkView { 11 class SkSampleView : public SkView {
12 public: 12 public:
13 SkSampleView() { 13 SkSampleView() {
14 this->setVisibleP(true); 14 this->setVisibleP(true);
15 this->setClipToBounds(false); 15 this->setClipToBounds(false);
16 }; 16 };
17 protected: 17 protected:
18 virtual void onDraw(SkCanvas* canvas) { 18 virtual void onDraw(SkCanvas* canvas) {
19 canvas->drawColor(0xFFFFFFFF); 19 canvas->drawColor(0xFFFFFFFF);
20 SkPaint p; 20 SkPaint p;
21 p.setTextSize(20); 21 p.setTextSize(20);
22 p.setAntiAlias(true); 22 p.setAntiAlias(true);
23 canvas->drawText("finished", 13, 50, 30, p); 23 canvas->drawText("finished", 13, 50, 30, p);
24 SkRect r = {50, 50, 80, 80}; 24 SkRect r = {50, 50, 80, 80};
25 p.setColor(0xAA11EEAA); 25 p.setColor(0xAA11EEAA);
26 canvas->drawRect(r, p); 26 canvas->drawRect(r, p);
27 } 27 }
28 private: 28 private:
29 typedef SkView INHERITED; 29 typedef SkView INHERITED;
30 }; 30 };
31 31
32 void application_init() { 32 void application_init() {
33 SkGraphics::Init(); 33 SkGraphics::Init();
34 SkEvent::Init(); 34 SkEvent::Init();
35 } 35 }
36 36
37 void application_term() { 37 void application_term() {
38 SkGraphics::Term();
39 SkEvent::Term(); 38 SkEvent::Term();
40 } 39 }
41 40
42 int saved_argc; 41 int saved_argc;
43 char** saved_argv; 42 char** saved_argv;
44 43
45 IOS_launch_type set_cmd_line_args(int argc, char *argv[], const char* ) { 44 IOS_launch_type set_cmd_line_args(int argc, char *argv[], const char* ) {
46 saved_argc = argc; 45 saved_argc = argc;
47 saved_argv = argv; 46 saved_argv = argv;
48 return kTool_iOSLaunchType; 47 return kTool_iOSLaunchType;
(...skipping 14 matching lines...) Expand all
63 dummy_main(saved_argc, saved_argv); 62 dummy_main(saved_argc, saved_argv);
64 if (self = [super initWithDefaults]) { 63 if (self = [super initWithDefaults]) {
65 fWind = new SkOSWindow(self); 64 fWind = new SkOSWindow(self);
66 fWind->setLayout(new FillLayout, false); 65 fWind->setLayout(new FillLayout, false);
67 fWind->attachChildToFront(new SkSampleView)->unref(); 66 fWind->attachChildToFront(new SkSampleView)->unref();
68 } 67 }
69 return self; 68 return self;
70 } 69 }
71 70
72 @end 71 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698