5 files changed, 11 insertions, 3 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;
 }
 
diff --git a/gyp/SampleApp.gyp b/gyp/SampleApp.gyp
index b15fd2d1e9..342e0aa1d4 100644
--- a/gyp/SampleApp.gyp
+++ b/gyp/SampleApp.gyp
@@ -236,7 +236,8 @@
             '../src/views/ios/SkOSWindow_iOS.mm',
             '../src/utils/ios/SkImageDecoder_iOS.mm',
             '../src/utils/ios/SkStream_NSData.mm',
-            '../src/utils/ios/SkOSFile_iOS.mm',
+            # Not fully implemented yet
+            # '../src/utils/ios/SkOSFile_iOS.mm',
 
             '../src/utils/mac/SkCreateCGImageRef.cpp',
             '../experimental/iOSSampleApp/SkiOSSampleApp-Debug.xcconfig',
diff --git a/src/gpu/gl/iOS/GrGLCreateNativeInterface_iOS.cpp b/src/gpu/gl/iOS/GrGLCreateNativeInterface_iOS.cpp
index d853e3663c..0408965694 100644
--- a/src/gpu/gl/iOS/GrGLCreateNativeInterface_iOS.cpp
+++ b/src/gpu/gl/iOS/GrGLCreateNativeInterface_iOS.cpp
@@ -139,7 +139,7 @@ const GrGLInterface* GrGLCreateNativeInterface() {
 #endif
 
 #if GL_APPLE_framebuffer_multisample
-    functions->fRenderbufferStorageMultisample = glRenderbufferStorageMultisampleAPPLE;
+    functions->fRenderbufferStorageMultisampleES2APPLE = glRenderbufferStorageMultisampleAPPLE;
     functions->fResolveMultisampleFramebuffer = glResolveMultisampleFramebufferAPPLE;
 #endif
 
diff --git a/src/utils/ios/SkImageDecoder_iOS.mm b/src/utils/ios/SkImageDecoder_iOS.mm
index f347e060c8..5e4261ff1d 100755
--- a/src/utils/ios/SkImageDecoder_iOS.mm
+++ b/src/utils/ios/SkImageDecoder_iOS.mm
@@ -29,7 +29,8 @@ bool SkImageDecoder_iOS::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) {
     
     const int width = uimage.size.width;
     const int height = uimage.size.height;
-    bm->setConfig(SkBitmap::kARGB_8888_Config, width, height);
+    SkColorType ct = SkBitmapConfigToColorType(SkBitmap::kARGB_8888_Config);
+    bm->setInfo(SkImageInfo::Make(width, height, ct, kPremul_SkAlphaType), 0);
     if (SkImageDecoder::kDecodeBounds_Mode == mode) {
         return true;
     }