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

andreas.kling at nokia.com andreas.kling at nokia.com
Wed Dec 22 11:18:27 UTC 2010 

The following commit has been merged in the debian/experimental branch:
commit 5cfb4ee2f86af44ae455ff8e0b9626f36f28ee17
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Jul 18 02:33:52 2010 +0000

    2010-07-17  Andreas Kling  <andreas.kling at nokia.com>
    
            Rubber-stamped by Simon Hausmann.
    
            Import new version of 2d.pattern.image.string.html from Philip Taylor.
            The original test was buggy and we now pass it.
    
            * canvas/philip/tests/2d.pattern.image.string-expected.txt:
            * canvas/philip/tests/2d.pattern.image.string.html:
            * platform/mac/Skipped:
            * platform/qt/Skipped:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63623 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 18d604c..d8d89c1 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,5 +1,17 @@
 2010-07-17  Andreas Kling  <andreas.kling at nokia.com>
 
+        Rubber-stamped by Simon Hausmann.
+
+        Import new version of 2d.pattern.image.string.html from Philip Taylor.
+        The original test was buggy and we now pass it.
+
+        * canvas/philip/tests/2d.pattern.image.string-expected.txt:
+        * canvas/philip/tests/2d.pattern.image.string.html:
+        * platform/mac/Skipped:
+        * platform/qt/Skipped:
+
+2010-07-17  Andreas Kling  <andreas.kling at nokia.com>
+
         [Qt] Reskip 2d.path.quadraticCurveTo.scaled.html
 
         This test fails with the Qt version running on the bot.
diff --git a/LayoutTests/canvas/philip/tests/2d.pattern.image.string-expected.txt b/LayoutTests/canvas/philip/tests/2d.pattern.image.string-expected.txt
index e528b1f..9193c25 100644
--- a/LayoutTests/canvas/philip/tests/2d.pattern.image.string-expected.txt
+++ b/LayoutTests/canvas/philip/tests/2d.pattern.image.string-expected.txt
@@ -1,5 +1,4 @@
-< [index] >
 2d.pattern.image.string
-References: 2d.pattern.wrongtype
+Spec references: 2d.pattern.wrongtype
 Actual output:
 Passed
diff --git a/LayoutTests/canvas/philip/tests/2d.pattern.image.string.html b/LayoutTests/canvas/philip/tests/2d.pattern.image.string.html
index 7e35977..15fdab7 100644
--- a/LayoutTests/canvas/philip/tests/2d.pattern.image.string.html
+++ b/LayoutTests/canvas/philip/tests/2d.pattern.image.string.html
@@ -1,20 +1,16 @@
 <!DOCTYPE html>
 <title>Canvas test: 2d.pattern.image.string</title>
+<meta name="author" content="Philip Taylor">
 <script src="../tests.js"></script>
 <link rel="stylesheet" href="../tests.css">
-<link rel="prev" href="2d.pattern.image.null.html" title="2d.pattern.image.null">
-<link rel="next" href="2d.pattern.image.incomplete.html" title="2d.pattern.image.incomplete">
 <body class="show_output">
-<p>
- <a href="2d.pattern.image.null.html" accesskey="p" title="[p] 2d.pattern.image.null">&lt;</a>
- <a href="index.html">[index]</a>
- <a href="2d.pattern.image.incomplete.html" accesskey="n" title="[n] 2d.pattern.image.incomplete">&gt;</a>
+
 <h1><a href="index.2d.html">2d</a>.<a href="index.2d.pattern.html">pattern</a>.<a href="index.2d.pattern.image.html">image</a>.string</h1>
 <p class="desc"></p>
-<div class="refs">References:
-<ul>
-<li><a href="spec.html#testrefs.2d.pattern.wrongtype">2d.pattern.wrongtype</a>
 
+<div class="refs">Spec references:
+<ul>
+<li><a href="../annotated-spec/canvas.html#testrefs.2d.pattern.wrongtype">2d.pattern.wrongtype</a>
 </ul>
 </div>
 
@@ -27,7 +23,7 @@ _addTest(function(canvas, ctx) {
 
 try { var _thrown = false;
   ctx.createPattern('../images/red.png', 'repeat');
-} catch (e) { if (e.code != DOMException.TYPE_MISMATCH_ERR) _fail("Failed assertion: expected exception of type TYPE_MISMATCH_ERR, got: "+e.message); _thrown = true; } finally { _assert(_thrown, "should throw exception of type TYPE_MISMATCH_ERR: ctx.createPattern('../images/red.png', 'repeat')"); }
+} catch (e) { if (!(e instanceof TypeError)) _fail("Failed assertion: expected exception of type TypeError, got: "+e); _thrown = true; } finally { _assert(_thrown, "should throw exception of type TypeError: ctx.createPattern('../images/red.png', 'repeat')"); }
 
 
 });
diff --git a/LayoutTests/platform/mac/Skipped b/LayoutTests/platform/mac/Skipped
index 996ed3c..e046092 100644
--- a/LayoutTests/platform/mac/Skipped
+++ b/LayoutTests/platform/mac/Skipped
@@ -216,7 +216,6 @@ canvas/philip/tests/2d.path.stroke.prune.curve.html
 canvas/philip/tests/2d.pattern.image.broken.html
 canvas/philip/tests/2d.pattern.image.incomplete.html
 canvas/philip/tests/2d.pattern.image.null.html
-canvas/philip/tests/2d.pattern.image.string.html
 canvas/philip/tests/2d.pattern.image.undefined.html
 canvas/philip/tests/2d.shadow.enable.blur.html
 canvas/philip/tests/2d.shadow.enable.x.html
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index 2733eb3..d78e5b4 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -5287,7 +5287,6 @@ canvas/philip/tests/2d.path.stroke.scale2.html
 canvas/philip/tests/2d.pattern.image.broken.html
 canvas/philip/tests/2d.pattern.image.incomplete.html
 canvas/philip/tests/2d.pattern.image.null.html
-canvas/philip/tests/2d.pattern.image.string.html
 canvas/philip/tests/2d.pattern.image.undefined.html
 canvas/philip/tests/2d.shadow.canvas.alpha.html
 canvas/philip/tests/2d.shadow.canvas.basic.html

-- 
WebKit Debian packaging

More information about the Pkg-webkit-commits mailing list