AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix a number of issues with iOS build.

Browse Source 
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
This commit is contained in:
jvanverth 2014-06-11 13:59:22 -07:00 committed by Commit bot
parent 72abfc2b4e
commit 66c9582d1b
5 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
experimental/iOSSampleApp/iPad/AppDelegate_iPad.mm
View File

@ -7,6 +7,9 @@
- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
[window addSubview:[splitViewController view]]; [window addSubview:[splitViewController view]];
[window makeKeyAndVisible]; [window makeKeyAndVisible];
self.window.rootViewController = splitViewController;
return YES; return YES;
} }

3
experimental/iOSSampleApp/iPhone/AppDelegate_iPhone.mm
View File

@ -6,6 +6,9 @@
- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
[window addSubview:fRoot.view]; [window addSubview:fRoot.view];
[window makeKeyAndVisible]; [window makeKeyAndVisible];
self.window.rootViewController = fRoot;
return YES; return YES;
} }

3
gyp/SampleApp.gyp
View File

@ -236,7 +236,8 @@
'../src/views/ios/SkOSWindow_iOS.mm', '../src/views/ios/SkOSWindow_iOS.mm',
'../src/utils/ios/SkImageDecoder_iOS.mm', '../src/utils/ios/SkImageDecoder_iOS.mm',
'../src/utils/ios/SkStream_NSData.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', '../src/utils/mac/SkCreateCGImageRef.cpp',
'../experimental/iOSSampleApp/SkiOSSampleApp-Debug.xcconfig', '../experimental/iOSSampleApp/SkiOSSampleApp-Debug.xcconfig',

2
src/gpu/gl/iOS/GrGLCreateNativeInterface_iOS.cpp
View File

@ -139,7 +139,7 @@ const GrGLInterface* GrGLCreateNativeInterface() {
#endif #endif
#if GL_APPLE_framebuffer_multisample #if GL_APPLE_framebuffer_multisample
functions->fRenderbufferStorageMultisample = glRenderbufferStorageMultisampleAPPLE; functions->fRenderbufferStorageMultisampleES2APPLE = glRenderbufferStorageMultisampleAPPLE;
functions->fResolveMultisampleFramebuffer = glResolveMultisampleFramebufferAPPLE; functions->fResolveMultisampleFramebuffer = glResolveMultisampleFramebufferAPPLE;
#endif #endif

3
src/utils/ios/SkImageDecoder_iOS.mm
View File

@ -29,7 +29,8 @@ bool SkImageDecoder_iOS::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) {
const int width = uimage.size.width; const int width = uimage.size.width;
const int height = uimage.size.height; 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) { if (SkImageDecoder::kDecodeBounds_Mode == mode) {
return true; return true;
} }