Disable TIZEN_USE_XPIXMAP_DECODED_IMAGESOURCE

[Title] Disable TIZEN_USE_XPIXMAP_DECODED_IMAGESOURCE
[Issue#] N/A
[Problem] N/A
[Cause] N/A
[Solution] N/A

Change-Id: I93864f9ee726db133771fff08ff2edb4801deb8f

diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
index 1ec61a5..ec030ed 100644 (file)
--- a/Source/WTF/wtf/Platform.h
+++ b/Source/WTF/wtf/Platform.h
@@ -722,7 +722,7 @@ com) : Patch to do not adjust cover rect as fixed pixel size*/
 #endif
 #endif
 #if ENABLE(TIZEN_CANVAS_CAIRO_GLES_RENDERING)
-#define ENABLE_TIZEN_USE_XPIXMAP_DECODED_IMAGESOURCE 1 /* Byeongha Cho(byeongha.cho@samsung.com) : Use pixmap surface to decode image and share the buffer between CPU and GPU */
+#define ENABLE_TIZEN_USE_XPIXMAP_DECODED_IMAGESOURCE 0 /* Byeongha Cho(byeongha.cho@samsung.com) : Use pixmap surface to decode image and share the buffer between CPU and GPU */
 #if !ENABLE(TIZEN_USE_XPIXMAP_DECODED_IMAGESOURCE)
 #define ENABLE_TIZEN_CAIROGLES_IMAGE_CACHE 1
 #endif

diff --git a/Source/WebCore/platform/graphics/cairo/BitmapImageCairo.cpp b/Source/WebCore/platform/graphics/cairo/BitmapImageCairo.cpp
index fba6e9c..761c9ea 100644 (file)
--- a/Source/WebCore/platform/graphics/cairo/BitmapImageCairo.cpp
+++ b/Source/WebCore/platform/graphics/cairo/BitmapImageCairo.cpp
@@ -225,16 +225,20 @@ void BitmapImage::draw(GraphicsContext* context, const FloatRect& dst, const Flo
         if ((cairo_get_antialias(cr) != CAIRO_ANTIALIAS_NONE) && (context->getCTM().isIdentityOrTranslationOrFlipped() || context->getCTM().has90MultipleRotation())) {
             cairo_antialias_t savedAntialiasRule = cairo_get_antialias(cr);
             cairo_set_antialias(cr, CAIRO_ANTIALIAS_NONE);
+#if ENABLE(TIZEN_USE_XPIXMAP_DECODED_IMAGESOURCE)
             if (nativeImage->surfaceType() == NativeImageCairo::NATIVE_GL_SURFACE)
                 context->platformContext()->drawSurfaceToContext(nativeImage->glsurface(), dstRect, srcRect, context);
             else
-                context->platformContext()->drawSurfaceToContext(nativeImage->surface(), dstRect, srcRect, context);
+#endif
+            context->platformContext()->drawSurfaceToContext(nativeImage->surface(), dstRect, srcRect, context);
             cairo_set_antialias(cr, savedAntialiasRule);
         } else {
+#if ENABLE(TIZEN_USE_XPIXMAP_DECODED_IMAGESOURCE)
             if (nativeImage->surfaceType() == NativeImageCairo::NATIVE_GL_SURFACE)
                 context->platformContext()->drawSurfaceToContext(nativeImage->glsurface(), dstRect, srcRect, context);
             else
-                context->platformContext()->drawSurfaceToContext(nativeImage->surface(), dstRect, srcRect, context);
+#endif
+            context->platformContext()->drawSurfaceToContext(nativeImage->surface(), dstRect, srcRect, context);
         }
     } else {
 #if ENABLE(TIZEN_USE_XPIXMAP_DECODED_IMAGESOURCE)