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

Thu Apr 8 00:25:47 UTC 2010

The following commit has been merged in the webkit-1.2 branch:
commit 647a425ab18de82976683523dc0c1fb4fd760acc
Author: zimmermann at webkit.org <zimmermann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 8 02:29:28 2009 +0000

    2009-12-07  Nikolas Zimmermann  <nzimmermann at rim.com>
    
            Not reviewed. Reverting problematic patch, causing errors.
    
            Revert r51789 (Avoid zero division during SVGPaintServerPattern::setup()). Crashes on all Windows slaves.
            Reopen bug https://bugs.webkit.org/show_bug.cgi?id=29912.
    
            * svg/graphics/SVGPaintServerPattern.cpp:
            (WebCore::SVGPaintServerPattern::setup):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51823 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index ded83bb..4818577 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2009-12-07  Nikolas Zimmermann  <nzimmermann at rim.com>
+
+        Not reviewed. Reverting problematic patch, causing errors.
+
+        Revert r51789 (Avoid zero division during SVGPaintServerPattern::setup()). Crashes on all Windows slaves.
+        Reopen bug https://bugs.webkit.org/show_bug.cgi?id=29912.
+
+        * svg/custom/script-tests/small-pattern.js: Removed.
+        * svg/custom/small-pattern-expected.txt: Removed.
+        * svg/custom/small-pattern.html: Removed.
+
 2009-12-07  Kent Tamura  <tkent at chromium.org>
 
         Reviewed by Darin Adler.
diff --git a/LayoutTests/svg/custom/script-tests/small-pattern.js b/LayoutTests/svg/custom/script-tests/small-pattern.js
deleted file mode 100644
index ae11433..0000000
--- a/LayoutTests/svg/custom/script-tests/small-pattern.js
+++ /dev/null
@@ -1,28 +0,0 @@
-description("Patterns shouldn't crash for size < 0.5 .");
-
-var svg = document.createElementNS("http://www.w3.org/2000/svg", "svg");
-document.documentElement.insertBefore(svg, document.documentElement.firstChild);
-
-var pattern = document.createElementNS("http://www.w3.org/2000/svg", "pattern");
-pattern.setAttribute("id", "pattern");
-pattern.setAttribute("width", "0.1");
-pattern.setAttribute("height", "0.1");
-pattern.setAttribute("overflow", "visible");
-pattern.setAttribute("patternUnits", "userSpaceOnUse");
-
-var patternRect = document.createElementNS("http://www.w3.org/2000/svg", "rect");
-patternRect.setAttribute("width", "1");
-patternRect.setAttribute("height", "1");
-patternRect.setAttribute("fill", "green");
-pattern.appendChild(patternRect);
-
-svg.appendChild(pattern);
-
-var rect = document.createElementNS("http://www.w3.org/2000/svg", "rect");
-rect.setAttribute("width", "1");
-rect.setAttribute("height", "1");
-rect.setAttribute("fill", "url(#pattern)");
-
-svg.appendChild(rect);
-
-var successfullyParsed = true;
diff --git a/LayoutTests/svg/custom/small-pattern-expected.txt b/LayoutTests/svg/custom/small-pattern-expected.txt
deleted file mode 100644
index 7735c38..0000000
--- a/LayoutTests/svg/custom/small-pattern-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Patterns shouldn't crash for size < 0.5 .
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/svg/custom/small-pattern.html b/LayoutTests/svg/custom/small-pattern.html
deleted file mode 100644
index ef53c48..0000000
--- a/LayoutTests/svg/custom/small-pattern.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<head>
-<link rel="stylesheet" href="../../fast/js/resources/js-test-style.css">
-<script src="../../fast/js/resources/js-test-pre.js"></script>
-</head>
-<body>
-<p id="description"></p>
-<div id="console"></div>
-<script src="script-tests/small-pattern.js"></script>
-<script src="../../fast/js/resources/js-test-post.js"></script>
-</body>
-</html>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4e6a570..cd9f55a 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2009-12-07  Nikolas Zimmermann  <nzimmermann at rim.com>
+
+        Not reviewed. Reverting problematic patch, causing errors.
+
+        Revert r51789 (Avoid zero division during SVGPaintServerPattern::setup()). Crashes on all Windows slaves.
+        Reopen bug https://bugs.webkit.org/show_bug.cgi?id=29912.
+
+        * svg/graphics/SVGPaintServerPattern.cpp:
+        (WebCore::SVGPaintServerPattern::setup):
+
 2009-12-07  Kent Tamura  <tkent at chromium.org>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/svg/graphics/SVGPaintServerPattern.cpp b/WebCore/svg/graphics/SVGPaintServerPattern.cpp
index 27ef3f3..289c40c 100644
--- a/WebCore/svg/graphics/SVGPaintServerPattern.cpp
+++ b/WebCore/svg/graphics/SVGPaintServerPattern.cpp
@@ -122,8 +122,8 @@ bool SVGPaintServerPattern::setup(GraphicsContext*& context, const RenderObject*
   
         GraphicsContext* tileImageContext = tileImage->context();
 
-        int numY = static_cast<int>(ceilf(tileRect.height() / patternBoundaries().height())) + 1;
-        int numX = static_cast<int>(ceilf(tileRect.width() / patternBoundaries().width())) + 1;
+        int numY = static_cast<int>(ceilf(tileRect.height() / tileHeight)) + 1;
+        int numX = static_cast<int>(ceilf(tileRect.width() / tileWidth)) + 1;
 
         tileImageContext->save();
         tileImageContext->translate(-patternBoundaries().width() * numX, -patternBoundaries().height() * numY);

-- 
WebKit Debian packaging

