Changeset 121344 in webkit

Timestamp:

Jun 27, 2012, 8:18:07 AM (13 years ago)

Author:

shinyak@chromium.org

Message:

HTMLStyleElement::removedFrom seems incorrect.
​https://bugs.webkit.org/show_bug.cgi?id=89986

Reviewed by Hajime Morita.

This is a follow-up patch for Bug 88495. The Same bug as Bug 88495 seems to exist on
HTMLStyleElement::removedFrom().

No new tests, hard to write a test case.

• html/HTMLStyleElement.cpp:

(WebCore::HTMLStyleElement::removedFrom):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLStyleElement.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-06-27  Shinya Kawanaka  <shinyak@chromium.org>
+
+        HTMLStyleElement::removedFrom seems incorrect.
+        https://bugs.webkit.org/show_bug.cgi?id=89986
+
+        Reviewed by Hajime Morita.
+
+        This is a follow-up patch for Bug 88495. The Same bug as Bug 88495 seems to exist on
+        HTMLStyleElement::removedFrom().
+
+        No new tests, hard to write a test case.
+
+        * html/HTMLStyleElement.cpp:
+        (WebCore::HTMLStyleElement::removedFrom):
+
 2012-06-27  Mike Reed  <reed@google.com>
 

trunk/Source/WebCore/html/HTMLStyleElement.cpp

@@ -200 +200 @@
     // we'd need to find a way to discern whether that is the case, or whether <style scoped> itself is about to be removed.
     if (m_scopedStyleRegistrationState != NotRegistered) {
-        ContainerNode* scope = parentNode()? parentNode() : insertionPoint;
-        if (m_scopedStyleRegistrationState == RegisteredInShadowRoot)
-            scope = scope->shadowRoot();
+        ContainerNode* scope;
+        if (m_scopedStyleRegistrationState == RegisteredInShadowRoot) {
+            scope = shadowRoot();
+            if (!scope)
+                scope = insertionPoint->shadowRoot();
+        } else
+            scope = parentNode() ? parentNode() : insertionPoint;
         unregisterWithScopingNode(scope);
     }