[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 2ded444bce8093d36db7cea9191976238dd96d3e
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 11 02:37:53 2010 +0000

    2010-11-10  Chris Guillory  <chris.guillory at google.com>
    
            Reviewed by Chris Fleizach.
    
            Use IAccessibleComparable to compare accessibility objects.
            https://bugs.webkit.org/show_bug.cgi?id=49118
    
            * platform/win/Skipped:
    2010-11-10  Chris Guillory  <chris.guillory at google.com>
    
            Reviewed by Chris Fleizach.
    
            Use IAccessibleComparable to compare accessibility objects.
            https://bugs.webkit.org/show_bug.cgi?id=49118
    
            * DumpRenderTree/AccessibilityUIElement.cpp:
            (AccessibilityUIElement::isEqual):
            * DumpRenderTree/AccessibilityUIElement.h:
            * DumpRenderTree/win/AccessibilityUIElementWin.cpp:
            (comparableObject):
            (AccessibilityUIElement::isEqual):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71792 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 89a53b7..6bde43d 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2010-11-10  Chris Guillory  <chris.guillory at google.com>
+
+        Reviewed by Chris Fleizach.
+
+        Use IAccessibleComparable to compare accessibility objects.
+        https://bugs.webkit.org/show_bug.cgi?id=49118
+
+        * platform/win/Skipped:
+
 2010-10-18  Martin Robinson  <mrobinson at igalia.com>
 
         Reviewed by Xan Lopez.
diff --git a/LayoutTests/platform/win/Skipped b/LayoutTests/platform/win/Skipped
index b59b5bf..3873b90 100644
--- a/LayoutTests/platform/win/Skipped
+++ b/LayoutTests/platform/win/Skipped
@@ -306,9 +306,6 @@ fast/events/dragging-mouse-moves.html
 # Crash beneath SocketStream::readStreamCallback http://webkit.org/b/44138
 http/tests/websocket/tests/workers/worker-handshake-challenge-randomness.html
 
-# http://webkit.org/b/46911
-accessibility/aria-hidden-update.html
-
 # Causes next test to time out http://webkit.org/b/46975
 http/tests/xmlhttprequest/xmlhttprequest-sync-vs-async-assertion-failure.html
 
@@ -481,7 +478,6 @@ accessibility/button-press-action.html
 accessibility/canvas.html
 accessibility/document-attributes.html
 accessibility/editable-webarea-context-menu-point.html
-accessibility/iframe-bastardization.html
 accessibility/ignore-spacer-elements.html
 accessibility/image-link.html
 accessibility/image-map1.html
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 5f69e85..fc667ef 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,17 @@
+2010-11-10  Chris Guillory  <chris.guillory at google.com>
+
+        Reviewed by Chris Fleizach.
+
+        Use IAccessibleComparable to compare accessibility objects.
+        https://bugs.webkit.org/show_bug.cgi?id=49118
+
+        * DumpRenderTree/AccessibilityUIElement.cpp:
+        (AccessibilityUIElement::isEqual):
+        * DumpRenderTree/AccessibilityUIElement.h:
+        * DumpRenderTree/win/AccessibilityUIElementWin.cpp:
+        (comparableObject):
+        (AccessibilityUIElement::isEqual):
+
 2010-11-10  Csaba Osztrogonác  <ossy at webkit.org>
 
         Reviewed by David Hyatt.
diff --git a/WebKitTools/DumpRenderTree/AccessibilityUIElement.cpp b/WebKitTools/DumpRenderTree/AccessibilityUIElement.cpp
index 87be335..4d0bfa8 100644
--- a/WebKitTools/DumpRenderTree/AccessibilityUIElement.cpp
+++ b/WebKitTools/DumpRenderTree/AccessibilityUIElement.cpp
@@ -787,6 +787,13 @@ unsigned AccessibilityUIElement::selectedChildrenCount() const { return 0; }
 AccessibilityUIElement AccessibilityUIElement::selectedChildAtIndex(unsigned) const { return 0; }
 #endif
 
+#if !PLATFORM(WIN)
+bool AccessibilityUIElement::isEqual(AccessibilityUIElement* otherElement)
+{
+    return platformUIElement() == otherElement->platformUIElement();
+}
+#endif
+
 #if !SUPPORTS_AX_TEXTMARKERS
 
 AccessibilityTextMarkerRange AccessibilityUIElement::textMarkerRangeForElement(AccessibilityUIElement*)
diff --git a/WebKitTools/DumpRenderTree/AccessibilityUIElement.h b/WebKitTools/DumpRenderTree/AccessibilityUIElement.h
index 3120e65..3eb396d 100644
--- a/WebKitTools/DumpRenderTree/AccessibilityUIElement.h
+++ b/WebKitTools/DumpRenderTree/AccessibilityUIElement.h
@@ -70,8 +70,8 @@ public:
 
     static JSObjectRef makeJSAccessibilityUIElement(JSContextRef, const AccessibilityUIElement&);
 
-    bool isEqual(AccessibilityUIElement* otherElement) { return platformUIElement() == otherElement->platformUIElement(); }
-    
+    bool isEqual(AccessibilityUIElement* otherElement);
+
     void getLinkedUIElements(Vector<AccessibilityUIElement>&);
     void getDocumentLinks(Vector<AccessibilityUIElement>&);
     void getChildren(Vector<AccessibilityUIElement>&);
diff --git a/WebKitTools/DumpRenderTree/win/AccessibilityUIElementWin.cpp b/WebKitTools/DumpRenderTree/win/AccessibilityUIElementWin.cpp
index 96937fd..5b771b2 100644
--- a/WebKitTools/DumpRenderTree/win/AccessibilityUIElementWin.cpp
+++ b/WebKitTools/DumpRenderTree/win/AccessibilityUIElementWin.cpp
@@ -35,6 +35,16 @@
 
 using std::wstring;
 
+static COMPtr<IAccessibleComparable> comparableObject(IAccessible* accessible)
+{
+    COMPtr<IServiceProvider> serviceProvider(Query, accessible);
+    if (!serviceProvider)
+        return 0;
+    COMPtr<IAccessibleComparable> comparable;
+    serviceProvider->QueryService(SID_AccessibleComparable, __uuidof(IAccessibleComparable), reinterpret_cast<void**>(&comparable));
+    return comparable;
+}
+
 AccessibilityUIElement::AccessibilityUIElement(PlatformUIElement element)
     : m_element(element)
 {
@@ -49,6 +59,18 @@ AccessibilityUIElement::~AccessibilityUIElement()
 {
 }
 
+bool AccessibilityUIElement::isEqual(AccessibilityUIElement* otherElement)
+{
+    COMPtr<IAccessibleComparable> comparable = comparableObject(m_element.get());
+    COMPtr<IAccessibleComparable> otherComparable = comparableObject(otherElement->m_element.get());
+    if (!comparable || !otherComparable)
+        return false;
+    BOOL isSame = FALSE;
+    if (FAILED(comparable->isSameObject(otherComparable.get(), &isSame)))
+        return false;
+    return isSame;
+}
+
 void AccessibilityUIElement::getLinkedUIElements(Vector<AccessibilityUIElement>&)
 {
 }

-- 
WebKit Debian packaging