[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

[tony at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit 64ae0c3a2518e197fd5d89f8c4c182ab6206537d
Author: tony at chromium.org <tony at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Mar 3 06:46:17 2010 +0000

    2010-03-02  Tony Chang  <tony at chromium.org>
    
            Not reviewed, test fix.
    
            Revert r55447 because the new layout test is crashing consistently
            on Leopard Intel Debug (tests).
            https://bugs.webkit.org/show_bug.cgi?id=35261
    
            * svg/custom/tiling-regular-hexagonal-crash-expected.txt: Removed.
            * svg/custom/tiling-regular-hexagonal-crash.svg: Removed.
    2010-03-02  Tony Chang  <tony at chromium.org>
    
            Not reviewed, test fix.
    
            Revert r55447 because the new layout test is crashing consistently
            on Leopard Intel Debug (tests).
            https://bugs.webkit.org/show_bug.cgi?id=35261
    
            * platform/graphics/skia/ImageSkia.cpp:
            (WebCore::BitmapImageSingleFrameSkia::create):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55450 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 2f5f6a4..7a898fb 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2010-03-02  Tony Chang  <tony at chromium.org>
+
+        Not reviewed, test fix.
+
+        Revert r55447 because the new layout test is crashing consistently
+        on Leopard Intel Debug (tests).
+        https://bugs.webkit.org/show_bug.cgi?id=35261
+
+        * svg/custom/tiling-regular-hexagonal-crash-expected.txt: Removed.
+        * svg/custom/tiling-regular-hexagonal-crash.svg: Removed.
+
 2010-03-02  Evan Stade  <estade at chromium.org>
 
         Reviewed by David Levin.
diff --git a/LayoutTests/svg/custom/tiling-regular-hexagonal-crash-expected.txt b/LayoutTests/svg/custom/tiling-regular-hexagonal-crash-expected.txt
deleted file mode 100644
index 81a1459..0000000
--- a/LayoutTests/svg/custom/tiling-regular-hexagonal-crash-expected.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-PASS - didn't crash, bug 36231
-
diff --git a/LayoutTests/svg/custom/tiling-regular-hexagonal-crash.svg b/LayoutTests/svg/custom/tiling-regular-hexagonal-crash.svg
deleted file mode 100644
index 7d6f08d..0000000
--- a/LayoutTests/svg/custom/tiling-regular-hexagonal-crash.svg
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg id="Tiling_Regular_6_3_Hexagonal" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="400" height="400">
-<script>
-  if (window.layoutTestController)
-      layoutTestController.dumpAsText();
-  // Prevent insertion of any content into the document.
-  document.documentElement.addEventListener("DOMNodeInserted", function() {
-    var insertedNode = event.target;
-    insertedNode.parentNode.removeChild(insertedNode);
-  }, true);
-</script>
-
-<defs>
-   <polygon id="Hexagon" stroke="#000000" stroke-width="4" points="0,0 52,0 78,45 52,90 0,90 -26,45"/>
-
-   <g id="Hex_Group">
-      <use xlink:href="#Hexagon" transform="translate(-26)"/>
-      <use xlink:href="#Hexagon" transform="translate(130)"/>
-      <use xlink:href="#Hexagon" transform="translate(52, -135)"/>
-      <text x="10" y="30">PASS - didn't crash, bug 36231</text>
-   </g>
-   
-   <pattern id="Hex_Pattern" patternUnits="userSpaceOnUse" patternTransform="translate(4, 20) scale(0.5)" width="156" height=" 270">
-      <use xlink:href="#Hex_Group" fill="#99BBDD" transform="translate(0, 90) scale(1, -1)"/>
-      <use xlink:href="#Hex_Group" fill="#BB99DD" transform="translate(0, 90)"/>
-      <use xlink:href="#Hex_Group" fill="#DD99BB" transform="translate(0, 180)"/>
-      <use xlink:href="#Hexagon" fill="#BB99DD" transform="translate(52, 225)"/>
-   </pattern>
-   
-</defs>
-
-<rect x="2" y="2" height="394" width="394" stroke="#000000" stroke-width="2" fill="url(#Hex_Pattern)"/>
-
-</svg>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index b169699..a58b9c1 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-03-02  Tony Chang  <tony at chromium.org>
+
+        Not reviewed, test fix.
+
+        Revert r55447 because the new layout test is crashing consistently
+        on Leopard Intel Debug (tests).
+        https://bugs.webkit.org/show_bug.cgi?id=35261
+
+        * platform/graphics/skia/ImageSkia.cpp:
+        (WebCore::BitmapImageSingleFrameSkia::create):
+
 2010-03-02  Adam Barth  <abarth at webkit.org>
 
         Reviewed by Darin Fisher.
diff --git a/WebCore/platform/graphics/skia/ImageSkia.cpp b/WebCore/platform/graphics/skia/ImageSkia.cpp
index b1bfbdd..ba9f824 100644
--- a/WebCore/platform/graphics/skia/ImageSkia.cpp
+++ b/WebCore/platform/graphics/skia/ImageSkia.cpp
@@ -457,7 +457,8 @@ void BitmapImageSingleFrameSkia::draw(GraphicsContext* ctxt,
 PassRefPtr<BitmapImageSingleFrameSkia> BitmapImageSingleFrameSkia::create(const SkBitmap& bitmap)
 {
     RefPtr<BitmapImageSingleFrameSkia> image(adoptRef(new BitmapImageSingleFrameSkia()));
-    bitmap.copyTo(&image->m_nativeImage, bitmap.config());
+    if (!bitmap.copyTo(&image->m_nativeImage, bitmap.config()))
+        return 0;
     return image.release();
 }
 

-- 
WebKit Debian packaging