Title: [87827] trunk/Source/WebCore
- Revision
- 87827
- Author
- [email protected]
- Date
- 2011-06-01 11:12:53 -0700 (Wed, 01 Jun 2011)
Log Message
2011-06-01 Abhishek Arya <[email protected]>
Reviewed by Antti Koivisto.
Do not use the pushed style selector if it is not equal to the
parent document's style selector. It usually means that it is
in a bad state, e.g. already cleared.
https://bugs.webkit.org/show_bug.cgi?id=61737
* dom/Element.cpp:
(WebCore::StyleSelectorParentPusher::~StyleSelectorParentPusher):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (87826 => 87827)
--- trunk/Source/WebCore/ChangeLog 2011-06-01 18:08:07 UTC (rev 87826)
+++ trunk/Source/WebCore/ChangeLog 2011-06-01 18:12:53 UTC (rev 87827)
@@ -1,3 +1,15 @@
+2011-06-01 Abhishek Arya <[email protected]>
+
+ Reviewed by Antti Koivisto.
+
+ Do not use the pushed style selector if it is not equal to the
+ parent document's style selector. It usually means that it is
+ in a bad state, e.g. already cleared.
+ https://bugs.webkit.org/show_bug.cgi?id=61737
+
+ * dom/Element.cpp:
+ (WebCore::StyleSelectorParentPusher::~StyleSelectorParentPusher):
+
2011-06-01 Levi Weintraub <[email protected]>
Reviewed by Eric Seidel.
Modified: trunk/Source/WebCore/dom/Element.cpp (87826 => 87827)
--- trunk/Source/WebCore/dom/Element.cpp 2011-06-01 18:08:07 UTC (rev 87826)
+++ trunk/Source/WebCore/dom/Element.cpp 2011-06-01 18:12:53 UTC (rev 87827)
@@ -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
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
