[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 605c6667e25300c11845f22dea8ab7615363cbf9
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Sep 23 19:30:22 2002 +0000

    	Don't let alternate stylesheets delay render tree construction.
    
            * khtml/html/html_headimpl.cpp:
            (HTMLLinkElementImpl::HTMLLinkElementImpl):
            (HTMLLinkElementImpl::process):
            (HTMLLinkElementImpl::setStyleSheet):
            (HTMLLinkElementImpl::sheetLoaded):
            * khtml/html/html_headimpl.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2125 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 0e98943..87fb780 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,14 @@
+2002-09-23  David Hyatt  <hyatt at apple.com>
+
+	Don't let alternate stylesheets delay render tree construction.
+	
+        * khtml/html/html_headimpl.cpp:
+        (HTMLLinkElementImpl::HTMLLinkElementImpl):
+        (HTMLLinkElementImpl::process):
+        (HTMLLinkElementImpl::setStyleSheet):
+        (HTMLLinkElementImpl::sheetLoaded):
+        * khtml/html/html_headimpl.h:
+
 \2002-09-23  David Hyatt  <hyatt at apple.com>
 
 	Make overflow:auto and scroll map to hidden until we figure
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 0e98943..87fb780 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,14 @@
+2002-09-23  David Hyatt  <hyatt at apple.com>
+
+	Don't let alternate stylesheets delay render tree construction.
+	
+        * khtml/html/html_headimpl.cpp:
+        (HTMLLinkElementImpl::HTMLLinkElementImpl):
+        (HTMLLinkElementImpl::process):
+        (HTMLLinkElementImpl::setStyleSheet):
+        (HTMLLinkElementImpl::sheetLoaded):
+        * khtml/html/html_headimpl.h:
+
 \2002-09-23  David Hyatt  <hyatt at apple.com>
 
 	Make overflow:auto and scroll map to hidden until we figure
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 0e98943..87fb780 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2002-09-23  David Hyatt  <hyatt at apple.com>
+
+	Don't let alternate stylesheets delay render tree construction.
+	
+        * khtml/html/html_headimpl.cpp:
+        (HTMLLinkElementImpl::HTMLLinkElementImpl):
+        (HTMLLinkElementImpl::process):
+        (HTMLLinkElementImpl::setStyleSheet):
+        (HTMLLinkElementImpl::sheetLoaded):
+        * khtml/html/html_headimpl.h:
+
 \2002-09-23  David Hyatt  <hyatt at apple.com>
 
 	Make overflow:auto and scroll map to hidden until we figure
diff --git a/WebCore/khtml/html/html_headimpl.cpp b/WebCore/khtml/html/html_headimpl.cpp
index 5712ab3..58c0d44 100644
--- a/WebCore/khtml/html/html_headimpl.cpp
+++ b/WebCore/khtml/html/html_headimpl.cpp
@@ -111,6 +111,7 @@ HTMLLinkElementImpl::HTMLLinkElementImpl(DocumentPtr *doc)
     m_sheet = 0;
     m_loading = false;
     m_cachedSheet = 0;
+    m_alternate = false;
 }
 
 HTMLLinkElementImpl::~HTMLLinkElementImpl()
@@ -185,8 +186,11 @@ void HTMLLinkElementImpl::process()
         if( m_media.isNull() || m_media.contains("screen") || m_media.contains("all") || m_media.contains("print") ) {
             m_loading = true;
 
-            // Add ourselves as a pending sheet.
-            getDocument()->addPendingSheet();
+            // Add ourselves as a pending sheet, but only if we aren't an alternate 
+            // stylesheet.  Alternate stylesheets don't hold up render tree construction.
+            m_alternate = rel.contains("alternate");
+            if (!isAlternate())
+                getDocument()->addPendingSheet();
             
             QString chset = getAttribute( ATTR_CHARSET ).string();
             if (m_cachedSheet)
@@ -234,7 +238,7 @@ void HTMLLinkElementImpl::setStyleSheet(const DOM::DOMString &url, const DOM::DO
     m_loading = false;
 
     // Tell the doc about the sheet.
-    if (!isLoading() && m_sheet)
+    if (!isLoading() && m_sheet && !isAlternate())
         getDocument()->stylesheetLoaded();
 }
 
@@ -249,7 +253,7 @@ bool HTMLLinkElementImpl::isLoading() const
 
 void HTMLLinkElementImpl::sheetLoaded()
 {
-    if (!isLoading())
+    if (!isLoading() && !isAlternate())
         getDocument()->stylesheetLoaded();
 }
 
diff --git a/WebCore/khtml/html/html_headimpl.h b/WebCore/khtml/html/html_headimpl.h
index 01a8e83..00aec62 100644
--- a/WebCore/khtml/html/html_headimpl.h
+++ b/WebCore/khtml/html/html_headimpl.h
@@ -89,7 +89,8 @@ public:
     bool isLoading() const;
     void sheetLoaded();
 
-
+    bool isAlternate() const { return m_alternate; }
+    
 protected:
     khtml::CachedCSSStyleSheet *m_cachedSheet;
     CSSStyleSheetImpl *m_sheet;
@@ -98,6 +99,7 @@ protected:
     QString m_media;
     DOMString m_rel;
     bool m_loading;
+    bool m_alternate;
     QString m_data; // needed for temporarily storing the loaded style sheet data
 };
 

-- 
WebKit Debian packaging