rpms/kdelibs/devel kdelibs-3.5.4-kde#90462.patch, NONE, 1.1 kdelibs.spec, 1.170, 1.171

[fedora-cvs-commits at redhat.com]

Author: than

Update of /cvs/dist/rpms/kdelibs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20780

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-3.5.4-kde#90462.patch 
Log Message:
fix kde#90462, konqueror crash while rendering in khtml


kdelibs-3.5.4-kde#90462.patch:
 render_table.cpp |   12 ++++++++++++
 render_table.h   |    2 ++
 2 files changed, 14 insertions(+)

--- NEW FILE kdelibs-3.5.4-kde#90462.patch ---
Index: khtml/rendering/render_table.h
===================================================================
--- khtml/rendering/render_table.h	(Revision 570647)
+++ khtml/rendering/render_table.h	(Revision 570648)
@@ -306,6 +306,8 @@
 
     virtual void layout();
 
+    virtual RenderObject* removeChildNode(RenderObject* child);
+
     // The only time rows get a layer is when they have transparency.
     virtual bool requiresLayer() const { return /* style()->opacity() < 1.0f; */ false ; }
     virtual void paint(PaintInfo& i, int tx, int ty);
Index: khtml/rendering/render_table.cpp
===================================================================
--- khtml/rendering/render_table.cpp	(Revision 570647)
+++ khtml/rendering/render_table.cpp	(Revision 570648)
@@ -1984,6 +1984,15 @@
     setInline(false);   // our object is not Inline
 }
 
+RenderObject* RenderTableRow::removeChildNode(RenderObject* child)
+{
+    RenderTableSection *s = section();
+    if (s)
+        s->setNeedCellRecalc();
+
+    return RenderContainer::removeChildNode( child );
+}
+
 void RenderTableRow::detach()
 {
     RenderTableSection *s = section();
@@ -2235,6 +2244,9 @@
     kdDebug( 6040 ) << renderName() << "(TableCell)::calcMinMaxWidth() known=" << minMaxKnown() << endl;
 #endif
 
+    if (section()->needCellRecalc)
+        section()->recalcCells();
+
     RenderBlock::calcMinMaxWidth();
     if (element() && style()->whiteSpace() == NORMAL) {
         // See if nowrap was set.


Index: kdelibs.spec
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- kdelibs.spec	23 Aug 2006 13:54:42 -0000	1.170
+++ kdelibs.spec	1 Sep 2006 13:36:08 -0000	1.171
@@ -50,6 +50,7 @@
 Patch100: kdelibs-3.5.4-kde#131933.patch
 Patch101: kdelibs-3.5.4-kde#131366.patch
 Patch102: kdelibs-3.5.4-kde#106812.patch
+Patch103: kdelibs-3.5.4-kde#90462.patch
 
 %if %{arts}
 Requires: arts >= %{arts_epoch}:%{arts_version}
@@ -182,6 +183,7 @@
 %patch100 -p0 -b .kde#131933
 %patch101 -p0 -b .kde#131366
 %patch102 -p0 -b .kde#106812
+%patch103 -p0 -b .kde#90462
 
 perl -pi -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
 
@@ -413,6 +415,7 @@
    fix kde#131366, Padding-bottom and padding-top not applied to inline elements
    fix kde#131933, crash when pressing enter inside a doxygen comment block
    fix kde#106812, text-align of tables should only be reset in quirk mode
+   fix kde#90462, konqueror crash while rendering in khtml
 
 * Tue Aug 08 2006 Than Ngo <than at redhat.com> 6:3.5.4-2
 - add BR on gettext, cups