4 files changed, 6 insertions, 6 deletions
diff --git a/src/gpu/GrAtlas.cpp b/src/gpu/GrAtlas.cpp
index 48a4f393e4..c1d6d3d693 100644
--- a/src/gpu/GrAtlas.cpp
+++ b/src/gpu/GrAtlas.cpp
@@ -149,7 +149,7 @@ static GrPixelConfig maskformat2pixelconfig(GrMaskFormat format) {
         case kA565_GrMaskFormat:
             return kRGB_565_GrPixelConfig;
         case kA888_GrMaskFormat:
-            return kSkia8888_PM_GrPixelConfig;
+            return kSkia8888_GrPixelConfig;
         default:
             GrAssert(!"unknown maskformat");
     }
diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp
index 18f66b5edf..82c26912a3 100644
--- a/src/gpu/SkGpuDevice.cpp
+++ b/src/gpu/SkGpuDevice.cpp
@@ -144,7 +144,7 @@ static SkBitmap::Config grConfig2skConfig(GrPixelConfig config, bool* isOpaque)
         case kRGBA_4444_GrPixelConfig:
             *isOpaque = false;
             return SkBitmap::kARGB_4444_Config;
-        case kSkia8888_PM_GrPixelConfig:
+        case kSkia8888_GrPixelConfig:
             // we don't currently have a way of knowing whether
             // a 8888 is opaque based on the config.
             *isOpaque = false;
@@ -284,7 +284,7 @@ GrPixelConfig config8888_to_grconfig_and_flags(SkCanvas::Config8888 config8888,
             return kSkia8888_GrPixelConfig;
         case SkCanvas::kNative_Unpremul_Config8888:
             *flags = GrContext::kUnpremul_PixelOpsFlag;
-            return kSkia8888_PM_GrPixelConfig;
+            return kSkia8888_GrPixelConfig;
         case SkCanvas::kBGRA_Premul_Config8888:
             *flags = 0;
             return kBGRA_8888_GrPixelConfig;
@@ -300,7 +300,7 @@ GrPixelConfig config8888_to_grconfig_and_flags(SkCanvas::Config8888 config8888,
         default:
             GrCrash("Unexpected Config8888.");
             *flags = 0; // suppress warning
-            return kSkia8888_PM_GrPixelConfig;
+            return kSkia8888_GrPixelConfig;
     }
 }
 }
diff --git a/src/gpu/SkGr.cpp b/src/gpu/SkGr.cpp
index 2eb3800ac6..b10cf153a1 100644
--- a/src/gpu/SkGr.cpp
+++ b/src/gpu/SkGr.cpp
@@ -215,7 +215,7 @@ GrPixelConfig SkBitmapConfig2GrPixelConfig(SkBitmap::Config config) {
         case SkBitmap::kARGB_4444_Config:
             return kRGBA_4444_GrPixelConfig;
         case SkBitmap::kARGB_8888_Config:
-            return kSkia8888_PM_GrPixelConfig;
+            return kSkia8888_GrPixelConfig;
         default:
             // kNo_Config, kA1_Config missing, and kRLE_Index8_Config
             return kUnknown_GrPixelConfig;
diff --git a/src/gpu/SkGrPixelRef.cpp b/src/gpu/SkGrPixelRef.cpp
index f8160ab9fe..8751c5d8bf 100644
--- a/src/gpu/SkGrPixelRef.cpp
+++ b/src/gpu/SkGrPixelRef.cpp
@@ -174,6 +174,6 @@ bool SkGrPixelRef::onReadPixels(SkBitmap* dst, const SkIRect* subset) {
     SkAutoLockPixels al(*dst);
     void* buffer = dst->getPixels();
     return fSurface->readPixels(left, top, width, height,
-                                kSkia8888_PM_GrPixelConfig,
+                                kSkia8888_GrPixelConfig,
                                 buffer, dst->rowBytes());
 }