From b8791ecb05226bf13a6d9ad2f23f48d9e3b12399 Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Wed, 9 Apr 2014 20:45:29 +0000 Subject: 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 --- views/SkWindow.cpp | 2 +- views/mac/SkNSView.mm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'views') 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); } } -- cgit v1.2.3