Title: [88759] branches/chromium/782/Source/WebCore/dom/Element.cpp
- Revision
- 88759
- Author
- cev...@google.com
- Date
- 2011-06-13 20:49:44 -0700 (Mon, 13 Jun 2011)
Log Message
Merge 87827
BUG=84335
Review URL: http://codereview.chromium.org/7155001
Modified Paths
Diff
Modified: branches/chromium/782/Source/WebCore/dom/Element.cpp (88758 => 88759)
--- branches/chromium/782/Source/WebCore/dom/Element.cpp 2011-06-14 03:48:29 UTC (rev 88758)
+++ branches/chromium/782/Source/WebCore/dom/Element.cpp 2011-06-14 03:49:44 UTC (rev 88759)
@@ -90,7 +90,13 @@
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);
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
