Title: [97539] trunk/Source/WebCore
Revision
97539
Author
[email protected]
Date
2011-10-14 22:45:09 -0700 (Fri, 14 Oct 2011)

Log Message

GTK build fix after r97533.

* accessibility/gtk/AXObjectCacheAtk.cpp:
(WebCore::notifyChildrenSelectionChange):
* accessibility/gtk/AccessibilityObjectWrapperAtk.cpp:
(optionFromSelection):
(webkit_accessible_selection_get_selection_count):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (97538 => 97539)


--- trunk/Source/WebCore/ChangeLog	2011-10-15 04:37:31 UTC (rev 97538)
+++ trunk/Source/WebCore/ChangeLog	2011-10-15 05:45:09 UTC (rev 97539)
@@ -1,3 +1,13 @@
+2011-10-14  Ryosuke Niwa  <[email protected]>
+
+        GTK build fix after r97533.
+
+        * accessibility/gtk/AXObjectCacheAtk.cpp:
+        (WebCore::notifyChildrenSelectionChange):
+        * accessibility/gtk/AccessibilityObjectWrapperAtk.cpp:
+        (optionFromSelection):
+        (webkit_accessible_selection_get_selection_count):
+
 2011-10-14  David Kilzer  <[email protected]>
 
         <http://webkit.org/b/70158> Fix clang compiler warnings

Modified: trunk/Source/WebCore/accessibility/gtk/AXObjectCacheAtk.cpp (97538 => 97539)


--- trunk/Source/WebCore/accessibility/gtk/AXObjectCacheAtk.cpp	2011-10-15 04:37:31 UTC (rev 97538)
+++ trunk/Source/WebCore/accessibility/gtk/AXObjectCacheAtk.cpp	2011-10-15 05:45:09 UTC (rev 97539)
@@ -84,7 +84,7 @@
     g_signal_emit_by_name(object->wrapper(), "selection-changed");
 
     // Find the item where the selection change was triggered from.
-    HTMLSelectElement* select = toSelectElement(static_cast<Element*>(object->node()));
+    HTMLSelectElement* select = toHTMLSelectElement(object->node());
     if (!select)
         return;
     int changedItemIndex = select->activeSelectionStartListIndex();

Modified: trunk/Source/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp (97538 => 97539)


--- trunk/Source/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp	2011-10-15 04:37:31 UTC (rev 97538)
+++ trunk/Source/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp	2011-10-15 05:45:09 UTC (rev 97539)
@@ -962,7 +962,7 @@
         if (!renderer)
             return 0;
 
-        HTMLSelectElement* selectNode = toSelectElement(static_cast<Element*>(renderer->node()));
+        HTMLSelectElement* selectNode = toHTMLSelectElement(renderer->node());
         int selectedIndex = selectNode->selectedIndex();
         const Vector<HTMLElement*> listItems = selectNode->listItems();
 
@@ -1039,11 +1039,8 @@
         if (!renderer)
             return 0;
 
-        HTMLSelectElement* selectNode = toSelectElement(static_cast<Element*>(renderer->node()));
-        int selectedIndex = selectNode->selectedIndex();
-        const Vector<HTMLElement*> listItems = selectNode->listItems();
-
-        return selectedIndex >= 0 && selectedIndex < static_cast<int>(listItems.size());
+        int selectedIndex = toHTMLSelectElement(renderer->node())->selectedIndex();
+        return selectedIndex >= 0 && selectedIndex < static_cast<int>(toHTMLSelectElement(renderer->node())->listItems().size());
     }
 
     return 0;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to