Attachment 149614 Details for Bug 89986 – Patch

[patch] Patch

bug-89986-20120627071947.patch (text/plain), 2.03 KB, created by Shinya Kawanaka on 2012-06-26 15:19:48 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Shinya Kawanaka

Created: 2012-06-26 15:19:48 PDT

Size: 2.03 KB

patch

obsolete

>Subversion Revision: 121263
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index d0b50af09a760fc9b7c3e56fc044e310dfe9aa3d..44d9d3cdeef024d016af796017f495541654190f 100755
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,18 @@
>+2012-06-26  Shinya Kawanaka  <shinyak@chromium.org>
>+
>+        HTMLStyleElement::removedFrom seems incorrect.
>+        https://bugs.webkit.org/show_bug.cgi?id=89986
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        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-26  Huang Dongsung  <luxtella@company100.net>
> 
>         [Texmap] Bug fix typo about computing bytesPerLine in BitmapTextureGL.
>diff --git a/Source/WebCore/html/HTMLStyleElement.cpp b/Source/WebCore/html/HTMLStyleElement.cpp
>index e2189e96bdc0035e8209d488207e71aff809bdf9..26990a5df284a97c6a241f5c70a28eb8d877e918 100644
>--- a/Source/WebCore/html/HTMLStyleElement.cpp
>+++ b/Source/WebCore/html/HTMLStyleElement.cpp
>@@ -199,9 +199,13 @@ void HTMLStyleElement::removedFrom(ContainerNode* insertionPoint)
>     // Now, if we want to register <style scoped> even if it's not inDocument,
>     // 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);
>     }
> #endif

Actions: View | Formatted Diff | Diff

Attachments on bug 89986: 149566 | 149585 | 149614