2011-01-17 MORITA Hajime <morrita@google.com>
authormorrita@google.com <morrita@google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 18 Jan 2011 07:08:56 +0000 (07:08 +0000)
committermorrita@google.com <morrita@google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 18 Jan 2011 07:08:56 +0000 (07:08 +0000)
        Unreviewed, rolling out r75999.
        http://trac.webkit.org/changeset/75999

        * dom/Element.cpp:
        (WebCore::Element::removeShadowRoot):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@76000 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/dom/Element.cpp

index 2f314a7..ca88290 100644 (file)
@@ -1,3 +1,11 @@
+2011-01-17  MORITA Hajime  <morrita@google.com>
+
+        Unreviewed, rolling out r75999.
+        http://trac.webkit.org/changeset/75999
+
+        * dom/Element.cpp:
+        (WebCore::Element::removeShadowRoot):
+
 2011-01-17 MORITA Hajime  <morrita@google.com>
 
         Unreviewed crash fix, which introduced at r75995
index 1b9e3dc..34caa22 100644 (file)
@@ -1103,11 +1103,9 @@ void Element::setShadowRoot(PassRefPtr<Node> node)
 
 void Element::removeShadowRoot()
 {
-    if (!hasRareData())
-        return;
-
-    ElementRareData* data = rareData();
-    if (data->m_shadowRoot) {
+    if (ElementRareData* data = rareData()) {
+        if (!data->m_shadowRoot)
+            return;
         RefPtr<Node> oldRoot = data->m_shadowRoot;
         data->m_shadowRoot = 0;
         document()->removeFocusedNodeOfSubtree(oldRoot.get());