[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
hyatt at apple.com
hyatt at apple.com
Wed Dec 22 12:11:01 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit fc6a2a34d329c5b876a43f367495c9df0ce7cac2
Author: hyatt at apple.com <hyatt at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Aug 16 21:34:22 2010 +0000
Fix GTK build bustage.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65454 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/platform/graphics/cairo/ImageCairo.cpp b/WebCore/platform/graphics/cairo/ImageCairo.cpp
index 64fbedf..a8a86b9 100644
--- a/WebCore/platform/graphics/cairo/ImageCairo.cpp
+++ b/WebCore/platform/graphics/cairo/ImageCairo.cpp
@@ -194,7 +194,8 @@ void Image::drawPattern(GraphicsContext* context, const FloatRect& tileRect, con
cairo_t* clippedImageContext = imageSurface->context()->platformContext();
cairo_set_source_surface(clippedImageContext, image, -tileRect.x(), -tileRect.y());
cairo_paint(clippedImageContext);
- image = imageSurface->image()->nativeImageForCurrentFrame();
+ RefPtr<Image> copiedImage = imageSurface->copyImage(); // FIXME: Copying here is wasteful.
+ image = copiedImage->nativeImageForCurrentFrame();
}
cairo_pattern_t* pattern = cairo_pattern_create_for_surface(image);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list