[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 ce3d7e1253f0d7508a30cd43a90d57e07c692f6a
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Sep 13 22:59:52 2010 +0000

    2010-09-13  Chris Guillory  <chris.guillory at google.com>
    
            Reviewed by Chris Fleizach.
    
            WebAccessibilityCacheImpl needs to handle invalid accessibility object ids.
            https://bugs.webkit.org/show_bug.cgi?id=45572
    
            * public/WebAccessibilityObject.h:
            * src/WebAccessibilityCacheImpl.cpp:
            (WebKit::WebAccessibilityCacheImpl::addOrGetId):
            * src/WebAccessibilityObject.cpp:
            (WebKit::WebAccessibilityObject::isAxObjectIdValid):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67418 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index a7ef85b..373e1c3 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,16 @@
+2010-09-13  Chris Guillory  <chris.guillory at google.com>
+
+        Reviewed by Chris Fleizach.
+
+        WebAccessibilityCacheImpl needs to handle invalid accessibility object ids.
+        https://bugs.webkit.org/show_bug.cgi?id=45572
+
+        * public/WebAccessibilityObject.h:
+        * src/WebAccessibilityCacheImpl.cpp:
+        (WebKit::WebAccessibilityCacheImpl::addOrGetId):
+        * src/WebAccessibilityObject.cpp:
+        (WebKit::WebAccessibilityObject::isAxObjectIdValid):
+
 2010-09-13  Pavel Podivilov  <podivilov at chromium.org>
 
         Reviewed by Dimitri Glazkov.
diff --git a/WebKit/chromium/public/WebAccessibilityObject.h b/WebKit/chromium/public/WebAccessibilityObject.h
index 6b55376..f7c93f2 100644
--- a/WebKit/chromium/public/WebAccessibilityObject.h
+++ b/WebKit/chromium/public/WebAccessibilityObject.h
@@ -70,6 +70,7 @@ public:
     WEBKIT_API WebString actionVerb() const;
     WEBKIT_API bool canSetFocusAttribute() const;
     WEBKIT_API bool canSetValueAttribute() const;
+    WEBKIT_API bool isValid() const;
 
     WEBKIT_API unsigned childCount() const;
 
diff --git a/WebKit/chromium/src/WebAccessibilityCacheImpl.cpp b/WebKit/chromium/src/WebAccessibilityCacheImpl.cpp
index abb63cc..8304878 100644
--- a/WebKit/chromium/src/WebAccessibilityCacheImpl.cpp
+++ b/WebKit/chromium/src/WebAccessibilityCacheImpl.cpp
@@ -63,7 +63,6 @@ WebAccessibilityCache* WebAccessibilityCache::create()
 
 PassRefPtr<WebAccessibilityCacheImpl::WeakHandle> WebAccessibilityCacheImpl::WeakHandle::create(AccessibilityObject* object)
 {
-    // FIXME: Remove resetting ref-count from AccessibilityObjectWrapper
     RefPtr<WebAccessibilityCacheImpl::WeakHandle> weakHandle = adoptRef(new WebAccessibilityCacheImpl::WeakHandle(object));
     weakHandle->m_object->setWrapper(weakHandle.get());
     
@@ -149,7 +148,7 @@ void WebAccessibilityCacheImpl::clear()
 
 int WebAccessibilityCacheImpl::addOrGetId(const WebAccessibilityObject& object)
 {
-    if (object.isNull())
+    if (!object.isValid())
         return invalidObjectId;
 
     RefPtr<AccessibilityObject> o = toAccessibilityObject(object);
diff --git a/WebKit/chromium/src/WebAccessibilityObject.cpp b/WebKit/chromium/src/WebAccessibilityObject.cpp
index 3a3e94b..96a3173 100644
--- a/WebKit/chromium/src/WebAccessibilityObject.cpp
+++ b/WebKit/chromium/src/WebAccessibilityObject.cpp
@@ -101,6 +101,15 @@ bool WebAccessibilityObject::canSetValueAttribute() const
     return m_private->canSetValueAttribute();
 }
 
+bool WebAccessibilityObject::isValid() const
+{
+    if (!m_private)
+        return false;
+
+    m_private->updateBackingStore();
+    return m_private->axObjectID();
+}
+
 unsigned WebAccessibilityObject::childCount() const
 {
     if (!m_private)

-- 
WebKit Debian packaging