commit 323480423219ecd77329f8326dc5e0e3b50926d4
author Torne (Richard Coles) <torne@google.com> Wed May 14 12:12:57 2014 +0100
committer Torne (Richard Coles) <torne@google.com> Wed May 14 12:12:57 2014 +0100
tree 35997c0bd4b0528d319bef7af1dabce56248313d
parent ab1547edae854bd609b073580a92573605c29f66

Merge from Chromium at DEPS revision 269336

This commit was generated by merge_to_master.py.

Change-Id: Ibf41f59c608fa0127526255ada8e255a93306a7e

Source/core/css/CSSFilterRule.cpp

diff --git a/Source/core/css/CSSFilterRule.cpp b/Source/core/css/CSSFilterRule.cpp
index f533a51..90b3390 100644
--- a/Source/core/css/CSSFilterRule.cpp
+++ b/Source/core/css/CSSFilterRule.cpp
@@ -45,8 +45,10 @@
 
 CSSFilterRule::~CSSFilterRule()
 {
+#if !ENABLE(OILPAN)
     if (m_propertiesCSSOMWrapper)
         m_propertiesCSSOMWrapper->clearParentRule();
+#endif
 }
 
 CSSStyleDeclaration* CSSFilterRule::style() const
@@ -85,6 +87,7 @@
 void CSSFilterRule::trace(Visitor* visitor)
 {
     visitor->trace(m_filterRule);
+    visitor->trace(m_propertiesCSSOMWrapper);
     CSSRule::trace(visitor);
 }