Merge 67418 - 2010-09-13 Chris Guillory <chris.guillory@google.com>...

WebKit/chromium/src/WebAccessibilityCacheImpl.cpp

Index: WebKit/chromium/src/WebAccessibilityCacheImpl.cpp
===================================================================
--- WebKit/chromium/src/WebAccessibilityCacheImpl.cpp	(revision 67507)
+++ WebKit/chromium/src/WebAccessibilityCacheImpl.cpp	(working copy)
@@ -63,7 +63,6 @@
 
 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 @@
 
 int WebAccessibilityCacheImpl::addOrGetId(const WebAccessibilityObject& object)
 {
-    if (object.isNull())
+    if (!object.isValid())
         return invalidObjectId;
 
     RefPtr<AccessibilityObject> o = toAccessibilityObject(object);