[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 eac9095328d6c9a078c8ac0bed7df55cb4bcba04
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 29 17:19:51 2010 +0000

    2010-09-29  Chris Guillory  <chris.guillory at google.com>
    
            Reviewed by Dimitri Glazkov.
    
            Add method which checks if a WebAccessibilityObject is in the cache.
            https://bugs.webkit.org/show_bug.cgi?id=46605
    
            * public/WebAccessibilityCache.h:
            * src/WebAccessibilityCacheImpl.cpp:
            (WebKit::WebAccessibilityCacheImpl::isCached):
            * src/WebAccessibilityCacheImpl.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68658 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 42a8bb2..458d7c3 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-29  Chris Guillory  <chris.guillory at google.com>
+
+        Reviewed by Dimitri Glazkov.
+
+        Add method which checks if a WebAccessibilityObject is in the cache.
+        https://bugs.webkit.org/show_bug.cgi?id=46605
+
+        * public/WebAccessibilityCache.h:
+        * src/WebAccessibilityCacheImpl.cpp:
+        (WebKit::WebAccessibilityCacheImpl::isCached):
+        * src/WebAccessibilityCacheImpl.h:
+
 2010-09-29  Anantanarayanan G Iyengar  <ananta at chromium.org>
 
         Reviewed by Darin Fisher.
diff --git a/WebKit/chromium/public/WebAccessibilityCache.h b/WebKit/chromium/public/WebAccessibilityCache.h
index c9aec1f..10834dc 100644
--- a/WebKit/chromium/public/WebAccessibilityCache.h
+++ b/WebKit/chromium/public/WebAccessibilityCache.h
@@ -53,6 +53,7 @@ public:
     virtual WebAccessibilityObject getObjectById(int) = 0;
     virtual bool isValidId(int) const = 0;
     virtual int addOrGetId(const WebAccessibilityObject& object) = 0;
+    virtual bool isCached(const WebAccessibilityObject&) = 0;
 
     virtual void remove(int) = 0;
     virtual void clear() = 0;
diff --git a/WebKit/chromium/src/WebAccessibilityCacheImpl.cpp b/WebKit/chromium/src/WebAccessibilityCacheImpl.cpp
index 8304878..f735a40 100644
--- a/WebKit/chromium/src/WebAccessibilityCacheImpl.cpp
+++ b/WebKit/chromium/src/WebAccessibilityCacheImpl.cpp
@@ -166,4 +166,17 @@ int WebAccessibilityCacheImpl::addOrGetId(const WebAccessibilityObject& object)
     return m_nextNewId++;
 }
 
+bool WebAccessibilityCacheImpl::isCached(const WebAccessibilityObject& object)
+{
+    if (!object.isValid())
+        return false;
+
+    RefPtr<AccessibilityObject> o = toAccessibilityObject(object);
+    IdMap::iterator it = m_idMap.find(o.get());
+    if (it == m_idMap.end())
+        return false;
+        
+    return true;
+}
+
 }
diff --git a/WebKit/chromium/src/WebAccessibilityCacheImpl.h b/WebKit/chromium/src/WebAccessibilityCacheImpl.h
index 5148b74..4a85a1d 100644
--- a/WebKit/chromium/src/WebAccessibilityCacheImpl.h
+++ b/WebKit/chromium/src/WebAccessibilityCacheImpl.h
@@ -47,6 +47,7 @@ public:
     virtual WebAccessibilityObject getObjectById(int);
     virtual bool isValidId(int) const;
     virtual int addOrGetId(const WebKit::WebAccessibilityObject&);
+    virtual bool isCached(const WebAccessibilityObject&);
 
     virtual void remove(int);
     virtual void clear();

-- 
WebKit Debian packaging