[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 5ee06d0a455ff1bafad3e65e32fffa8a722586e3
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Sep 16 19:17:16 2002 +0000

    	Fix the stylesheet loading regression on rubyfruit.
    
            * khtml/html/html_headimpl.cpp:
            (HTMLStyleElementImpl::HTMLStyleElementImpl):
            (HTMLStyleElementImpl::childrenChanged):
            (HTMLStyleElementImpl::isLoading):
            * khtml/html/html_headimpl.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2072 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 6abfaed..1ea81e5 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,13 @@
+2002-09-16  David Hyatt  <hyatt at apple.com>
+
+	Fix the stylesheet loading regression on rubyfruit.
+	
+        * khtml/html/html_headimpl.cpp:
+        (HTMLStyleElementImpl::HTMLStyleElementImpl):
+        (HTMLStyleElementImpl::childrenChanged):
+        (HTMLStyleElementImpl::isLoading):
+        * khtml/html/html_headimpl.h:
+
 2002-09-13  David Hyatt  <hyatt at apple.com>
 
 	Landing code that makes textfields, buttons, checkboxes, radio
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 6abfaed..1ea81e5 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,13 @@
+2002-09-16  David Hyatt  <hyatt at apple.com>
+
+	Fix the stylesheet loading regression on rubyfruit.
+	
+        * khtml/html/html_headimpl.cpp:
+        (HTMLStyleElementImpl::HTMLStyleElementImpl):
+        (HTMLStyleElementImpl::childrenChanged):
+        (HTMLStyleElementImpl::isLoading):
+        * khtml/html/html_headimpl.h:
+
 2002-09-13  David Hyatt  <hyatt at apple.com>
 
 	Landing code that makes textfields, buttons, checkboxes, radio
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 6abfaed..1ea81e5 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2002-09-16  David Hyatt  <hyatt at apple.com>
+
+	Fix the stylesheet loading regression on rubyfruit.
+	
+        * khtml/html/html_headimpl.cpp:
+        (HTMLStyleElementImpl::HTMLStyleElementImpl):
+        (HTMLStyleElementImpl::childrenChanged):
+        (HTMLStyleElementImpl::isLoading):
+        * khtml/html/html_headimpl.h:
+
 2002-09-13  David Hyatt  <hyatt at apple.com>
 
 	Landing code that makes textfields, buttons, checkboxes, radio
diff --git a/WebCore/khtml/html/html_headimpl.cpp b/WebCore/khtml/html/html_headimpl.cpp
index c1d9efa..5712ab3 100644
--- a/WebCore/khtml/html/html_headimpl.cpp
+++ b/WebCore/khtml/html/html_headimpl.cpp
@@ -321,6 +321,7 @@ NodeImpl::Id HTMLScriptElementImpl::id() const
 HTMLStyleElementImpl::HTMLStyleElementImpl(DocumentPtr *doc) : HTMLElementImpl(doc)
 {
     m_sheet = 0;
+    m_loading = false;
 }
 
 HTMLStyleElementImpl::~HTMLStyleElementImpl()
@@ -379,12 +380,15 @@ void HTMLStyleElementImpl::childrenChanged()
         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"))) {
         getDocument()->addPendingSheet();
+        m_loading = true;
         m_sheet = new CSSStyleSheetImpl(this);
         m_sheet->ref();
         m_sheet->parseString( text, (getDocument()->parseMode() == DocumentImpl::Strict) );
+        m_loading = false;
     }
 
     if (!isLoading() && m_sheet)
@@ -393,6 +397,7 @@ void HTMLStyleElementImpl::childrenChanged()
 
 bool HTMLStyleElementImpl::isLoading() const
 {
+    if (m_loading) return true;
     if(!m_sheet) return false;
     return static_cast<CSSStyleSheetImpl *>(m_sheet)->isLoading();
 }
diff --git a/WebCore/khtml/html/html_headimpl.h b/WebCore/khtml/html/html_headimpl.h
index 6281e16..01a8e83 100644
--- a/WebCore/khtml/html/html_headimpl.h
+++ b/WebCore/khtml/html/html_headimpl.h
@@ -156,6 +156,7 @@ public:
 
 protected:
     StyleSheetImpl *m_sheet;
+    bool m_loading;
     DOMString m_type;
     QString m_media;
 };

-- 
WebKit Debian packaging