[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[morrita at google.com]

The following commit has been merged in the webkit-1.3 branch:
commit 9244b625cfb8774dbad7587c0f2c6531f56e381a
Author: morrita at google.com <morrita at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 18 06:52:41 2011 +0000

    2011-01-17 MORITA Hajime  <morrita at google.com>
    
            Unreviewed crash fix, which introduced at r75995
    
            * dom/Element.cpp:
            (WebCore::Element::removeShadowRoot):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75999 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 2dd01b8..2f314a7 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2011-01-17 MORITA Hajime  <morrita at google.com>
+
+        Unreviewed crash fix, which introduced at r75995
+
+        * dom/Element.cpp:
+        (WebCore::Element::removeShadowRoot):
+
 2011-01-17  MORITA Hajime  <morrita at google.com>
 
         Reviewed by Dimitri Glazkov.
diff --git a/Source/WebCore/dom/Element.cpp b/Source/WebCore/dom/Element.cpp
index 34caa22..1b9e3dc 100644
--- a/Source/WebCore/dom/Element.cpp
+++ b/Source/WebCore/dom/Element.cpp
@@ -1103,9 +1103,11 @@ void Element::setShadowRoot(PassRefPtr<Node> node)
 
 void Element::removeShadowRoot()
 {
-    if (ElementRareData* data = rareData()) {
-        if (!data->m_shadowRoot)
-            return;
+    if (!hasRareData())
+        return;
+
+    ElementRareData* data = rareData();
+    if (data->m_shadowRoot) {
         RefPtr<Node> oldRoot = data->m_shadowRoot;
         data->m_shadowRoot = 0;
         document()->removeFocusedNodeOfSubtree(oldRoot.get());

-- 
WebKit Debian packaging