diff options
| author |  jvanverth <jvanverth@google.com> | 2014-06-11 13:59:22 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-06-11 13:59:22 -0700 |
| commit | 66c9582d1bed717d72c9d3f789f761cb08e28264 (patch) | |
| tree | 52d1799bb6ae95efb60aa35b69d497452b2c577e /experimental/iOSSampleApp | |
| parent | 72abfc2b4e7caead660f6b6a05e60d05eaf1a66f (diff) | |
Fix a number of issues with iOS build.
Set pointer to root view in window (for SampleApp)
Set up the correct function pointer for GL multisampling
Remove use of SkBitmap::setConfig()
Remove incomplete iOS implementation of SkFILE (use SkOSFile for now)
R=caryclark@google.com, reed@google.com, bsalomon@google.com, tfarina@chromium.org
Author: jvanverth@google.com
Review URL: https://codereview.chromium.org/322403007
Diffstat (limited to 'experimental/iOSSampleApp')
| -rw-r--r-- | experimental/iOSSampleApp/iPad/AppDelegate_iPad.mm | 3 | ||||
| -rw-r--r-- | experimental/iOSSampleApp/iPhone/AppDelegate_iPhone.mm | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/experimental/iOSSampleApp/iPad/AppDelegate_iPad.mm b/experimental/iOSSampleApp/iPad/AppDelegate_iPad.mm index d0aeaf23dd..c33fddea2f 100644 --- a/experimental/iOSSampleApp/iPad/AppDelegate_iPad.mm +++ b/experimental/iOSSampleApp/iPad/AppDelegate_iPad.mm @@ -7,6 +7,9 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { [window addSubview:[splitViewController view]]; [window makeKeyAndVisible]; + + self.window.rootViewController = splitViewController; + return YES; } diff --git a/experimental/iOSSampleApp/iPhone/AppDelegate_iPhone.mm b/experimental/iOSSampleApp/iPhone/AppDelegate_iPhone.mm index 80c5a446b5..1773ccaf7b 100644 --- a/experimental/iOSSampleApp/iPhone/AppDelegate_iPhone.mm +++ b/experimental/iOSSampleApp/iPhone/AppDelegate_iPhone.mm @@ -6,6 +6,9 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { [window addSubview:fRoot.view]; [window makeKeyAndVisible]; + + self.window.rootViewController = fRoot; + return YES; } |