Merge 87827

Source/WebCore/dom/Element.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Peter Kelly (pmk@post.com)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2007 David Smith (catfish.man@gmail.com)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  *           (C) 2007 Eric Seidel (eric@webkit.org)
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 72 matching lines @@
         if (m_pushedStyleSelector)
             return;
         m_pushedStyleSelector = m_parent->document()->styleSelector();
         m_pushedStyleSelector->pushParent(m_parent);
     }
     ~StyleSelectorParentPusher() 
     {
 
         if (!m_pushedStyleSelector)
             return;
+
+        // This tells us that our pushed style selector is in a bad state,
+        // so we should just bail out in that scenario.
         ASSERT(m_pushedStyleSelector == m_parent->document()->styleSelector());
+        if (m_pushedStyleSelector != m_parent->document()->styleSelector())
+            return;
+
         m_pushedStyleSelector->popParent(m_parent); 
     }
 
 private:
     Element* m_parent;
     CSSStyleSelector* m_pushedStyleSelector;
 };
 
 PassRefPtr<Element> Element::create(const QualifiedName& tagName, Document* document)
 {
@@ skipping 1818 matching lines @@
 
     AnimationController* animController = renderer()->animation();
 
     if (!animController)
         return 0;
     
     return animController->animationsForRenderer(renderer());
 }
 
 } // namespace WebCore