[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 a2917ce7c375f986c506a977e938b93c9e6fcb63
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 12 19:15:47 2002 +0000

    	Fix crash on trekweb.com.  My simplified FOUC code was a little
    	bit too simple. ;)
    
            * khtml/html/html_headimpl.cpp:
            (HTMLLinkElementImpl::setStyleSheet):
            (HTMLStyleElementImpl::childrenChanged):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2048 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 57e8a71..f07ee1c 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,14 @@
 2002-09-12  David Hyatt  <hyatt at apple.com>
 
+	Fix crash on trekweb.com.  My simplified FOUC code was a little
+	bit too simple. ;)
+	
+        * khtml/html/html_headimpl.cpp:
+        (HTMLLinkElementImpl::setStyleSheet):
+        (HTMLStyleElementImpl::childrenChanged):
+
+2002-09-12  David Hyatt  <hyatt at apple.com>
+
 	Fix the Warcraft 3 page on blizzard.com so that the relative
 	positioned blocks inside centered tables inside enclosing tables
 	with percentage widths work correctly.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 57e8a71..f07ee1c 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,14 @@
 2002-09-12  David Hyatt  <hyatt at apple.com>
 
+	Fix crash on trekweb.com.  My simplified FOUC code was a little
+	bit too simple. ;)
+	
+        * khtml/html/html_headimpl.cpp:
+        (HTMLLinkElementImpl::setStyleSheet):
+        (HTMLStyleElementImpl::childrenChanged):
+
+2002-09-12  David Hyatt  <hyatt at apple.com>
+
 	Fix the Warcraft 3 page on blizzard.com so that the relative
 	positioned blocks inside centered tables inside enclosing tables
 	with percentage widths work correctly.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 57e8a71..f07ee1c 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,14 @@
 2002-09-12  David Hyatt  <hyatt at apple.com>
 
+	Fix crash on trekweb.com.  My simplified FOUC code was a little
+	bit too simple. ;)
+	
+        * khtml/html/html_headimpl.cpp:
+        (HTMLLinkElementImpl::setStyleSheet):
+        (HTMLStyleElementImpl::childrenChanged):
+
+2002-09-12  David Hyatt  <hyatt at apple.com>
+
 	Fix the Warcraft 3 page on blizzard.com so that the relative
 	positioned blocks inside centered tables inside enclosing tables
 	with percentage widths work correctly.
diff --git a/WebCore/khtml/html/html_headimpl.cpp b/WebCore/khtml/html/html_headimpl.cpp
index 7f662b1..c1d9efa 100644
--- a/WebCore/khtml/html/html_headimpl.cpp
+++ b/WebCore/khtml/html/html_headimpl.cpp
@@ -234,7 +234,7 @@ void HTMLLinkElementImpl::setStyleSheet(const DOM::DOMString &url, const DOM::DO
     m_loading = false;
 
     // Tell the doc about the sheet.
-    if (!isLoading())
+    if (!isLoading() && m_sheet)
         getDocument()->stylesheetLoaded();
 }
 
@@ -387,7 +387,7 @@ void HTMLStyleElementImpl::childrenChanged()
         m_sheet->parseString( text, (getDocument()->parseMode() == DocumentImpl::Strict) );
     }
 
-    if (!isLoading())
+    if (!isLoading() && m_sheet)
         getDocument()->stylesheetLoaded();
 }
 

-- 
WebKit Debian packaging