[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 f092e59b707201e18f1c47c2ae24dc7236551784
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 7 01:15:20 2004 +0000

    	Possible fix for table bugs 3510005 and 3492945, repainting glitches that occurred when table cells moved.
    
    	Fix for 33522497, empty AXElements appear in AXBrowser.
    
            Reviewed by darin
    
            * khtml/rendering/render_table.cpp:
            (RenderTableSection::layoutRows):
            (RenderTableCell::setWidth):
            * khtml/rendering/render_table.h:
    
            * kwq/KWQAccObject.mm:
            (-[KWQAccObject accessibilityIsIgnored]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5863 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 2089299..0d2484e 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,19 @@
+2004-01-06  David Hyatt  <hyatt at apple.com>
+
+	Possible fix for table bugs 3510005 and 3492945, repainting glitches that occurred when table cells moved.
+
+	Fix for 33522497, empty AXElements appear in AXBrowser.
+	
+        Reviewed by darin
+
+        * khtml/rendering/render_table.cpp:
+        (RenderTableSection::layoutRows):
+        (RenderTableCell::setWidth):
+        * khtml/rendering/render_table.h:
+
+        * kwq/KWQAccObject.mm:
+        (-[KWQAccObject accessibilityIsIgnored]):
+
 2004-01-06  John Sullivan  <sullivan at apple.com>
 
         - fixed <rdar://problem/3484465>: REGRESSION (118): button click does 
diff --git a/WebCore/khtml/rendering/render_table.cpp b/WebCore/khtml/rendering/render_table.cpp
index 7ad1edc..a4ce2a6 100644
--- a/WebCore/khtml/rendering/render_table.cpp
+++ b/WebCore/khtml/rendering/render_table.cpp
@@ -1376,7 +1376,7 @@ int RenderTableSection::layoutRows( int toAdd )
             // If the cell moved, we have to repaint it as well as any floating/positioned
             // descendants.  An exception is if we need a layout.  In this case, we know we're going to
             // repaint ourselves (and the cell) anyway.
-            if (!selfNeedsLayout() && checkForRepaintDuringLayout())
+            if (!table()->selfNeedsLayout() && checkForRepaintDuringLayout())
                 cell->repaintDuringLayoutIfMoved(oldCellX, oldCellY);
 #endif
         }
diff --git a/WebCore/khtml/rendering/render_table.h b/WebCore/khtml/rendering/render_table.h
index b4703e6..30ba12d 100644
--- a/WebCore/khtml/rendering/render_table.h
+++ b/WebCore/khtml/rendering/render_table.h
@@ -429,8 +429,6 @@ public:
     virtual bool isTableCol() const { return true; }
 
     virtual short lineHeight( bool ) const { return 0; }
-    virtual void position(int, int, int, int, int, bool, bool, int) {}
-    virtual void layout() {}
 
     virtual void updateFromElement();
 
diff --git a/WebCore/kwq/KWQAccObject.mm b/WebCore/kwq/KWQAccObject.mm
index 0dbf48d..3654632 100644
--- a/WebCore/kwq/KWQAccObject.mm
+++ b/WebCore/kwq/KWQAccObject.mm
@@ -48,6 +48,7 @@ using DOM::HTMLAnchorElementImpl;
 using khtml::RenderObject;
 using khtml::RenderWidget;
 using khtml::RenderCanvas;
+using khtml::RenderText;
 
 // FIXME: This will eventually need to really localize.
 #define UI_STRING(string, comment) ((NSString *)[NSString stringWithUTF8String:(string)])
@@ -349,11 +350,14 @@ static QRect boundingBoxRect(RenderObject* obj)
     if (!m_renderer || m_renderer->style()->visibility() != khtml::VISIBLE)
         return YES;
 
+    if (m_renderer->isText())
+        return static_cast<RenderText*>(m_renderer)->inlineTextBoxes().count() == 0;
+    
     if (m_renderer->element() && m_renderer->element()->hasAnchor())
         return NO;
-    
+
     return (!m_renderer->isCanvas() && 
-            !m_renderer->isImage() && !m_renderer->isText() &&
+            !m_renderer->isImage() &&
             !(m_renderer->element() && m_renderer->element()->isHTMLElement() &&
               Node(m_renderer->element()).elementId() == ID_BUTTON));
 }

-- 
WebKit Debian packaging