summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorager@chromium.org <ager@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-20 10:24:20 +0000
committerager@chromium.org <ager@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-20 10:24:20 +0000
commitca3bc357a579e5f47e809b31763469b3067bb159 (patch)
treeb946ac6e281d18617d9937f9f6481583b8945bf2
parentf47bff634df6a5ef35e6a4be993687b2b2b9d8a8 (diff)
downloadchromium_src-ca3bc357a579e5f47e809b31763469b3067bb159.zip
chromium_src-ca3bc357a579e5f47e809b31763469b3067bb159.tar.gz
chromium_src-ca3bc357a579e5f47e809b31763469b3067bb159.tar.bz2
Fix crash in SVG bindings. We attempted to update the SVGContext for
a NULL SVGElement which makes no sense. BUG=12105 Review URL: http://codereview.chromium.org/113627 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16471 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/port/bindings/v8/v8_proxy.cpp3
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt3
2 files changed, 3 insertions, 3 deletions
diff --git a/webkit/port/bindings/v8/v8_proxy.cpp b/webkit/port/bindings/v8/v8_proxy.cpp
index 161658a..03c657d 100644
--- a/webkit/port/bindings/v8/v8_proxy.cpp
+++ b/webkit/port/bindings/v8/v8_proxy.cpp
@@ -258,6 +258,9 @@ SVG_POD_NATIVE_TYPES(MAKE_CASE)
void V8Proxy::SetSVGContext(void* obj, SVGElement* context)
{
+ if (obj == NULL)
+ return;
+
SVGElement* old_context = svg_object_to_context_map().get(obj);
if (old_context == context)
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 1d0a962..f755ab3 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2666,9 +2666,6 @@ BUG12054 MAC LINUX : LayoutTests/fast/text/international/thai-baht-space.html =
// New test, added in http://trac.webkit.org/changeset/43793, fails for us.
BUG12104 : LayoutTests/fast/backgrounds/background-clip-text.html = FAIL
-// Change upstream reveals an issue in V8 bindings: http://trac.webkit.org/changeset/43795
-BUG12105 DEBUG : LayoutTests/svg/dom/svglist-exception-on-out-bounds-error.html = CRASH
-
// New test, added in http://trac.webkit.org/changeset/43822, fails for us
BUG12197 : LayoutTests/editing/pasteboard/get-data-text-plain-drop.html = FAIL