[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 58d353f665138dcd83875922ffd4f8cda557ad95
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 7 07:01:39 2010 +0000

    2010-12-06  Pavel Feldman  <pfeldman at chromium.org>
    
            Not reviewed. Rolling out r72988 for breaking iframes.
    
            * css/CSSImportRule.cpp:
            (WebCore::CSSImportRule::insertedIntoParent):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73427 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 7f996b5..d487f26 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2010-12-06  Pavel Feldman  <pfeldman at chromium.org>
+
+        Not reviewed. Rolling out r72988 for breaking iframes.
+
+        * css/CSSImportRule.cpp:
+        (WebCore::CSSImportRule::insertedIntoParent):
+
 2010-12-06  Hironori Bono  <hbono at chromium.org>
 
         Reviewed by David Levin.
diff --git a/WebCore/css/CSSImportRule.cpp b/WebCore/css/CSSImportRule.cpp
index a11c31c..81ade39 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() && parentSheet->document())
+        if (parentSheet && parentSheet->loadCompleted() && root == parentSheet)
             parentSheet->document()->addPendingSheet();
         m_loading = true;
         m_cachedSheet->addClient(this);

-- 
WebKit Debian packaging