Title: [91422] branches/safari-534.51-branch/Source/WebCore
Diff
Modified: branches/safari-534.51-branch/Source/WebCore/ChangeLog (91421 => 91422)
--- branches/safari-534.51-branch/Source/WebCore/ChangeLog 2011-07-20 23:28:25 UTC (rev 91421)
+++ branches/safari-534.51-branch/Source/WebCore/ChangeLog 2011-07-20 23:33:04 UTC (rev 91422)
@@ -1,5 +1,21 @@
2011-07-20 Lucas Forschler <[email protected]>
+ Merged 87827.
+
+ 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-07-20 Lucas Forschler <[email protected]>
+
Merged 87743.
2011-05-31 Abhishek Arya <[email protected]>
Modified: branches/safari-534.51-branch/Source/WebCore/dom/Element.cpp (91421 => 91422)
--- branches/safari-534.51-branch/Source/WebCore/dom/Element.cpp 2011-07-20 23:28:25 UTC (rev 91421)
+++ branches/safari-534.51-branch/Source/WebCore/dom/Element.cpp 2011-07-20 23:33:04 UTC (rev 91422)
@@ -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
