[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 322f3adcb2a7fbb06b347ca66f2ce11f881993f5
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 24 02:23:38 2009 +0000

    2009-12-23  Yuta Kitamura  <yutak at chromium.org>
    
            Reviewed by Eric Seidel.
    
            PlatformContextSkia::beginLayerClippedToImage() needs to clip outside of the image.
    
            This method should limit the current painting window to the bounds of the given
            image, but it did not. Due to this bug, unnecessary contents were rendered in
            some (limited) situations.
    
            [Skia] PlatformContextSkia::beginLayerClippedToImage does not clip outside of the image
            https://bugs.webkit.org/show_bug.cgi?id=32817
    
            No new tests, because this is a fix of an existing test which is currently failing in
            Chromium.
    
            * platform/graphics/skia/PlatformContextSkia.cpp:
            (PlatformContextSkia::beginLayerClippedToImage): Add clipRect() call.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52539 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 38f9d90..fac25eb 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,22 @@
+2009-12-23  Yuta Kitamura  <yutak at chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        PlatformContextSkia::beginLayerClippedToImage() needs to clip outside of the image.
+        
+        This method should limit the current painting window to the bounds of the given
+        image, but it did not. Due to this bug, unnecessary contents were rendered in
+        some (limited) situations.
+
+        [Skia] PlatformContextSkia::beginLayerClippedToImage does not clip outside of the image
+        https://bugs.webkit.org/show_bug.cgi?id=32817
+        
+        No new tests, because this is a fix of an existing test which is currently failing in
+        Chromium.
+
+        * platform/graphics/skia/PlatformContextSkia.cpp:
+        (PlatformContextSkia::beginLayerClippedToImage): Add clipRect() call.
+
 2009-12-23  Nikolas Zimmermann  <nzimmermann at rim.com>
 
         Rubber-stamped by Eric Seidel.
diff --git a/WebCore/platform/graphics/skia/PlatformContextSkia.cpp b/WebCore/platform/graphics/skia/PlatformContextSkia.cpp
index dfffa0d..4900dfb 100644
--- a/WebCore/platform/graphics/skia/PlatformContextSkia.cpp
+++ b/WebCore/platform/graphics/skia/PlatformContextSkia.cpp
@@ -234,7 +234,8 @@ void PlatformContextSkia::beginLayerClippedToImage(const WebCore::FloatRect& rec
     m_state->m_clip = rect;
     SkRect bounds = { SkFloatToScalar(rect.x()), SkFloatToScalar(rect.y()),
                       SkFloatToScalar(rect.right()), SkFloatToScalar(rect.bottom()) };
-                      
+
+    canvas()->clipRect(bounds);
     canvas()->saveLayerAlpha(&bounds, 255,
                              static_cast<SkCanvas::SaveFlags>(SkCanvas::kHasAlphaLayer_SaveFlag | SkCanvas::kFullColorLayer_SaveFlag));
     // Copy off the image as |imageBuffer| may be deleted before restore is invoked.

-- 
WebKit Debian packaging