Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (97067 => 97068)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-10-10 17:03:03 UTC (rev 97067)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-10-10 17:24:24 UTC (rev 97068)
@@ -1,3 +1,16 @@
+2011-10-10 Dominic Mazzoni <[email protected]>
+
+ [Chromium] Get rid of WebAccessibilityCache.
+ https://bugs.webkit.org/show_bug.cgi?id=68224
+
+ Reviewed by Dimitri Glazkov.
+
+ * WebKit.gyp:
+ * public/WebAccessibilityCache.h: Removed.
+ * src/WebAccessibilityCache.cpp: Removed.
+ * src/WebAccessibilityCacheImpl.cpp: Removed.
+ * src/WebAccessibilityCacheImpl.h: Removed.
+
2011-10-10 Pavel Podivilov <[email protected]>
Unreviewed, mark CCThreadTest.startPostAndWaitOnCondition as flaky on win and mac.
Modified: trunk/Source/WebKit/chromium/WebKit.gyp (97067 => 97068)
--- trunk/Source/WebKit/chromium/WebKit.gyp 2011-10-10 17:03:03 UTC (rev 97067)
+++ trunk/Source/WebKit/chromium/WebKit.gyp 2011-10-10 17:24:24 UTC (rev 97068)
@@ -104,7 +104,6 @@
'public/mac/WebScreenInfoFactory.h',
'public/mac/WebSubstringUtil.h',
'public/mac/WebThemeEngine.h',
- 'public/WebAccessibilityCache.h',
'public/WebAccessibilityNotification.h',
'public/WebAccessibilityObject.h',
'public/WebAccessibilityRole.h',
@@ -439,9 +438,6 @@
'src/WebTextCheckingCompletionImpl.cpp',
'src/VideoFrameChromiumImpl.cpp',
'src/VideoFrameChromiumImpl.h',
- 'src/WebAccessibilityCache.cpp',
- 'src/WebAccessibilityCacheImpl.cpp',
- 'src/WebAccessibilityCacheImpl.h',
'src/WebAccessibilityObject.cpp',
'src/WebAnimationControllerImpl.cpp',
'src/WebAnimationControllerImpl.h',
Deleted: trunk/Source/WebKit/chromium/public/WebAccessibilityCache.h (97067 => 97068)
--- trunk/Source/WebKit/chromium/public/WebAccessibilityCache.h 2011-10-10 17:03:03 UTC (rev 97067)
+++ trunk/Source/WebKit/chromium/public/WebAccessibilityCache.h 2011-10-10 17:24:24 UTC (rev 97068)
@@ -1,63 +0,0 @@
-/*
- * 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
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef WebAccessibilityCache_h
-#define WebAccessibilityCache_h
-
-#include "WebCommon.h"
-
-namespace WebKit {
-
-class WebView;
-class WebAccessibilityObject;
-
-class WebAccessibilityCache {
-public:
- WebAccessibilityCache() {}
- virtual ~WebAccessibilityCache() {}
-
- WEBKIT_EXPORT static WebAccessibilityCache* create();
- WEBKIT_EXPORT static void enableAccessibility();
- WEBKIT_EXPORT static bool accessibilityEnabled();
-
- virtual void initialize(WebView* view) = 0;
- virtual bool isInitialized() const = 0;
-
- virtual WebAccessibilityObject getObjectById(int) = 0;
- virtual int addOrGetId(const WebAccessibilityObject& object) = 0;
- virtual bool isCached(const WebAccessibilityObject&) = 0;
-
- virtual void remove(int) = 0;
- virtual void clear() = 0;
-};
-
-} // namespace WebKit
-
-#endif
Deleted: trunk/Source/WebKit/chromium/src/WebAccessibilityCache.cpp (97067 => 97068)
--- trunk/Source/WebKit/chromium/src/WebAccessibilityCache.cpp 2011-10-10 17:03:03 UTC (rev 97067)
+++ trunk/Source/WebKit/chromium/src/WebAccessibilityCache.cpp 2011-10-10 17:24:24 UTC (rev 97068)
@@ -1,50 +0,0 @@
-/*
- * 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
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "WebAccessibilityCache.h"
-
-#include "AXObjectCache.h"
-
-using namespace WebCore;
-
-namespace WebKit {
-
-void WebAccessibilityCache::enableAccessibility()
-{
- AXObjectCache::enableAccessibility();
-}
-
-bool WebAccessibilityCache::accessibilityEnabled()
-{
- return AXObjectCache::accessibilityEnabled();
-}
-
-}
Deleted: trunk/Source/WebKit/chromium/src/WebAccessibilityCacheImpl.cpp (97067 => 97068)
--- trunk/Source/WebKit/chromium/src/WebAccessibilityCacheImpl.cpp 2011-10-10 17:03:03 UTC (rev 97067)
+++ trunk/Source/WebKit/chromium/src/WebAccessibilityCacheImpl.cpp 2011-10-10 17:24:24 UTC (rev 97068)
@@ -1,177 +0,0 @@
-/*
- * 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
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "WebAccessibilityCacheImpl.h"
-
-#include "AccessibilityObject.h"
-#include "AXObjectCache.h"
-#include "Document.h"
-#include "Frame.h"
-
-#include "WebAccessibilityObject.h"
-#include "WebFrameImpl.h"
-#include "WebViewImpl.h"
-
-using namespace WebCore;
-
-namespace WebKit {
-
-const int invalidObjectId = -1;
-const int firstObjectId = 1000;
-
-static PassRefPtr<AccessibilityObject> toAccessibilityObject(const WebAccessibilityObject& object)
-{
- return object;
-}
-
-// WebView ----------------------------------------------------------------
-
-WebAccessibilityCache* WebAccessibilityCache::create()
-{
- return new WebAccessibilityCacheImpl();
-}
-
-// WeakHandle -------------------------------------------------------------
-
-PassRefPtr<WebAccessibilityCacheImpl::WeakHandle> WebAccessibilityCacheImpl::WeakHandle::create(AccessibilityObject* object)
-{
- 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)
-{
-}
-
-// WebAccessibilityCacheImpl ----------------------------------------
-
-void WebAccessibilityCacheImpl::WeakHandle::detach()
-{
- if (m_object)
- m_object = 0;
-}
-
-WebAccessibilityCacheImpl::WebAccessibilityCacheImpl()
- : m_nextNewId(firstObjectId)
- , m_initialized(false)
-{
-}
-
-WebAccessibilityCacheImpl::~WebAccessibilityCacheImpl()
-{
-}
-
-void WebAccessibilityCacheImpl::initialize(WebView* view)
-{
- AXObjectCache::enableAccessibility();
- WebAccessibilityObject root = view->accessibilityObject();
- if (root.isNull())
- return;
-
- RefPtr<AccessibilityObject> rootObject = toAccessibilityObject(root);
-
- // Insert root in hashmaps.
- m_objectMap.set(m_nextNewId, WeakHandle::create(rootObject.get()));
- m_idMap.set(rootObject.get(), m_nextNewId++);
-
- m_initialized = true;
-}
-
-WebAccessibilityObject WebAccessibilityCacheImpl::getObjectById(int id)
-{
- ObjectMap::iterator it = m_objectMap.find(id);
-
- if (it == m_objectMap.end() || !it->second)
- return WebAccessibilityObject();
-
- return WebAccessibilityObject(it->second->accessibilityObject());
-}
-
-void WebAccessibilityCacheImpl::remove(int id)
-{
- ObjectMap::iterator it = m_objectMap.find(id);
-
- if (it == m_objectMap.end())
- return;
-
- if (it->second) {
- // Erase element from reverse hashmap.
- IdMap::iterator it2 = m_idMap.find(it->second->accessibilityObject());
- if (it2 != m_idMap.end())
- m_idMap.remove(it2);
- }
-
- m_objectMap.remove(it);
-}
-
-void WebAccessibilityCacheImpl::clear()
-{
- m_objectMap.clear();
- m_idMap.clear();
-}
-
-int WebAccessibilityCacheImpl::addOrGetId(const WebAccessibilityObject& object)
-{
- 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++;
-}
-
-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;
-}
-
-}
Deleted: trunk/Source/WebKit/chromium/src/WebAccessibilityCacheImpl.h (97067 => 97068)
--- trunk/Source/WebKit/chromium/src/WebAccessibilityCacheImpl.h 2011-10-10 17:03:03 UTC (rev 97067)
+++ trunk/Source/WebKit/chromium/src/WebAccessibilityCacheImpl.h 2011-10-10 17:24:24 UTC (rev 97068)
@@ -1,92 +0,0 @@
-/*
- * 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
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef WebAccessibilityCacheImpl_h
-#define WebAccessibilityCacheImpl_h
-
-#include "AccessibilityObjectWrapper.h"
-#include "WebAccessibilityCache.h"
-#include <wtf/HashMap.h>
-#include <wtf/PassRefPtr.h>
-
-namespace WebKit {
-
-// FIXME: Should be eliminated to use AXObjectCache instead.
-class WebAccessibilityCacheImpl : public WebKit::WebAccessibilityCache {
-public:
- virtual void initialize(WebView* view);
- virtual bool isInitialized() const { return m_initialized; }
-
- virtual WebAccessibilityObject getObjectById(int);
- virtual int addOrGetId(const WebKit::WebAccessibilityObject&);
- virtual bool isCached(const WebAccessibilityObject&);
-
- virtual void remove(int);
- virtual void clear();
-
-protected:
- friend class WebKit::WebAccessibilityCache;
-
- WebAccessibilityCacheImpl();
- ~WebAccessibilityCacheImpl();
-
-private:
- // FIXME: This can be just part of Chromium's AccessibilityObjectWrapper.
- class WeakHandle : public WebCore::AccessibilityObjectWrapper {
- public:
- static PassRefPtr<WeakHandle> create(WebCore::AccessibilityObject*);
- virtual void detach();
- private:
- WeakHandle(WebCore::AccessibilityObject*);
- };
-
- typedef HashMap<int, RefPtr<WeakHandle> > ObjectMap;
- typedef HashMap<WebCore::AccessibilityObject*, int> IdMap;
-
- // Hashmap for caching of elements in use by the AT, mapping id (int) to
- // WebAccessibilityObject.
- ObjectMap m_objectMap;
- // Hashmap for caching of elements in use by the AT, mapping a
- // AccessibilityObject pointer to its id (int). Needed for reverse lookup,
- // to ensure unnecessary duplicate entries are not created in the
- // ObjectMap and for focus changes in WebKit.
- IdMap m_idMap;
-
- // Unique identifier for retrieving an accessibility object from the page's
- // hashmaps. Id is always 0 for the root of the accessibility object
- // hierarchy (on a per-renderer process basis).
- int m_nextNewId;
-
- bool m_initialized;
-};
-
-}
-
-#endif
Modified: trunk/Tools/ChangeLog (97067 => 97068)
--- trunk/Tools/ChangeLog 2011-10-10 17:03:03 UTC (rev 97067)
+++ trunk/Tools/ChangeLog 2011-10-10 17:24:24 UTC (rev 97068)
@@ -1,3 +1,13 @@
+2011-10-10 Dominic Mazzoni <[email protected]>
+
+ [Chromium] Get rid of WebAccessibilityCache.
+ https://bugs.webkit.org/show_bug.cgi?id=68224
+
+ Reviewed by Dimitri Glazkov.
+
+ * DumpRenderTree/chromium/AccessibilityController.cpp:
+ (AccessibilityController::bindToJavascript):
+
2011-10-09 Adam Barth <[email protected]>
Remove "near miss" XSS vulnerabilities in garden-o-matic
Modified: trunk/Tools/DumpRenderTree/chromium/AccessibilityController.cpp (97067 => 97068)
--- trunk/Tools/DumpRenderTree/chromium/AccessibilityController.cpp 2011-10-10 17:03:03 UTC (rev 97067)
+++ trunk/Tools/DumpRenderTree/chromium/AccessibilityController.cpp 2011-10-10 17:24:24 UTC (rev 97068)
@@ -32,7 +32,6 @@
#include "AccessibilityController.h"
#include "TestShell.h"
-#include "WebAccessibilityCache.h"
#include "WebAccessibilityObject.h"
#include "WebFrame.h"
#include "WebString.h"
@@ -57,7 +56,7 @@
void AccessibilityController::bindToJavascript(WebFrame* frame, const WebString& classname)
{
- WebAccessibilityCache::enableAccessibility();
+ WebAccessibilityObject::enableAccessibility();
CppBoundClass::bindToJavascript(frame, classname);
}
