summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2010-09-09 11:53:31 +0100
committerSteve Block <steveblock@google.com>2010-09-09 12:03:51 +0100
commitd8dd893d690e9d208fe4a71b7d62374687d279f4 (patch)
tree041eaba1c9088e07b6396789fe4df3a13c8786c6
parenteea2457721313546f0b5ddab3836282e338847b9 (diff)
downloadexternal_webkit-d8dd893d690e9d208fe4a71b7d62374687d279f4.zip
external_webkit-d8dd893d690e9d208fe4a71b7d62374687d279f4.tar.gz
external_webkit-d8dd893d690e9d208fe4a71b7d62374687d279f4.tar.bz2
Cherry-pick security fix in WebKit change 62271
See http://trac.webkit.org/changeset/62271 Bug: 2986936 Change-Id: I368b10ff368aef5317c01b18524f1e0521df056e
-rw-r--r--WebCore/rendering/RenderWidget.cpp4
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);