[Pkg-chromium-commit] chromium-browser/chromium-browser.sid: 610 Fix an infinite recursion crash when trying to wrap media elements without

[Giuseppe Iuculano]

Branch name: chromium-browser/chromium-browser.sid
Branch location : bzr+ssh://bzr.debian.org/bzr/pkg-chromium/chromium-browser/chromium-browser.sid
Browse location: http://bzr.debian.org/loggerhead/pkg-chromium
Revision No: 610
Revision Id: iuculano at debian.org-20100613200730-3sre1m6xmwcmc0oj
Committer: Giuseppe Iuculano <iuculano at debian.org>
Message : Fix an infinite recursion crash when trying to wrap media elements without
a media player. (Closes: #582709)


--------------------------------------------------------
  ** Added :
        - debian/patches/webkit-recursion.patch

  ** Modified :
        - debian/changelog
        - debian/patches/series

-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2010-06-13 12:35:59 +0000
+++ b/debian/changelog	2010-06-13 20:07:30 +0000
@@ -14,8 +14,10 @@
   * Added libglewmx1.5-dev in Build-Depends
   * Removed Fabien and Alexander from Uploaders.
   * Updated VCS control fields
+  * Fix an infinite recursion crash when trying to wrap media elements without
+    a media player. (Closes: #582709)
 
- -- Giuseppe Iuculano <iuculano at debian.org>  Sun, 13 Jun 2010 14:35:45 +0200
+ -- Giuseppe Iuculano <iuculano at debian.org>  Sun, 13 Jun 2010 22:06:19 +0200
 
 chromium-browser (5.0.375.70~r48679-1) unstable; urgency=low
 

=== modified file 'debian/patches/series'
--- a/debian/patches/series	2010-06-13 12:29:11 +0000
+++ b/debian/patches/series	2010-06-13 20:07:30 +0000
@@ -14,3 +14,4 @@
 prefs.patch
 protobuf.patch
 glew.patch
+webkit-recursion.patch

=== added file 'debian/patches/webkit-recursion.patch'
--- a/debian/patches/webkit-recursion.patch	1970-01-01 00:00:00 +0000
+++ b/debian/patches/webkit-recursion.patch	2010-06-13 20:07:30 +0000
@@ -0,0 +1,13 @@
+Index: chromium-browser-5.0.375.70~r48679/src/third_party/WebKit/WebCore/dom/make_names.pl
+===================================================================
+--- chromium-browser-5.0.375.70~r48679.orig/src/third_party/WebKit/WebCore/dom/make_names.pl	2010-06-13 19:43:59.081746707 +0200
++++ chromium-browser-5.0.375.70~r48679/src/third_party/WebKit/WebCore/dom/make_names.pl	2010-06-13 19:45:16.585501775 +0200
+@@ -866,7 +866,7 @@
+ {
+     Settings* settings = element->document()->settings();
+     if (!MediaPlayer::isAvailable() || (settings && !settings->isMediaEnabled()))
+-        return toV8(static_cast<$parameters{namespace}Element*>(element));
++        return V8$parameters{namespace}Element::wrap(element);
+     return toV8(static_cast<${JSInterfaceName}*>(element));
+ }
+