summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authormmoss@google.com <mmoss@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-22 00:09:30 +0000
committermmoss@google.com <mmoss@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-22 00:09:30 +0000
commitd764755c9527fc2f33acfcf8f897cdc2fde693f9 (patch)
treea65b515bac97c4d7c1be3227ce9aa2fc38617055 /webkit
parentb0faad6b7aa2597115c07ca6fc3d6273c3c18191 (diff)
downloadchromium_src-d764755c9527fc2f33acfcf8f897cdc2fde693f9.zip
chromium_src-d764755c9527fc2f33acfcf8f897cdc2fde693f9.tar.gz
chromium_src-d764755c9527fc2f33acfcf8f897cdc2fde693f9.tar.bz2
* Re-apply "* Enable HTMLCanvasElement::toDataURL() method for Javascript."
This reverts r3706 which reverted r3700. Review URL: http://codereview.chromium.org/7845 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3708 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/port/html/HTMLCanvasElement.idl3
-rw-r--r--webkit/tools/layout_tests/test_lists/win/tests_fixable.txt1
2 files changed, 3 insertions, 1 deletions
diff --git a/webkit/port/html/HTMLCanvasElement.idl b/webkit/port/html/HTMLCanvasElement.idl
index d5c819c..485b177 100644
--- a/webkit/port/html/HTMLCanvasElement.idl
+++ b/webkit/port/html/HTMLCanvasElement.idl
@@ -34,6 +34,9 @@ module html {
attribute long width;
attribute long height;
+ DOMString toDataURL(in [ConvertUndefinedOrNullToNullString] DOMString type)
+ raises(DOMException);
+
#if defined(V8_BINDING)
CanvasRenderingContext2D getContext(in DOMString contextId);
#elif !defined(LANGUAGE_OBJECTIVE_C)
diff --git a/webkit/tools/layout_tests/test_lists/win/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/win/tests_fixable.txt
index bb314eb..0d36c77 100644
--- a/webkit/tools/layout_tests/test_lists/win/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/win/tests_fixable.txt
@@ -904,7 +904,6 @@ V8 | KJS # LayoutTests/fast/transforms/overflow-with-transform.html = FAIL
V8 | KJS # LayoutTests/fast/transforms/shadows.html = FAIL
V8 | KJS # LayoutTests/http/tests/misc/acid3.html = FAIL
V8 | KJS # DEFER : LayoutTests/http/tests/misc/frame-default-enc-same-domain.html = FAIL
-V8 | KJS # LayoutTests/http/tests/security/canvas-remote-read-remote-image.html = FAIL
V8 | KJS # LayoutTests/http/tests/security/canvas-remote-read-svg-image.html = FAIL
V8 | KJS # LayoutTests/http/tests/security/cross-frame-access-object-prototype.html = FAIL
V8 | KJS # LayoutTests/http/tests/security/cross-origin-xsl-BLOCKED.html = FAIL