[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 5b451f9e26be2291caca561635c4435e7bd09e60
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 28 21:22:32 2004 +0000

    	Fix for 3537694, make blocks for parents of inline children be axobjects.
    
            Reviewed by kocienda
    
            * kwq/KWQAccObject.mm:
            (-[KWQAccObject role]):
            (-[KWQAccObject accessibilityIsIgnored]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6000 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index b8ab7bf..3547f3f 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,15 @@
 2004-01-28  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3537694, make blocks for parents of inline children be axobjects.
+	
+        Reviewed by kocienda
+
+        * kwq/KWQAccObject.mm:
+        (-[KWQAccObject role]):
+        (-[KWQAccObject accessibilityIsIgnored]):
+
+2004-01-28  David Hyatt  <hyatt at apple.com>
+
 	Make AtomicString a new class that owns DOMStrings, instead of using KJS::Identifier.  One day when we
 	convert DOMString and UString to have the same underlying rep, then these classes could possibly re-merge.
 	For now this provides an easy migration path for all the code that is using DOMStringImpl*.
diff --git a/WebCore/kwq/KWQAccObject.mm b/WebCore/kwq/KWQAccObject.mm
index 7190638..62e6225 100644
--- a/WebCore/kwq/KWQAccObject.mm
+++ b/WebCore/kwq/KWQAccObject.mm
@@ -49,6 +49,7 @@ using khtml::RenderObject;
 using khtml::RenderWidget;
 using khtml::RenderCanvas;
 using khtml::RenderText;
+using khtml::RenderBlock;
 
 // FIXME: This will eventually need to really localize.
 #define UI_STRING(string, comment) ((NSString *)[NSString stringWithUTF8String:(string)])
@@ -190,7 +191,7 @@ using khtml::RenderText;
         return NSAccessibilityStaticTextRole;
     if (m_renderer->isImage())
        return NSAccessibilityImageRole;
-    if (m_renderer->isCanvas())
+    if (m_renderer->isBlockFlow())
         return NSAccessibilityGroupRole;
     
     return NSAccessibilityUnknownRole;
@@ -351,11 +352,14 @@ static QRect boundingBoxRect(RenderObject* obj)
         return YES;
 
     if (m_renderer->isText())
-        return !static_cast<RenderText*>(m_renderer)->firstTextBox();
+        return !m_renderer->isBR() && !static_cast<RenderText*>(m_renderer)->firstTextBox();
     
     if (m_renderer->element() && m_renderer->element()->hasAnchor())
         return NO;
 
+    if (m_renderer->isBlockFlow() && m_renderer->childrenInline())
+        return !static_cast<RenderBlock*>(m_renderer)->firstLineBox();
+
     return (!m_renderer->isCanvas() && 
             !m_renderer->isImage() &&
             !(m_renderer->element() && m_renderer->element()->isHTMLElement() &&

-- 
WebKit Debian packaging