[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.2.3-2-36-g0136662

[Michael Gilbert]

The following commit has been merged in the debian/unstable branch:
commit e1ce17ce1154c20c3948c0192959f4a5c6cc380f
Author: Michael Gilbert <michael.s.gilbert at gmail.com>
Date:   Mon Sep 6 22:30:57 2010 -0400

    fix build failure

diff --git a/debian/patches/cve-2010-2900.patch b/debian/patches/cve-2010-2900.patch
index e4b31e9..1420be2 100644
--- a/debian/patches/cve-2010-2900.patch
+++ b/debian/patches/cve-2010-2900.patch
@@ -3,18 +3,18 @@ author: Michael Gilbert <michael.s.gilbert at gmail.com>
 origin: http://trac.webkit.org/changeset/63219
 Index: webkit-1.2.4/WebCore/html/HTMLCanvasElement.cpp
 ===================================================================
---- webkit-1.2.4.orig/WebCore/html/HTMLCanvasElement.cpp	2010-09-03 15:18:06.000000000 -0400
-+++ webkit-1.2.4/WebCore/html/HTMLCanvasElement.cpp	2010-09-06 21:59:30.000000000 -0400
-@@ -66,6 +66,9 @@
+--- webkit-1.2.4.orig/WebCore/html/HTMLCanvasElement.cpp	2010-09-06 22:28:56.000000000 -0400
++++ webkit-1.2.4/WebCore/html/HTMLCanvasElement.cpp	2010-09-06 22:29:28.000000000 -0400
+@@ -64,6 +64,9 @@
+ // in exchange for a smaller maximum canvas size.
+ const float HTMLCanvasElement::MaxCanvasArea = 32768 * 8192; // Maximum canvas area in CSS pixels
  
- HTMLCanvasElement::HTMLCanvasElement(const QualifiedName& tagName, Document* doc)
-     : HTMLElement(tagName, doc)
 +//In Skia, we will also limit width/height to 32767.
 +static const float MaxSkiaDim = 32767.0F; // Maximum width/height in CSS pixels.
 +
+ HTMLCanvasElement::HTMLCanvasElement(const QualifiedName& tagName, Document* doc)
+     : HTMLElement(tagName, doc)
      , m_size(defaultWidth, defaultHeight)
-     , m_observer(0)
-     , m_originClean(true)
 @@ -293,6 +296,11 @@
      if (!(wf >= 1 && hf >= 1 && wf * hf <= MaxCanvasArea))
          return IntSize();

-- 
WebKit Debian packaging