Changeset 89609 in webkit

Timestamp:

Jun 23, 2011 1:24:55 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-06-23 Sheriff Bot <​webkit.review.bot@gmail.com>

Unreviewed, rolling out r89591 and r89593.
​http://trac.webkit.org/changeset/89591
​http://trac.webkit.org/changeset/89593
​https://bugs.webkit.org/show_bug.cgi?id=63279

Caused test crashes in SL and Chromium (Requested by dimich_
on #webkit).

• platform/mac/accessibility/aria-liveregion-without-element-access-expected.txt: Removed.
• platform/mac/accessibility/aria-liveregion-without-element-access.html: Removed.

2011-06-23 Sheriff Bot <​webkit.review.bot@gmail.com>

Unreviewed, rolling out r89591 and r89593.
​http://trac.webkit.org/changeset/89591
​http://trac.webkit.org/changeset/89593
​https://bugs.webkit.org/show_bug.cgi?id=63279

Caused test crashes in SL and Chromium (Requested by dimich_
on #webkit).

• accessibility/AXObjectCache.cpp: (WebCore::AXObjectCache::AXObjectCache): (WebCore::AXObjectCache::remove): (WebCore::AXObjectCache::childrenChanged):
• accessibility/AXObjectCache.h:
• accessibility/AccessibilityMenuList.cpp: (WebCore::AccessibilityMenuList::childrenChanged):
• accessibility/AccessibilityMenuList.h:
• accessibility/AccessibilityMenuListPopup.cpp: (WebCore::AccessibilityMenuListPopup::childrenChanged):
• accessibility/AccessibilityMenuListPopup.h:
• accessibility/AccessibilityObject.h: (WebCore::AccessibilityObject::childrenChanged):
• accessibility/AccessibilityRenderObject.cpp: (WebCore::startOfContinuations): (WebCore::AccessibilityRenderObject::updateAccessibilityRole): (WebCore::AccessibilityRenderObject::childrenChanged):
• accessibility/AccessibilityRenderObject.h:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac/accessibility/aria-liveregion-without-element-access-expected.txt (deleted)
• LayoutTests/platform/mac/accessibility/aria-liveregion-without-element-access.html (deleted)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/accessibility/AXObjectCache.cpp (modified) (4 diffs)
• Source/WebCore/accessibility/AXObjectCache.h (modified) (1 diff)
• Source/WebCore/accessibility/AccessibilityMenuList.cpp (modified) (2 diffs)
• Source/WebCore/accessibility/AccessibilityMenuList.h (modified) (1 diff)
• Source/WebCore/accessibility/AccessibilityMenuListPopup.cpp (modified) (1 diff)
• Source/WebCore/accessibility/AccessibilityMenuListPopup.h (modified) (1 diff)
• Source/WebCore/accessibility/AccessibilityObject.h (modified) (1 diff)
• Source/WebCore/accessibility/AccessibilityRenderObject.cpp (modified) (4 diffs)
• Source/WebCore/accessibility/AccessibilityRenderObject.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-06-23  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r89591 and r89593.
+        http://trac.webkit.org/changeset/89591
+        http://trac.webkit.org/changeset/89593
+        https://bugs.webkit.org/show_bug.cgi?id=63279
+
+        Caused test crashes in SL and Chromium (Requested by dimich_
+        on #webkit).
+
+        * platform/mac/accessibility/aria-liveregion-without-element-access-expected.txt: Removed.
+        * platform/mac/accessibility/aria-liveregion-without-element-access.html: Removed.
+
 2011-06-23  Eric Carlson  <eric.carlson@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-23  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r89591 and r89593.
+        http://trac.webkit.org/changeset/89591
+        http://trac.webkit.org/changeset/89593
+        https://bugs.webkit.org/show_bug.cgi?id=63279
+
+        Caused test crashes in SL and Chromium (Requested by dimich_
+        on #webkit).
+
+        * accessibility/AXObjectCache.cpp:
+        (WebCore::AXObjectCache::AXObjectCache):
+        (WebCore::AXObjectCache::remove):
+        (WebCore::AXObjectCache::childrenChanged):
+        * accessibility/AXObjectCache.h:
+        * accessibility/AccessibilityMenuList.cpp:
+        (WebCore::AccessibilityMenuList::childrenChanged):
+        * accessibility/AccessibilityMenuList.h:
+        * accessibility/AccessibilityMenuListPopup.cpp:
+        (WebCore::AccessibilityMenuListPopup::childrenChanged):
+        * accessibility/AccessibilityMenuListPopup.h:
+        * accessibility/AccessibilityObject.h:
+        (WebCore::AccessibilityObject::childrenChanged):
+        * accessibility/AccessibilityRenderObject.cpp:
+        (WebCore::startOfContinuations):
+        (WebCore::AccessibilityRenderObject::updateAccessibilityRole):
+        (WebCore::AccessibilityRenderObject::childrenChanged):
+        * accessibility/AccessibilityRenderObject.h:
+
 2011-06-23  Andreas Kling  <kling@webkit.org>
 

trunk/Source/WebCore/accessibility/AXObjectCache.cpp

@@ -83 +83 @@
 AXObjectCache::AXObjectCache(const Document* doc)
     : m_notificationPostTimer(this, &AXObjectCache::notificationPostTimerFired)
-    , m_childrenUpdateTimer(this, &AXObjectCache::childrenUpdateTimerFired)
 {
     m_document = const_cast<Document*>(doc);
@@ -369 +368 @@
     remove(axID);
     m_renderObjectMapping.remove(renderer);
-    m_childrenToUpdate.remove(renderer);
 }
 
@@ -439 +437 @@
 }
 #endif
-    
-void AXObjectCache::childrenUpdateTimerFired(Timer<AXObjectCache>*)
-{
-    if (m_childrenToUpdate.isEmpty())
-        return;
-    
-    // Make a local copy in case childrenChanged() alters m_childrenToUpdate 
-    // (which might happen if the client asks to update the render tree).
-    HashSet<RenderObject*> updateChildren;
-    m_childrenToUpdate.swap(updateChildren);
-    m_childrenToUpdate.clear();
-    
-    HashSet<RenderObject*>::iterator end = updateChildren.end();
-    for (HashSet<RenderObject*>::iterator it = updateChildren.begin(); it != end; ++it) {
-        if (AccessibilityObject* object = getOrCreate(*it))
-            object->childrenChanged(AccessibilityObject::CreateParentObjects);
-    }    
-}
 
 void AXObjectCache::childrenChanged(RenderObject* renderer)
@@ -464 +444 @@
  
     AXID axID = m_renderObjectMapping.get(renderer);
-    if (!axID) {
-        // If there's no AX object, creating one right now can be dangerous (because we're in the middle of adding/destroying a tree).
-        // Instead the update should be postponed and updated later.
-        m_childrenToUpdate.add(renderer);
-        if (!m_childrenUpdateTimer.isActive())
-            m_childrenUpdateTimer.startOneShot(0);
-    } else {
-        if (AccessibilityObject* object = m_objects.get(axID).get())
-            object->childrenChanged(AccessibilityObject::DoNotCreateParentObjects);
-    }
+    if (!axID)
+        return;
+    
+    AccessibilityObject* obj = m_objects.get(axID).get();
+    if (obj)
+        obj->childrenChanged();
 }
     

trunk/Source/WebCore/accessibility/AXObjectCache.h

@@ -167 +167 @@
     Vector<pair<RefPtr<AccessibilityObject>, AXNotification> > m_notificationsToPost;
     void notificationPostTimerFired(Timer<AXObjectCache>*);
-
-    Timer<AXObjectCache> m_childrenUpdateTimer;
-    HashSet<RenderObject*> m_childrenToUpdate;
-    void childrenUpdateTimerFired(Timer<AXObjectCache>*);
-
+    
     static AccessibilityObject* focusedImageMapUIElement(HTMLAreaElement*);
     

trunk/Source/WebCore/accessibility/AccessibilityMenuList.cpp

@@ -69 +69 @@
 }
 
-void AccessibilityMenuList::childrenChanged(ChildrenChangeOptions options)
+void AccessibilityMenuList::childrenChanged()
 {
     if (m_children.isEmpty())
@@ -75 +75 @@
 
     ASSERT(m_children.size() == 1);
-    m_children[0]->childrenChanged(options);
+    m_children[0]->childrenChanged();
 }
 

trunk/Source/WebCore/accessibility/AccessibilityMenuList.h

@@ -52 +52 @@
 
     virtual void addChildren();
-    virtual void childrenChanged(ChildrenChangeOptions);
+    virtual void childrenChanged();
 };
 

trunk/Source/WebCore/accessibility/AccessibilityMenuListPopup.cpp

@@ -106 +106 @@
 }
 
-void AccessibilityMenuListPopup::childrenChanged(ChildrenChangeOptions)
+void AccessibilityMenuListPopup::childrenChanged()
 {
     for (size_t i = m_children.size(); i > 0 ; --i) {

trunk/Source/WebCore/accessibility/AccessibilityMenuListPopup.h

@@ -57 +57 @@
     virtual bool press() const;
     virtual void addChildren();
-    virtual void childrenChanged(ChildrenChangeOptions);
+    virtual void childrenChanged();
 
     AccessibilityMenuListOption* menuListOptionAccessibilityObject(HTMLElement*) const;

trunk/Source/WebCore/accessibility/AccessibilityObject.h

@@ -465 +465 @@
     virtual void decrement() { }
 
-    enum ChildrenChangeOptions { DoNotCreateParentObjects, CreateParentObjects };
-    virtual void childrenChanged(ChildrenChangeOptions) { }
+    virtual void childrenChanged() { }
     virtual void contentChanged() { }
     virtual const AccessibilityChildrenVector& children() { return m_children; }

trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp

@@ -223 +223 @@
 static inline RenderInline* startOfContinuations(RenderObject* r)
 {
-    if (r->isInlineElementContinuation() && r->node()->renderer() && r->isRenderInline())
+    if (r->isInlineElementContinuation())
         return toRenderInline(r->node()->renderer());
 
@@ -3031 +3031 @@
     // The AX hierarchy only needs to be updated if the ignored status of an element has changed.
     if (ignoredStatus != accessibilityIsIgnored())
-        childrenChanged(DoNotCreateParentObjects);
+        childrenChanged();
 }
     
@@ -3308 +3308 @@
 }
     
-void AccessibilityRenderObject::childrenChanged(ChildrenChangeOptions options)
+void AccessibilityRenderObject::childrenChanged()
 {
     // This method is meant as a quick way of marking a portion of the accessibility tree dirty.
@@ -3320 +3320 @@
     // If AX elements are created now, they could interrogate the render tree while it's in a funky state.
     // At the same time, process ARIA live region changes.
-    for (AccessibilityObject* parent = this; parent; parent = (options == CreateParentObjects) ? parent->parentObject() : parent->parentObjectIfExists()) {
+    for (AccessibilityObject* parent = this; parent; parent = parent->parentObjectIfExists()) {
         if (!parent->isAccessibilityRenderObject())
             continue;

trunk/Source/WebCore/accessibility/AccessibilityRenderObject.h

@@ -208 +208 @@
     
     virtual void detach();
-    virtual void childrenChanged(ChildrenChangeOptions);
+    virtual void childrenChanged();
     virtual void contentChanged();
     virtual void addChildren();