Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(83)

Unified Diff: experimental/iOSSampleApp/SkSampleUIView.mm

Issue 170743002: fix iOS build -- pass colortype, not config (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « experimental/iOSSampleApp/Shared/SkUIView.mm ('k') | include/views/SkWindow.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: experimental/iOSSampleApp/SkSampleUIView.mm
diff --git a/experimental/iOSSampleApp/SkSampleUIView.mm b/experimental/iOSSampleApp/SkSampleUIView.mm
index a6d00f7b0ef8debcf1335c9bf4662bfb919c923d..7b90cb778da80f58220b49201f651d8438f7e9b9 100644
--- a/experimental/iOSSampleApp/SkSampleUIView.mm
+++ b/experimental/iOSSampleApp/SkSampleUIView.mm
@@ -1,7 +1,5 @@
#import "SkSampleUIView.h"
-//#define SKWIND_CONFIG SkBitmap::kRGB_565_Config
-#define SKWIND_CONFIG SkBitmap::kARGB_8888_Config
#define SKGL_CONFIG kEAGLColorFormatRGB565
//#define SKGL_CONFIG kEAGLColorFormatRGBA8
@@ -338,7 +336,8 @@ static FPSState gFPS;
static char* kDummyArgv = const_cast<char*>("dummyExecutableName");
fWind = new SampleWindow(self, 1, &kDummyArgv, fDevManager);
- fWind->resize(self.frame.size.width, self.frame.size.height, SKWIND_CONFIG);
+ fWind->resize(self.frame.size.width, self.frame.size.height,
+ kPMColor_SkColorType);
}
return self;
}
« no previous file with comments | « experimental/iOSSampleApp/Shared/SkUIView.mm ('k') | include/views/SkWindow.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698