diff options
| author | Steve Block <steveblock@google.com> | 2010-09-10 04:32:22 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-10 04:32:22 -0700 |
| commit | 866b5c801e7591db2d365b09b35a90d337eb147c (patch) | |
| tree | bec64148f244305686506ac6b4971301db642f71 /WebCore | |
| parent | 48c3fafefe720cb153f52c69ea70e95c86d28e89 (diff) | |
| parent | d8dd893d690e9d208fe4a71b7d62374687d279f4 (diff) | |
| download | external_webkit-866b5c801e7591db2d365b09b35a90d337eb147c.zip external_webkit-866b5c801e7591db2d365b09b35a90d337eb147c.tar.gz external_webkit-866b5c801e7591db2d365b09b35a90d337eb147c.tar.bz2 | |
am d8dd893d: Cherry-pick security fix in WebKit change 62271
Merge commit 'd8dd893d690e9d208fe4a71b7d62374687d279f4' into gingerbread-plus-aosp
* commit 'd8dd893d690e9d208fe4a71b7d62374687d279f4':
Cherry-pick security fix in WebKit change 62271
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/rendering/RenderWidget.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/WebCore/rendering/RenderWidget.cpp b/WebCore/rendering/RenderWidget.cpp index f6f6da8..6f93790 100644 --- a/WebCore/rendering/RenderWidget.cpp +++ b/WebCore/rendering/RenderWidget.cpp @@ -27,6 +27,7 @@ #include "AnimationController.h" #include "GraphicsContext.h" #include "HitTestResult.h" +#include "RenderCounter.h" #include "RenderView.h" #include "RenderWidgetProtector.h" @@ -114,6 +115,9 @@ void RenderWidget::destroy() if (RenderView* v = view()) v->removeWidget(this); + if (m_hasCounterNodeMap) + RenderCounter::destroyCounterNodes(this); + if (AXObjectCache::accessibilityEnabled()) { document()->axObjectCache()->childrenChanged(this->parent()); document()->axObjectCache()->remove(this); |