[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

[pfeldman at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 53befa6bd79ee9ea8a6dd0bde0186640a2f29bc8
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 1 01:42:33 2010 +0000

    2010-11-30  Pavel Feldman  <pfeldman at chromium.org>
    
            Reviewed by Dave Hyatt.
    
            Web Inspector: [CRASH] on "Revert to this revision" of style with import.
            https://bugs.webkit.org/show_bug.cgi?id=50256
    
            Rolled back one line from http://trac.webkit.org/changeset/36904 as agreed with
            David.
    
            * css/CSSImportRule.cpp:
            (WebCore::CSSImportRule::insertedIntoParent):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72988 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 153760d..4019b92 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-11-30  Pavel Feldman  <pfeldman at chromium.org>
+
+        Reviewed by Dave Hyatt.
+
+        Web Inspector: [CRASH] on "Revert to this revision" of style with import.
+        https://bugs.webkit.org/show_bug.cgi?id=50256
+
+        Rolled back one line from http://trac.webkit.org/changeset/36904 as agreed with
+        David.
+
+        * css/CSSImportRule.cpp:
+        (WebCore::CSSImportRule::insertedIntoParent):
+
 2010-11-30  Martin Robinson  <mrobinson at igalia.com>
 
         Reviewed by Xan Lopez.
diff --git a/WebCore/css/CSSImportRule.cpp b/WebCore/css/CSSImportRule.cpp
index 81ade39..a11c31c 100644
--- a/WebCore/css/CSSImportRule.cpp
+++ b/WebCore/css/CSSImportRule.cpp
@@ -142,7 +142,7 @@ void CSSImportRule::insertedIntoParent()
         // if the import rule is issued dynamically, the sheet may be
         // removed from the pending sheet count, so let the doc know
         // the sheet being imported is pending.
-        if (parentSheet && parentSheet->loadCompleted() && root == parentSheet)
+        if (parentSheet && parentSheet->loadCompleted() && parentSheet->document())
             parentSheet->document()->addPendingSheet();
         m_loading = true;
         m_cachedSheet->addClient(this);

-- 
WebKit Debian packaging