diff options
| author |  caryclark@google.com <caryclark@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-09-20 15:45:41 +0000 |
|---|---|---|
| committer | caryclark@google.com <caryclark@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-09-20 15:45:41 +0000 |
| commit | 867cbd8bc29371a360194aed648c4d43307b0639 (patch) | |
| tree | a8304af47996be63595ff3659546f82772230d6b /include/views | |
| parent | db545aec7267b10f1cb925204862f7e16753b724 (diff) | |
first cut at making iOS work
Replace __arm__ with SK_CPU_ARM
add support for iOS simulator and device
fix const warning in iOSSampleApp
update gyp files
https://code.google.com/p/skia/issues/detail?id=900
tracks fixing missing arm assembly
Review URL: https://codereview.appspot.com/6552045
git-svn-id: http://skia.googlecode.com/svn/trunk@5606 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/views')
| -rwxr-xr-x | include/views/SkOSWindow_iOS.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/views/SkOSWindow_iOS.h b/include/views/SkOSWindow_iOS.h index a1c4956be9..eda7c5f137 100755 --- a/include/views/SkOSWindow_iOS.h +++ b/include/views/SkOSWindow_iOS.h @@ -35,7 +35,7 @@ protected: virtual void onHandleInval(const SkIRect&); // overrides from SkView virtual void onAddMenu(const SkOSMenu*); - virtual void onUpdateMenu(const SkOSMenu*); + virtual void onUpdateMenu(SkOSMenu*); virtual void onSetTitle(const char[]); private: |