[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
mdelaney at apple.com
mdelaney at apple.com
Wed Dec 22 15:27:08 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 0e82e7a68030e3282f2ffd453a26bd45fbe45320
Author: mdelaney at apple.com <mdelaney at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Nov 3 21:19:29 2010 +0000
2010-11-03 Matthew Delaney <mdelaney at apple.com>
Reviewed by Darin Adler.
Fix canvas/philip/tests/2d.pattern.image.undefined.html
https://bugs.webkit.org/show_bug.cgi?id=48894
* bindings/js/JSCanvasRenderingContext2DCustom.cpp: Changed error thrown to match the spec.
2010-11-03 Matthew Delaney <mdelaney at apple.com>
Reviewed by Darin Adler.
Fix canvas/philip/tests/2d.pattern.image.undefined.html
https://bugs.webkit.org/show_bug.cgi?id=48894
* canvas/philip/tests/2d.pattern.image.string.html: Updated test to agree with spec.
* platform/mac-snowleopard/canvas/philip/tests/2d.pattern.image.null-expected.txt: Removed. Now passing.
* platform/mac-snowleopard/canvas/philip/tests/2d.pattern.image.undefined-expected.txt: Removed. Now passing.
* platform/mac-leopard/Skipped: Removed now passing tests.
* platform/gtk/Skipped: Removed now passing tests.
* platform/qt/Skipped: Removed now passing tests.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71268 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index a852a10..2143e81 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,17 @@
+2010-11-03 Matthew Delaney <mdelaney at apple.com>
+
+ Reviewed by Darin Adler.
+
+ Fix canvas/philip/tests/2d.pattern.image.undefined.html
+ https://bugs.webkit.org/show_bug.cgi?id=48894
+
+ * canvas/philip/tests/2d.pattern.image.string.html: Updated test to agree with spec.
+ * platform/mac-snowleopard/canvas/philip/tests/2d.pattern.image.null-expected.txt: Removed. Now passing.
+ * platform/mac-snowleopard/canvas/philip/tests/2d.pattern.image.undefined-expected.txt: Removed. Now passing.
+ * platform/mac-leopard/Skipped: Removed now passing tests.
+ * platform/gtk/Skipped: Removed now passing tests.
+ * platform/qt/Skipped: Removed now passing tests.
+
2010-11-03 Dumitru Daniliuc <dumi at chromium.org>
Unreviewed, updating Chromium expectations.
diff --git a/LayoutTests/canvas/philip/tests/2d.pattern.image.string.html b/LayoutTests/canvas/philip/tests/2d.pattern.image.string.html
index 15fdab7..6e70617 100644
--- a/LayoutTests/canvas/philip/tests/2d.pattern.image.string.html
+++ b/LayoutTests/canvas/philip/tests/2d.pattern.image.string.html
@@ -21,9 +21,7 @@
<script>
_addTest(function(canvas, ctx) {
-try { var _thrown = false;
- 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')"); }
+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')"); }
});
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index 517f862..ee2a896 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -5378,8 +5378,6 @@ canvas/philip/tests/2d.path.clip.empty.html
canvas/philip/tests/2d.path.rect.winding.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.undefined.html
canvas/philip/tests/2d.shadow.enable.blur.html
canvas/philip/tests/2d.shadow.enable.x.html
canvas/philip/tests/2d.shadow.enable.y.html
diff --git a/LayoutTests/platform/mac-leopard/Skipped b/LayoutTests/platform/mac-leopard/Skipped
index d987e75..79b7202 100644
--- a/LayoutTests/platform/mac-leopard/Skipped
+++ b/LayoutTests/platform/mac-leopard/Skipped
@@ -134,8 +134,6 @@ canvas/philip/tests/2d.path.clip.empty.html
canvas/philip/tests/2d.path.rect.winding.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.undefined.html
canvas/philip/tests/2d.shadow.enable.blur.html
canvas/philip/tests/2d.shadow.enable.x.html
canvas/philip/tests/2d.shadow.enable.y.html
diff --git a/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.pattern.image.null-expected.txt b/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.pattern.image.null-expected.txt
deleted file mode 100644
index 2cb3d6e..0000000
--- a/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.pattern.image.null-expected.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-< [index] >
-2d.pattern.image.null
-References: 2d.pattern.wrongtype
-Actual output:
-Failed assertion: expected exception of type TYPE_MISMATCH_ERR, got: Type error
diff --git a/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.pattern.image.undefined-expected.txt b/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.pattern.image.undefined-expected.txt
deleted file mode 100644
index 8468cbb..0000000
--- a/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.pattern.image.undefined-expected.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-< [index] >
-2d.pattern.image.undefined
-References: 2d.pattern.wrongtype
-Actual output:
-Failed assertion: expected exception of type TYPE_MISMATCH_ERR, got: Type error
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index bf75d5b..be32be1 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -5205,8 +5205,6 @@ canvas/philip/tests/2d.path.rect.zero.6.html
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.undefined.html
canvas/philip/tests/2d.shadow.transform.2.html
canvas/philip/tests/2d.text.draw.baseline.bottom.html
canvas/philip/tests/2d.text.draw.baseline.hanging.html
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 57b2e9b..288cc50 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-11-03 Matthew Delaney <mdelaney at apple.com>
+
+ Reviewed by Darin Adler.
+
+ Fix canvas/philip/tests/2d.pattern.image.undefined.html
+ https://bugs.webkit.org/show_bug.cgi?id=48894
+
+ * bindings/js/JSCanvasRenderingContext2DCustom.cpp: Changed error thrown to match the spec.
+
2010-11-03 Simon Fraser <simon.fraser at apple.com>
Reviewed by John Sullivan.
diff --git a/WebCore/bindings/js/JSCanvasRenderingContext2DCustom.cpp b/WebCore/bindings/js/JSCanvasRenderingContext2DCustom.cpp
index 532b38b..e3f5a4e 100644
--- a/WebCore/bindings/js/JSCanvasRenderingContext2DCustom.cpp
+++ b/WebCore/bindings/js/JSCanvasRenderingContext2DCustom.cpp
@@ -343,8 +343,10 @@ JSValue JSCanvasRenderingContext2D::createPattern(ExecState* exec)
CanvasRenderingContext2D* context = static_cast<CanvasRenderingContext2D*>(impl());
JSValue value = exec->argument(0);
- if (!value.isObject())
- return throwTypeError(exec);
+ if (!value.isObject()) {
+ setDOMException(exec, TYPE_MISMATCH_ERR);
+ return jsUndefined();
+ }
JSObject* o = asObject(value);
if (o->inherits(&JSHTMLImageElement::s_info)) {
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list