summaryrefslogtreecommitdiff
path: root/views
diff options
context:
space:
mode:
authorcommit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-04-09 20:45:29 +0000
committercommit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-04-09 20:45:29 +0000
commitb8791ecb05226bf13a6d9ad2f23f48d9e3b12399 (patch)
tree156ad97bfb10162bba6bd803b0a89297f5bb02d8 /views
parenta796cfcc73cfebcc627249f86efd520a7ab35604 (diff)
downloadsrc-b8791ecb05226bf13a6d9ad2f23f48d9e3b12399.tar.gz
Rename kPMColor_SkColorType to kN32_SkColorType.
The new name better represents what this flag means. BUG=skia:2384 R=reed@google.com Author: scroggo@google.com Review URL: https://codereview.chromium.org/227433009 git-svn-id: http://skia.googlecode.com/svn/trunk/src@14117 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'views')
-rw-r--r--views/SkWindow.cpp2
-rw-r--r--views/mac/SkNSView.mm2
2 files changed, 2 insertions, 2 deletions
diff --git a/views/SkWindow.cpp b/views/SkWindow.cpp
index cca291a4..8f6b96f0 100644
--- a/views/SkWindow.cpp
+++ b/views/SkWindow.cpp
@@ -53,7 +53,7 @@ SkWindow::SkWindow() : fFocusView(NULL) {
#ifdef SK_BUILD_FOR_WINCE
fColorType = kRGB_565_SkColorType;
#else
- fColorType = kPMColor_SkColorType;
+ fColorType = kN32_SkColorType;
#endif
fMatrix.reset();
diff --git a/views/mac/SkNSView.mm b/views/mac/SkNSView.mm
index 1014ffe0..80bfd670 100644
--- a/views/mac/SkNSView.mm
+++ b/views/mac/SkNSView.mm
@@ -57,7 +57,7 @@ SK_COMPILE_ASSERT(SK_SUPPORT_GPU, not_implemented_for_non_gpu_build);
size = [self convertSizeToBacking:self.frame.size];
#endif
fWind->resize((int) size.width, (int) size.height,
- kPMColor_SkColorType);
+ kN32_SkColorType);
}
}