Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(283)

Unified Diff: Source/WebCore/platform/Scrollbar.cpp

Issue 12703031: Revert 146726 "AXObjectCache gets recreated during document tear..." (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1453/
Patch Set: Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/WebCore/platform/Scrollbar.h ('k') | Source/WebCore/rendering/RenderBlock.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/platform/Scrollbar.cpp
===================================================================
--- Source/WebCore/platform/Scrollbar.cpp (revision 146890)
+++ Source/WebCore/platform/Scrollbar.cpp (working copy)
@@ -110,8 +110,8 @@
Scrollbar::~Scrollbar()
{
- if (AXObjectCache* cache = existingAXObjectCache())
- cache->remove(this);
+ if (AXObjectCache::accessibilityEnabled() && axObjectCache())
+ axObjectCache()->remove(this);
stopTimerIfNeeded();
@@ -566,13 +566,16 @@
{
return m_scrollableArea && m_scrollableArea->isActive();
}
-
-AXObjectCache* Scrollbar::existingAXObjectCache() const
+
+AXObjectCache* Scrollbar::axObjectCache() const
{
- if (!parent())
+ if (!parent() || !parent()->isFrameView())
return 0;
- return parent()->axObjectCache();
+ // FIXME: Accessing the FrameView and Document here is a layering violation
+ // and should be removed.
+ Document* document = toFrameView(parent())->frame()->document();
+ return document->axObjectCache();
}
void Scrollbar::invalidateRect(const IntRect& rect)
« no previous file with comments | « Source/WebCore/platform/Scrollbar.h ('k') | Source/WebCore/rendering/RenderBlock.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698