[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 7380e2083e0845d53a5522af24cf3a1fcb532ca7
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri May 9 20:44:16 2003 +0000

    	Fix for 3253695, XML pages with <style>@import...</style> don't
    	render.  The XML tokenizer is getting text in small chunks, and
    	so it tries to load the sheet multiple times.  This fix patches
    	the stylesheet code to properly decrement the loading sheet
    	count when you abort a still-loading @import.
    
            Reviewed by darin
    
            * khtml/html/html_headimpl.cpp:
            (HTMLStyleElementImpl::childrenChanged):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4332 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 9282c14..9a3b5d5 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,16 @@
+2003-05-09  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3253695, XML pages with <style>@import...</style> don't
+	render.  The XML tokenizer is getting text in small chunks, and
+	so it tries to load the sheet multiple times.  This fix patches
+	the stylesheet code to properly decrement the loading sheet
+	count when you abort a still-loading @import.
+	
+        Reviewed by darin
+
+        * khtml/html/html_headimpl.cpp:
+        (HTMLStyleElementImpl::childrenChanged):
+
 2003-05-09  Darin Adler  <darin at apple.com>
 
         Reviewed by John.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 9282c14..9a3b5d5 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,16 @@
+2003-05-09  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3253695, XML pages with <style>@import...</style> don't
+	render.  The XML tokenizer is getting text in small chunks, and
+	so it tries to load the sheet multiple times.  This fix patches
+	the stylesheet code to properly decrement the loading sheet
+	count when you abort a still-loading @import.
+	
+        Reviewed by darin
+
+        * khtml/html/html_headimpl.cpp:
+        (HTMLStyleElementImpl::childrenChanged):
+
 2003-05-09  Darin Adler  <darin at apple.com>
 
         Reviewed by John.
diff --git a/WebCore/khtml/html/html_headimpl.cpp b/WebCore/khtml/html/html_headimpl.cpp
index 3edd866..02d94a7 100644
--- a/WebCore/khtml/html/html_headimpl.cpp
+++ b/WebCore/khtml/html/html_headimpl.cpp
@@ -416,10 +416,12 @@ void HTMLStyleElementImpl::childrenChanged()
     }
 
     if (m_sheet) {
+        if (static_cast<CSSStyleSheetImpl *>(m_sheet)->isLoading())
+            getDocument()->stylesheetLoaded(); // Remove ourselves from the sheet list.
         m_sheet->deref();
         m_sheet = 0;
     }
-    
+
     m_loading = false;
     if ((m_type.isEmpty() || m_type == "text/css") // Type must be empty or CSS
          && (m_media.isNull() || m_media.contains("screen") || m_media.contains("all") || m_media.contains("print"))) {

-- 
WebKit Debian packaging