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
diff --git a/src/utils/ios/SkImageDecoder_iOS.mm b/src/utils/ios/SkImageDecoder_iOS.mm
index f347e06..5e4261f 100755
--- a/src/utils/ios/SkImageDecoder_iOS.mm
+++ b/src/utils/ios/SkImageDecoder_iOS.mm
@@ -29,7 +29,8 @@
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;
}