[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 14:27:04 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 5d6be9a7e26103e501619ffbf14dbd83af870f51
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Oct 8 22:32:57 2010 +0000
2010-10-08 Sheriff Bot <webkit.review.bot at gmail.com>
Unreviewed, rolling out r68574.
http://trac.webkit.org/changeset/68574
https://bugs.webkit.org/show_bug.cgi?id=47433
[chromium] Breaks partial repaint of images while scrolling
(Requested by jamesr on #webkit).
* platform/chromium-linux/svg/custom/image-rescale-expected.checksum: Removed.
* platform/chromium-linux/svg/custom/image-rescale-expected.png: Removed.
* platform/chromium-linux/svg/custom/image-rescale-expected.txt: Removed.
* platform/mac/svg/custom/image-rescale-expected.checksum: Removed.
* platform/mac/svg/custom/image-rescale-expected.png: Removed.
* platform/mac/svg/custom/image-rescale-expected.txt: Removed.
* svg/custom/image-rescale.svg: Removed.
* svg/custom/resources/image-rescale.jpg: Removed.
2010-10-08 Sheriff Bot <webkit.review.bot at gmail.com>
Unreviewed, rolling out r68574.
http://trac.webkit.org/changeset/68574
https://bugs.webkit.org/show_bug.cgi?id=47433
[chromium] Breaks partial repaint of images while scrolling
(Requested by jamesr on #webkit).
* platform/graphics/skia/ImageSkia.cpp:
(WebCore::computeResamplingMode):
(WebCore::drawResampledBitmap):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69427 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 4b1c355..4b6d9a9 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,21 @@
+2010-10-08 Sheriff Bot <webkit.review.bot at gmail.com>
+
+ Unreviewed, rolling out r68574.
+ http://trac.webkit.org/changeset/68574
+ https://bugs.webkit.org/show_bug.cgi?id=47433
+
+ [chromium] Breaks partial repaint of images while scrolling
+ (Requested by jamesr on #webkit).
+
+ * platform/chromium-linux/svg/custom/image-rescale-expected.checksum: Removed.
+ * platform/chromium-linux/svg/custom/image-rescale-expected.png: Removed.
+ * platform/chromium-linux/svg/custom/image-rescale-expected.txt: Removed.
+ * platform/mac/svg/custom/image-rescale-expected.checksum: Removed.
+ * platform/mac/svg/custom/image-rescale-expected.png: Removed.
+ * platform/mac/svg/custom/image-rescale-expected.txt: Removed.
+ * svg/custom/image-rescale.svg: Removed.
+ * svg/custom/resources/image-rescale.jpg: Removed.
+
2010-10-08 Adam Barth <abarth at webkit.org>
Reviewed by Darin Adler.
diff --git a/LayoutTests/platform/chromium-linux/svg/custom/image-rescale-expected.checksum b/LayoutTests/platform/chromium-linux/svg/custom/image-rescale-expected.checksum
deleted file mode 100644
index 1e7a57b..0000000
--- a/LayoutTests/platform/chromium-linux/svg/custom/image-rescale-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-952fd3dc4b2493b5cf0790d7da6b6e57
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-linux/svg/custom/image-rescale-expected.png b/LayoutTests/platform/chromium-linux/svg/custom/image-rescale-expected.png
deleted file mode 100644
index 8d8b04a..0000000
Binary files a/LayoutTests/platform/chromium-linux/svg/custom/image-rescale-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-linux/svg/custom/image-rescale-expected.txt b/LayoutTests/platform/chromium-linux/svg/custom/image-rescale-expected.txt
deleted file mode 100644
index be3d3e5..0000000
--- a/LayoutTests/platform/chromium-linux/svg/custom/image-rescale-expected.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 700x400
- RenderSVGRoot {svg} at (0,0) size 670x210
- RenderSVGImage {image} at (0,0) size 320x210
- RenderSVGImage {image} at (350,0) size 320x210 [transform={m=((10.00,0.00)(0.00,10.00)) t=(-3150.00,0.00)}]
diff --git a/LayoutTests/platform/mac/svg/custom/image-rescale-expected.checksum b/LayoutTests/platform/mac/svg/custom/image-rescale-expected.checksum
deleted file mode 100644
index ef327c4..0000000
--- a/LayoutTests/platform/mac/svg/custom/image-rescale-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-917ccc88f3cfe6f2d9117e035758a8ce
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/svg/custom/image-rescale-expected.png b/LayoutTests/platform/mac/svg/custom/image-rescale-expected.png
deleted file mode 100644
index 0f4f811..0000000
Binary files a/LayoutTests/platform/mac/svg/custom/image-rescale-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/svg/custom/image-rescale-expected.txt b/LayoutTests/platform/mac/svg/custom/image-rescale-expected.txt
deleted file mode 100644
index be3d3e5..0000000
--- a/LayoutTests/platform/mac/svg/custom/image-rescale-expected.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 700x400
- RenderSVGRoot {svg} at (0,0) size 670x210
- RenderSVGImage {image} at (0,0) size 320x210
- RenderSVGImage {image} at (350,0) size 320x210 [transform={m=((10.00,0.00)(0.00,10.00)) t=(-3150.00,0.00)}]
diff --git a/LayoutTests/svg/custom/image-rescale.svg b/LayoutTests/svg/custom/image-rescale.svg
deleted file mode 100644
index e274b70..0000000
--- a/LayoutTests/svg/custom/image-rescale.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<svg version="1.1"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- id="drawingArea-layers" width="700" height="400" >
- <image x="0" y="0" width="320" height="210" xlink:href="resources/image-rescale.jpg" />
- <image x="350" y="0" width="32.0" height="21.0" transform="translate(350 0) scale(10) translate(-350 0)"
- xlink:href="resources/image-rescale.jpg" />
-</svg>
diff --git a/LayoutTests/svg/custom/resources/image-rescale.jpg b/LayoutTests/svg/custom/resources/image-rescale.jpg
deleted file mode 100644
index a827f37..0000000
Binary files a/LayoutTests/svg/custom/resources/image-rescale.jpg and /dev/null differ
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index bfc0d6b..bfae7f8 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-10-08 Sheriff Bot <webkit.review.bot at gmail.com>
+
+ Unreviewed, rolling out r68574.
+ http://trac.webkit.org/changeset/68574
+ https://bugs.webkit.org/show_bug.cgi?id=47433
+
+ [chromium] Breaks partial repaint of images while scrolling
+ (Requested by jamesr on #webkit).
+
+ * platform/graphics/skia/ImageSkia.cpp:
+ (WebCore::computeResamplingMode):
+ (WebCore::drawResampledBitmap):
+
2010-10-08 Andy Estes <aestes at apple.com>
Reviewed by Darin Adler.
diff --git a/WebCore/platform/graphics/skia/ImageSkia.cpp b/WebCore/platform/graphics/skia/ImageSkia.cpp
index e123256..23e7be6 100644
--- a/WebCore/platform/graphics/skia/ImageSkia.cpp
+++ b/WebCore/platform/graphics/skia/ImageSkia.cpp
@@ -143,9 +143,7 @@ static ResamplingMode computeResamplingMode(PlatformContextSkia* platformContext
// Everything else gets resampled.
// If the platform context permits high quality interpolation, use it.
- // High quality interpolation only enabled for scaling and translation.
- if (platformContext->interpolationQuality() == InterpolationHigh
- && !(platformContext->canvas()->getTotalMatrix().getType() & (SkMatrix::kAffine_Mask | SkMatrix::kPerspective_Mask)))
+ if (platformContext->interpolationQuality() == InterpolationHigh)
return RESAMPLE_AWESOME;
return RESAMPLE_LINEAR;
@@ -175,12 +173,8 @@ static void drawResampledBitmap(SkCanvas& canvas, SkPaint& paint, const NativeIm
&& srcIRect.height() == bitmap.height();
// We will always draw in integer sizes, so round the destination rect.
- // First we need to apply canvas transformation matrix to get desired size of
- // resampled image.
- SkRect destRectTransformed;
- canvas.getTotalMatrix().mapRect(&destRectTransformed, destRect);
SkIRect destRectRounded;
- destRectTransformed.round(&destRectRounded);
+ destRect.round(&destRectRounded);
SkIRect resizedImageRect = // Represents the size of the resized image.
{ 0, 0, destRectRounded.width(), destRectRounded.height() };
@@ -194,10 +188,7 @@ static void drawResampledBitmap(SkCanvas& canvas, SkPaint& paint, const NativeIm
// Compute the visible portion of our rect.
SkRect destBitmapSubsetSk;
ClipRectToCanvas(canvas, destRect, &destBitmapSubsetSk);
- // Determine size of resampled image based on clipped destination rect.
- SkRect destBitmapSubsetSkTransformed;
- canvas.getTotalMatrix().mapRect(&destBitmapSubsetSkTransformed, destBitmapSubsetSk);
- destBitmapSubsetSkTransformed.offset(-destBitmapSubsetSkTransformed.fLeft, -destBitmapSubsetSkTransformed.fTop);
+ destBitmapSubsetSk.offset(-destRect.fLeft, -destRect.fTop);
// The matrix inverting, etc. could have introduced rounding error which
// causes the bounds to be outside of the resized bitmap. We round outward
@@ -205,7 +196,7 @@ static void drawResampledBitmap(SkCanvas& canvas, SkPaint& paint, const NativeIm
// need, and then clamp to the bitmap bounds so we don't get any invalid
// data.
SkIRect destBitmapSubsetSkI;
- destBitmapSubsetSkTransformed.roundOut(&destBitmapSubsetSkI);
+ destBitmapSubsetSk.roundOut(&destBitmapSubsetSkI);
if (!destBitmapSubsetSkI.intersect(resizedImageRect))
return; // Resized image does not intersect.
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list