Add SkEncodedFormat, used by SkCodec.

src/gpu/GrSurface.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrSurface.h"
 #include "GrSurfacePriv.h"
 
@@ skipping 51 matching lines @@
     bool result = this->readPixels(0, 0, this->width(), this->height(), kSkia8888_GrPixelConfig,
                                    bm.getPixels());
     if (!result) {
         SkDebugf("------ failed to read pixels for %s\n", filename);
         return false;
     }
 
     // remove any previous version of this file
     remove(filename);
 
-    if (!SkImageEncoder::EncodeFile(filename, bm, SkImageEncoder::kPNG_Type, 100)) {
+    if (!SkImageEncoder::EncodeFile(filename, bm, kPNG_SkEncodedFormat, 100)) {
         SkDebugf("------ failed to encode %s\n", filename);
         remove(filename);   // remove any partial file
         return false;
     }
 
     return true;
 }
 
 void GrSurface::flushWrites() {
     if (!this->wasDestroyed()) {
@@ skipping 35 matching lines @@
     const GrTexture* thisTex = this->asTexture();
     if (thisTex && thisTex->internalHasPendingIO()) {
         return true;
     }
     const GrRenderTarget* thisRT = this->asRenderTarget();
     if (thisRT && thisRT->internalHasPendingIO()) {
         return true;
     }
     return false;
 }