Changeset 91422 in webkit

Timestamp:

Jul 20, 2011, 4:33:04 PM (14 years ago)

Author:

Lucas Forschler

Message:

Merge r87827.

Location:

branches/safari-534.51-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Element.cpp (modified) (1 diff)

branches/safari-534.51-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-20  Lucas Forschler  <lforschler@apple.com>
+
+    Merged 87827.
+
+    2011-06-01  Abhishek Arya  <inferno@chromium.org>
+
+        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  <lforschler@apple.com>
 

branches/safari-534.51-branch/Source/WebCore/dom/Element.cpp

@@ -91 +91 @@
         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); 
     }