[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 764acb29439f1a2a962d111b422227581262845a
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 19 11:09:47 2010 +0000

    2010-11-19  Mike Lawther  <mikelawther at chromium.org>
    
            Reviewed by James Robinson.
    
            [skia] assert when attempting to get (but not use) pointer to outside the canvas
            https://bugs.webkit.org/show_bug.cgi?id=49698
    
            Removed expectation of failure on Win dbg
    
            * platform/chromium/test_expectations.txt:
    2010-11-19  Mike Lawther  <mikelawther at chromium.org>
    
            Reviewed by James Robinson.
    
            [skia] assert when attempting to get (but not use) pointer to outside the canvas
            https://bugs.webkit.org/show_bug.cgi?id=49698
    
            Early return to avoid getting a pointer to outside the canvas, and
            hence triggering a Skia assert.
    
            * platform/graphics/skia/ImageBufferSkia.cpp:
            (WebCore::getImageData):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72374 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 491e315..c0e1d3a 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2010-11-19  Mike Lawther  <mikelawther at chromium.org>
+
+        Reviewed by James Robinson.
+
+        [skia] assert when attempting to get (but not use) pointer to outside the canvas
+        https://bugs.webkit.org/show_bug.cgi?id=49698
+
+        Removed expectation of failure on Win dbg
+
+        * platform/chromium/test_expectations.txt:
+
 2010-11-19  Julie Parent  <jparent at chromium.org>
 
         Reviewed by Ojan Vafai.
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index 7905709..92559c5 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -2471,8 +2471,7 @@ BUGWK45991 MAC : canvas/philip/tests/2d.strokeRect.zero.4.html = TEXT PASS
 BUGWK45991 MAC : canvas/philip/tests/2d.text.draw.baseline.ideographic.html = TEXT PASS
 BUGWK45991 MAC : canvas/philip/tests/toDataURL.jpeg.alpha.html = TEXT PASS
 
-BUGWK45991 DEBUG : canvas/philip/tests/2d.imageData.get.source.outside.html = TEXT
-BUGWK45991 MAC RELEASE : canvas/philip/tests/2d.imageData.get.source.outside.html = TEXT
+BUGWK45991 MAC : canvas/philip/tests/2d.imageData.get.source.outside.html = TEXT
 
 // This seems to be failing on windows only.
 BUGWK45991 WIN : canvas/philip/tests/2d.gradient.radial.touch2.html = TEXT
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index cc20990..d78c81b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-11-19  Mike Lawther  <mikelawther at chromium.org>
+
+        Reviewed by James Robinson.
+
+        [skia] assert when attempting to get (but not use) pointer to outside the canvas
+        https://bugs.webkit.org/show_bug.cgi?id=49698
+
+        Early return to avoid getting a pointer to outside the canvas, and
+        hence triggering a Skia assert.
+
+        * platform/graphics/skia/ImageBufferSkia.cpp:
+        (WebCore::getImageData):
+
 2010-11-18  Ilya Tikhonovsky  <loislo at chromium.org>
 
         Reviewed by Yury Semikhatsky.
diff --git a/WebCore/platform/graphics/skia/ImageBufferSkia.cpp b/WebCore/platform/graphics/skia/ImageBufferSkia.cpp
index 0db96cf..adb732b 100644
--- a/WebCore/platform/graphics/skia/ImageBufferSkia.cpp
+++ b/WebCore/platform/graphics/skia/ImageBufferSkia.cpp
@@ -183,6 +183,9 @@ PassRefPtr<ImageData> getImageData(const IntRect& rect, const SkBitmap& bitmap,
         endX = size.width();
     int numColumns = endX - originX;
 
+    if (numColumns <= 0) 
+        return result;
+
     int originY = rect.y();
     int destY = 0;
     if (originY < 0) {
@@ -194,6 +197,9 @@ PassRefPtr<ImageData> getImageData(const IntRect& rect, const SkBitmap& bitmap,
         endY = size.height();
     int numRows = endY - originY;
 
+    if (numRows <= 0) 
+        return result;
+
     ASSERT(bitmap.config() == SkBitmap::kARGB_8888_Config);
     SkAutoLockPixels bitmapLock(bitmap);
 

-- 
WebKit Debian packaging