Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / skia / src / gpu / GrTextureAccess.cpp

diff --git a/src/third_party/skia/src/gpu/GrTextureAccess.cpp b/src/third_party/skia/src/gpu/GrTextureAccess.cpp
index 662ccd6..7e1eda6 100644 (file)
--- a/src/third_party/skia/src/gpu/GrTextureAccess.cpp
+++ b/src/third_party/skia/src/gpu/GrTextureAccess.cpp
@@ -46,7 +46,7 @@ void GrTextureAccess::reset(GrTexture* texture,
     SkASSERT(strlen(swizzle) >= 1 && strlen(swizzle) <= 4);
 
     fParams = params;
-    fTexture.set(SkRef(texture), GrIORef::kRead_IOType);
+    fTexture.set(SkRef(texture), kRead_GrIOType);
     this->setSwizzle(swizzle);
 }
 
@@ -58,14 +58,14 @@ void GrTextureAccess::reset(GrTexture* texture,
     SkASSERT(strlen(swizzle) >= 1 && strlen(swizzle) <= 4);
 
     fParams.reset(tileXAndY, filterMode);
-    fTexture.set(SkRef(texture), GrIORef::kRead_IOType);
+    fTexture.set(SkRef(texture), kRead_GrIOType);
     this->setSwizzle(swizzle);
 }
 
 void GrTextureAccess::reset(GrTexture* texture,
                             const GrTextureParams& params) {
     SkASSERT(texture);
-    fTexture.set(SkRef(texture), GrIORef::kRead_IOType);
+    fTexture.set(SkRef(texture), kRead_GrIOType);
     fParams = params;
     memcpy(fSwizzle, "rgba", 5);
     fSwizzleMask = kRGBA_GrColorComponentFlags;
@@ -75,7 +75,7 @@ void GrTextureAccess::reset(GrTexture* texture,
                             GrTextureParams::FilterMode filterMode,
                             SkShader::TileMode tileXAndY) {
     SkASSERT(texture);
-    fTexture.set(SkRef(texture), GrIORef::kRead_IOType);
+    fTexture.set(SkRef(texture), kRead_GrIOType);
     fParams.reset(tileXAndY, filterMode);
     memcpy(fSwizzle, "rgba", 5);
     fSwizzleMask = kRGBA_GrColorComponentFlags;