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

Wed Dec 22 12:44:42 UTC 2010

The following commit has been merged in the debian/experimental branch:
commit 00f14d8ff9fcd31decab90d1088fb266b6cac74c
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Aug 28 02:41:42 2010 +0000

    2010-08-27  Matthew Delaney  <mdelaney at apple.com>
    
            Reviewed by Oliver Hunt.
    
            Canvas test 2d.composite.operation.clear failing
            https://bugs.webkit.org/show_bug.cgi?id=43226
    
            * canvas/philip/tests/2d.composite.operation.foobar.html: Added.
            Tests if bogus composite ops are ignored.
            * platform/mac/Skipped: Added comment about why original clear
            test should remain on the skip list.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66294 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 3ce72ee..5f6e659 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2010-08-27  Matthew Delaney  <mdelaney at apple.com>
+
+        Reviewed by Oliver Hunt.
+
+        Canvas test 2d.composite.operation.clear failing
+        https://bugs.webkit.org/show_bug.cgi?id=43226
+
+        * canvas/philip/tests/2d.composite.operation.foobar.html: Added.
+        Tests if bogus composite ops are ignored.
+        * platform/mac/Skipped: Added comment about why original clear 
+        test should remain on the skip list.
+
 2010-08-27  Tony Chang  <tony at chromium.org>
 
         Not reviewed, adding two more files to chromium's test_expectations.
diff --git a/LayoutTests/canvas/philip/tests/2d.composite.operation.foobar-expected.txt b/LayoutTests/canvas/philip/tests/2d.composite.operation.foobar-expected.txt
new file mode 100644
index 0000000..f09bd47
--- /dev/null
+++ b/LayoutTests/canvas/philip/tests/2d.composite.operation.foobar-expected.txt
@@ -0,0 +1,5 @@
+< [index] >
+2d.composite.operation.foobar
+References: 2d.composite.operation.unrecognised
+Actual output:
+Passed
diff --git a/LayoutTests/canvas/philip/tests/2d.composite.operation.foobar.html b/LayoutTests/canvas/philip/tests/2d.composite.operation.foobar.html
new file mode 100644
index 0000000..3a4c02b
--- /dev/null
+++ b/LayoutTests/canvas/philip/tests/2d.composite.operation.foobar.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<title>Canvas test: 2d.composite.operation.foobar</title>
+<script src="../tests.js"></script>
+<link rel="stylesheet" href="../tests.css">
+<link rel="prev" href="2d.composite.operation.over.html" title="2d.composite.operation.over">
+<link rel="next" href="2d.composite.operation.highlight.html" title="2d.composite.operation.highlight">
+<body class="show_output">
+<p>
+ <a href="2d.composite.operation.over.html" accesskey="p" title="[p] 2d.composite.operation.over">&lt;</a>
+ <a href="index.html">[index]</a>
+ <a href="2d.composite.operation.highlight.html" accesskey="n" title="[n] 2d.composite.operation.highlight">&gt;</a>
+<h1><a href="index.2d.html">2d</a>.<a href="index.2d.composite.html">composite</a>.<a href="index.2d.composite.operation.html">operation</a>.foobar</h1>
+<p class="desc"></p>
+<div class="refs">References:
+<ul>
+<li><a href="spec.html#testrefs.2d.composite.operation.unrecognised">2d.composite.operation.unrecognised</a>
+
+</ul>
+</div>
+
+<p class="output">Actual output:</p>
+<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+
+<ul id="d"></ul>
+<script>
+_addTest(function(canvas, ctx) {
+
+ctx.globalCompositeOperation = 'xor';
+ctx.globalCompositeOperation = 'foobar!';
+_assertEqual(ctx.globalCompositeOperation, 'xor', "ctx.globalCompositeOperation", "'xor'");
+
+
+});
+</script>
+
diff --git a/LayoutTests/platform/mac/Skipped b/LayoutTests/platform/mac/Skipped
index 1766cdb..92468e5 100644
--- a/LayoutTests/platform/mac/Skipped
+++ b/LayoutTests/platform/mac/Skipped
@@ -162,6 +162,8 @@ scrollbars/scrollbar-click-does-not-blur-content.html
 
 # Failing canvas test cases from http://philip.html5.org/tests/canvas/suite/tests/
 canvas/philip/tests/2d.drawImage.broken.html
+#NOTE: 2d.composite.operation.clear is failing because we support the "clear" composite op
+#without our vendor prefix since it was around in canvas before the spec was written.
 canvas/philip/tests/2d.composite.operation.clear.html
 canvas/philip/tests/2d.composite.operation.darker.html
 canvas/philip/tests/2d.composite.operation.highlight.html

-- 
WebKit Debian packaging

