[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[hyatt]

The following commit has been merged in the debian/unstable branch:
commit 873aa5307e7a83fbd3c4d9b42999b304dbc8668b
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Mar 11 02:07:22 2004 +0000

    	Fix for 3584646, AxWebArea should encompass all children (its AxSize should).
    
            Reviewed by mjs
    
            * khtml/rendering/render_canvas.cpp:
            (RenderCanvas::absoluteRects):
            * khtml/rendering/render_canvas.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6202 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 6ccb838..6de2d68 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2004-03-10  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3584646, AxWebArea should encompass all children (its AxSize should).
+	
+        Reviewed by mjs
+
+        * khtml/rendering/render_canvas.cpp:
+        (RenderCanvas::absoluteRects):
+        * khtml/rendering/render_canvas.h:
+
 2004-03-10  Chris Blumenberg  <cblu at apple.com>
 
 	Fixed: INPUT images are not part of web archives.
diff --git a/WebCore/khtml/rendering/render_canvas.cpp b/WebCore/khtml/rendering/render_canvas.cpp
index 89de8ba..86d5442 100644
--- a/WebCore/khtml/rendering/render_canvas.cpp
+++ b/WebCore/khtml/rendering/render_canvas.cpp
@@ -313,6 +313,11 @@ static QRect enclosingPositionedRect (RenderObject *n)
     return rect;
 }
 
+void RenderCanvas::absoluteRects(QValueList<QRect>& rects, int _tx, int _ty)
+{
+    rects.append(QRect(_tx, _ty, m_layer->width(), m_layer->height()));
+}
+
 QRect RenderCanvas::selectionRect() const
 {
     RenderObject *r = m_selectionStart;
diff --git a/WebCore/khtml/rendering/render_canvas.h b/WebCore/khtml/rendering/render_canvas.h
index 392ca87..6f942e7 100644
--- a/WebCore/khtml/rendering/render_canvas.h
+++ b/WebCore/khtml/rendering/render_canvas.h
@@ -88,6 +88,8 @@ public:
     int viewportWidth() const { return m_viewportWidth; }
     int viewportHeight() const { return m_viewportHeight; }
 
+    virtual void absoluteRects(QValueList<QRect>& rects, int _tx, int _ty);
+    
     QRect selectionRect() const;
     
     void setMaximalOutlineSize(int o) { m_maximalOutlineSize = o; }

-- 
WebKit Debian packaging