2011-04-06 Mario Sanchez Prada <msanchez@igalia.com>

        Reviewed by Chris Fleizach.

        [GTK] Do not reference AccessibilityRenderObject from platform dependent code
        https://bugs.webkit.org/show_bug.cgi?id=57955

        Do not reference AccessibilityRenderObject from platform specific code

        Added new virtual functions to AccessibilityObject.h and removed
        explicit references to AccessibilityRenderObject from GTK code.

        * accessibility/AccessibilityObject.h:
        (WebCore::AccessibilityObject::renderer): New virtual method,
        returning 0 by default. Overriden by AccessibilityRenderObject.
        (WebCore::AccessibilityObject::correspondingLabelForControlElement):
        New virtual method, returning 0 by default. It complements the
        already present method correspondingControlForLabelElement().

        * accessibility/AccessibilityRenderObject.h:
        (WebCore::AccessibilityRenderObject::renderer): Made virtual.

        * accessibility/gtk/AXObjectCacheAtk.cpp:
        (WebCore::emitTextChanged): Reference  AccessibilityObject,
        instead of AccessibilityRenderObject.
        (WebCore::AXObjectCache::nodeTextChangePlatformNotification):
        Ditto.

        * accessibility/gtk/AccessibilityObjectWrapperAtk.cpp:
        (webkit_accessible_get_name): Do not reference
        AccessibilityRenderObject.
        (webkit_accessible_get_description): Ditto.
        (setAtkRelationSetFromCoreObject): Ditto.
        (optionFromList): Ditto.
        (optionFromSelection): Ditto.
        (webkit_accessible_selection_clear_selection): Ditto.
        (webkit_accessible_selection_get_selection_count): Ditto.
        (webkit_accessible_selection_select_all_selection): Ditto.
        (textForObject): Ditto.
        (webkit_accessible_text_get_text): Ditto.
        (getPangoLayoutForAtk): Ditto.
        (webkit_accessible_text_get_caret_offset): Ditto.
        (baselinePositionForRenderObject): Ditto.
        (getAttributeSetForAccessibilityObject): Ditto.
        (accessibilityObjectLength): Ditto.
        (getSelectionOffsetsForObject): Ditto.
        (webkit_accessible_text_set_selection): Ditto.
        (webkit_accessible_text_set_caret_offset): Ditto.
        (webkit_accessible_table_get_caption): Ditto.
        (getInterfaceMaskFromObject): Ditto.

        * accessibility/gtk/WebKitAccessibleHyperlink.cpp:
        (getRangeLengthForObject): Ditto.

        Removed unused renderer() method from AccessibilityMenuList.

        * accessibility/AccessibilityMenuList.h: Removed unused method.
        * accessibility/AccessibilityMenuList.cpp: Removed unused method.

git-svn-id: svn://svn.chromium.org/blink/trunk@83064 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/Source/WebCore/ChangeLog

+2011-04-06  Mario Sanchez Prada  <msanchez@igalia.com>
+
+        Reviewed by Chris Fleizach.
+
+        [GTK] Do not reference AccessibilityRenderObject from platform dependent code
+        https://bugs.webkit.org/show_bug.cgi?id=57955
+
+        Do not reference AccessibilityRenderObject from platform specific code
+
+        Added new virtual functions to AccessibilityObject.h and removed
+        explicit references to AccessibilityRenderObject from GTK code.
+
+        * accessibility/AccessibilityObject.h:
+        (WebCore::AccessibilityObject::renderer): New virtual method,
+        returning 0 by default. Overriden by AccessibilityRenderObject.
+        (WebCore::AccessibilityObject::correspondingLabelForControlElement):
+        New virtual method, returning 0 by default. It complements the
+        already present method correspondingControlForLabelElement().
+
+        * accessibility/AccessibilityRenderObject.h:
+        (WebCore::AccessibilityRenderObject::renderer): Made virtual.
+
+        * accessibility/gtk/AXObjectCacheAtk.cpp:
+        (WebCore::emitTextChanged): Reference  AccessibilityObject,
+        instead of AccessibilityRenderObject.
+        (WebCore::AXObjectCache::nodeTextChangePlatformNotification):
+        Ditto.
+
+        * accessibility/gtk/AccessibilityObjectWrapperAtk.cpp:
+        (webkit_accessible_get_name): Do not reference
+        AccessibilityRenderObject.
+        (webkit_accessible_get_description): Ditto.
+        (setAtkRelationSetFromCoreObject): Ditto.
+        (optionFromList): Ditto.
+        (optionFromSelection): Ditto.
+        (webkit_accessible_selection_clear_selection): Ditto.
+        (webkit_accessible_selection_get_selection_count): Ditto.
+        (webkit_accessible_selection_select_all_selection): Ditto.
+        (textForObject): Ditto.
+        (webkit_accessible_text_get_text): Ditto.
+        (getPangoLayoutForAtk): Ditto.
+        (webkit_accessible_text_get_caret_offset): Ditto.
+        (baselinePositionForRenderObject): Ditto.
+        (getAttributeSetForAccessibilityObject): Ditto.
+        (accessibilityObjectLength): Ditto.
+        (getSelectionOffsetsForObject): Ditto.
+        (webkit_accessible_text_set_selection): Ditto.
+        (webkit_accessible_text_set_caret_offset): Ditto.
+        (webkit_accessible_table_get_caption): Ditto.
+        (getInterfaceMaskFromObject): Ditto.
+
+        * accessibility/gtk/WebKitAccessibleHyperlink.cpp:
+        (getRangeLengthForObject): Ditto.
+
+        Removed unused renderer() method from AccessibilityMenuList.
+
+        * accessibility/AccessibilityMenuList.h: Removed unused method.
+        * accessibility/AccessibilityMenuList.cpp: Removed unused method.
+
 2011-04-06  Alexander Pavlov  <apavlov@chromium.org>
 
         Reviewed by Pavel Feldman.

third_party/WebKit/Source/WebCore/accessibility/AccessibilityMenuList.cpp

@@ -37,11 +37,6 @@ AccessibilityMenuList::AccessibilityMenuList(RenderMenuList* renderer)
 {
 }
 
-RenderMenuList* AccessibilityMenuList::renderer() const
-{
-    return toRenderMenuList(AccessibilityRenderObject::renderer());
-}
-
 bool AccessibilityMenuList::press() const
 {
     RenderMenuList* menuList = static_cast<RenderMenuList*>(m_renderer);

third_party/WebKit/Source/WebCore/accessibility/AccessibilityMenuList.h

@@ -42,8 +42,6 @@ public:
     virtual bool isCollapsed() const;
     virtual bool press() const;
 
-    RenderMenuList* renderer() const;
-
 private:
     AccessibilityMenuList(RenderMenuList*);
 

third_party/WebKit/Source/WebCore/accessibility/AccessibilityObject.h

@@ -353,6 +353,7 @@ public:
     virtual void setAccessibleName(String&) { }
     
     virtual Node* node() const { return 0; }
+    virtual RenderObject* renderer() const { return 0; }
     virtual bool accessibilityIsIgnored() const  { return true; }
 
     virtual int headingLevel() const { return 0; }
@@ -404,6 +405,7 @@ public:
     virtual void linkedUIElements(AccessibilityChildrenVector&) const { }
     virtual AccessibilityObject* titleUIElement() const { return 0; }
     virtual bool exposesTitleUIElement() const { return true; }
+    virtual AccessibilityObject* correspondingLabelForControlElement() const { return 0; }
     virtual AccessibilityObject* correspondingControlForLabelElement() const { return 0; }
     virtual AccessibilityObject* scrollBar(AccessibilityOrientation) const { return 0; }
     

third_party/WebKit/Source/WebCore/accessibility/AccessibilityRenderObject.h

@@ -161,7 +161,7 @@ public:
     virtual IntPoint clickPoint() const;
     
     void setRenderer(RenderObject* renderer) { m_renderer = renderer; }
-    RenderObject* renderer() const { return m_renderer; }
+    virtual RenderObject* renderer() const { return m_renderer; }
     RenderBoxModelObject* renderBoxModelObject() const;
     virtual Node* node() const;
 

third_party/WebKit/Source/WebCore/accessibility/gtk/AXObjectCacheAtk.cpp

@@ -22,7 +22,6 @@
 
 #include "AccessibilityObject.h"
 #include "AccessibilityObjectWrapperAtk.h"
-#include "AccessibilityRenderObject.h"
 #include "GOwnPtr.h"
 #include "Range.h"
 #include "SelectElement.h"
@@ -157,7 +156,7 @@ void AXObjectCache::postPlatformNotification(AccessibilityObject* coreObject, AX
     }
 }
 
-static void emitTextChanged(AccessibilityRenderObject* object, AXObjectCache::AXTextChange textChange, unsigned offset, unsigned count)
+static void emitTextChanged(AccessibilityObject* object, AXObjectCache::AXTextChange textChange, unsigned offset, unsigned count)
 {
     // Get the axObject for the parent object
     AtkObject* wrapper = object->parentObjectUnignored()->wrapper();
@@ -187,7 +186,7 @@ void AXObjectCache::nodeTextChangePlatformNotification(AccessibilityObject* obje
 
     Node* node = object->node();
     RefPtr<Range> range = Range::create(node->document(),  Position(node->parentNode(), 0), Position(node, 0));
-    emitTextChanged(toAccessibilityRenderObject(object), textChange, offset + TextIterator::rangeLength(range.get()), count);
+    emitTextChanged(object, textChange, offset + TextIterator::rangeLength(range.get()), count);
 }
 
 void AXObjectCache::handleFocusedUIElementChanged(RenderObject* oldFocusedRender, RenderObject* newFocusedRender)

third_party/WebKit/Source/WebCore/accessibility/gtk/WebKitAccessibleHyperlink.cpp

@@ -25,7 +25,6 @@
 #include "AXObjectCache.h"
 #include "AccessibilityObject.h"
 #include "AccessibilityObjectWrapperAtk.h"
-#include "AccessibilityRenderObject.h"
 #include "NotImplemented.h"
 #include "Position.h"
 #include "Range.h"
@@ -215,7 +214,7 @@ static gint getRangeLengthForObject(AccessibilityObject* obj, Range* range)
     if (!markerObj)
         return baseLength;
 
-    RenderObject* renderer = static_cast<const AccessibilityRenderObject*>(markerObj)->renderer();
+    RenderObject* renderer = markerObj->renderer();
     if (!renderer || !renderer->isListMarker())
         return baseLength;