[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[hyatt]

The following commit has been merged in the debian/unstable branch:
commit f6806827ccfbc31a029d0a1cf0cd19bbaadeeeb2
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 12 22:23:00 2002 +0000

    	Fix a bug in KHTML that leads it to claim cached @imported stylesheets
    	are not loaded (when in fact they are).
    
    	This fixes the W3C CSS page.
    
            * khtml/css/css_ruleimpl.cpp:
            (CSSImportRuleImpl::init):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2051 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 14a6ac4..f727660 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,13 @@
+2002-09-12  David Hyatt  <hyatt at apple.com>
+
+	Fix a bug in KHTML that leads it to claim cached @imported stylesheets
+	are not loaded (when in fact they are).
+
+	This fixes the W3C CSS page.
+	
+        * khtml/css/css_ruleimpl.cpp:
+        (CSSImportRuleImpl::init):
+
 2002-09-12  Chris Blumenberg  <cblu at apple.com>
 
 	Fixed livepage crash on Marklar. It is naughty to divide by 0 on marklar so we now check before doing that.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 14a6ac4..f727660 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,13 @@
+2002-09-12  David Hyatt  <hyatt at apple.com>
+
+	Fix a bug in KHTML that leads it to claim cached @imported stylesheets
+	are not loaded (when in fact they are).
+
+	This fixes the W3C CSS page.
+	
+        * khtml/css/css_ruleimpl.cpp:
+        (CSSImportRuleImpl::init):
+
 2002-09-12  Chris Blumenberg  <cblu at apple.com>
 
 	Fixed livepage crash on Marklar. It is naughty to divide by 0 on marklar so we now check before doing that.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 14a6ac4..f727660 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2002-09-12  David Hyatt  <hyatt at apple.com>
+
+	Fix a bug in KHTML that leads it to claim cached @imported stylesheets
+	are not loaded (when in fact they are).
+
+	This fixes the W3C CSS page.
+	
+        * khtml/css/css_ruleimpl.cpp:
+        (CSSImportRuleImpl::init):
+
 2002-09-12  Chris Blumenberg  <cblu at apple.com>
 
 	Fixed livepage crash on Marklar. It is naughty to divide by 0 on marklar so we now check before doing that.
diff --git a/WebCore/khtml/css/css_ruleimpl.cpp b/WebCore/khtml/css/css_ruleimpl.cpp
index 99ba9c1..40ec883 100644
--- a/WebCore/khtml/css/css_ruleimpl.cpp
+++ b/WebCore/khtml/css/css_ruleimpl.cpp
@@ -204,7 +204,13 @@ void CSSImportRuleImpl::init()
     if (m_cachedSheet)
     {
       m_cachedSheet->ref(this);
-      m_loading = true;
+      
+      // If the imported sheet is in the cache, then setStyleSheet gets called,
+      // and the sheet even gets parsed (via parseString).  In this case we have
+      // loaded (even if our subresources haven't), so if we have stylesheet after
+      // checking the cache, then we've clearly loaded. -dwh
+      if (!m_styleSheet)
+          m_loading = true;
     }
 }
 

-- 
WebKit Debian packaging