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

WebKit/chromium/src/WebAccessibilityCacheImpl.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 45 matching lines @@
 
 WebAccessibilityCache* WebAccessibilityCache::create()
 {
     return new WebAccessibilityCacheImpl();
 }
 
 // WeakHandle -------------------------------------------------------------
 
 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());
     
     return weakHandle.release();
 }
 
 WebAccessibilityCacheImpl::WeakHandle::WeakHandle(AccessibilityObject* object)
     : AccessibilityObjectWrapper(object)
 {
 }
@@ skipping 65 matching lines @@
 }
 
 void WebAccessibilityCacheImpl::clear()
 {
     m_objectMap.clear();
     m_idMap.clear();
 }
 
 int WebAccessibilityCacheImpl::addOrGetId(const WebAccessibilityObject& object)
 {
-    if (object.isNull())
+    if (!object.isValid())
         return invalidObjectId;
 
     RefPtr<AccessibilityObject> o = toAccessibilityObject(object);
 
     IdMap::iterator it = m_idMap.find(o.get());
 
     if (it != m_idMap.end())
         return it->second;
 
     // Insert new accessibility object in hashmaps and return its newly
     // assigned accessibility object id.
     m_objectMap.set(m_nextNewId, WeakHandle::create(o.get()));
     m_idMap.set(o.get(), m_nextNewId);
 
     return m_nextNewId++;
 }
 
 }