Merge 72988 - 2010-11-30 Pavel Feldman <pfeldman@chromium.org>...

WebCore/css/CSSImportRule.cpp

 /*
  * (C) 1999-2003 Lars Knoll (knoll@kde.org)
  * (C) 2002-2003 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2002, 2005, 2006, 2008, 2009, 2010 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 124 matching lines @@
     }
 
     if (parentSheet->isUserStyleSheet())
         m_cachedSheet = cachedResourceLoader->requestUserCSSStyleSheet(absHref, parentSheet->charset());
     else
         m_cachedSheet = cachedResourceLoader->requestCSSStyleSheet(absHref, parentSheet->charset());
     if (m_cachedSheet) {
         // 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);
     }
 }
 
 String CSSImportRule::cssText() const
 {
     String result = "@import url(\"";
     result += m_strHref;
     result += "\")";
 
     if (m_lstMedia) {
         result += " ";
         result += m_lstMedia->mediaText();
     }
     result += ";";
 
     return result;
 }
 
 void CSSImportRule::addSubresourceStyleURLs(ListHashSet<KURL>& urls)
 {
     if (m_styleSheet)
         addSubresourceURL(urls, m_styleSheet->baseURL());
 }
 
 } // namespace WebCore