[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 a40eb0696303f879646706b8a0e778ab38d87d1b
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 13 01:28:16 2002 +0000

    	Fix for 3086321, stylesheets not loading if titles are
    	specified.  Note that 4 of the pages on the PLT were
    	affected by this, so I fully expect a slight performance
    	degradation (the boost from the regression was artificial).
    
            * khtml/xml/dom_docimpl.cpp:
            (DocumentImpl::recalcStyleSelector):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2643 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 920733a..9f8dea1 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,13 @@
+2002-11-12  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3086321, stylesheets not loading if titles are
+	specified.  Note that 4 of the pages on the PLT were
+	affected by this, so I fully expect a slight performance
+	degradation (the boost from the regression was artificial).
+	
+        * khtml/xml/dom_docimpl.cpp:
+        (DocumentImpl::recalcStyleSelector):
+
 2002-11-12  Richard Williamson  <rjw at apple.com>
 
         Oops, removed debugging.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 920733a..9f8dea1 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,13 @@
+2002-11-12  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3086321, stylesheets not loading if titles are
+	specified.  Note that 4 of the pages on the PLT were
+	affected by this, so I fully expect a slight performance
+	degradation (the boost from the regression was artificial).
+	
+        * khtml/xml/dom_docimpl.cpp:
+        (DocumentImpl::recalcStyleSelector):
+
 2002-11-12  Richard Williamson  <rjw at apple.com>
 
         Oops, removed debugging.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 920733a..9f8dea1 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2002-11-12  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3086321, stylesheets not loading if titles are
+	specified.  Note that 4 of the pages on the PLT were
+	affected by this, so I fully expect a slight performance
+	degradation (the boost from the regression was artificial).
+	
+        * khtml/xml/dom_docimpl.cpp:
+        (DocumentImpl::recalcStyleSelector):
+
 2002-11-12  Richard Williamson  <rjw at apple.com>
 
         Oops, removed debugging.
diff --git a/WebCore/khtml/xml/dom_docimpl.cpp b/WebCore/khtml/xml/dom_docimpl.cpp
index 6542952..25ebc8d 100644
--- a/WebCore/khtml/xml/dom_docimpl.cpp
+++ b/WebCore/khtml/xml/dom_docimpl.cpp
@@ -1882,7 +1882,6 @@ void DocumentImpl::recalcStyleSelector()
 
             // Get the current preferred styleset.  This is the
             // set of sheets that will be enabled.
-            QString sheetUsed = view()->part()->d->m_sheetUsed;
             if ( n->id() == ID_LINK )
                 sheet = static_cast<HTMLLinkElementImpl*>(n)->sheet();
             else
@@ -1894,22 +1893,20 @@ void DocumentImpl::recalcStyleSelector()
             // PERSISTENT).
             if (!enabledViaScript && !title.isEmpty()) {
                 // Yes, we have a title.
-                if (sheetUsed.isEmpty()) {
+                if (m_preferredStylesheetSet.isEmpty()) {
                     // No preferred set has been established.  If
                     // we are NOT an alternate sheet, then establish
                     // us as the preferred set.  Otherwise, just ignore
                     // this sheet.
                     QString rel = e->getAttribute( ATTR_REL ).string();
-                    if (n->id() == ID_STYLE || !rel.contains("alternate")) {
-                        sheetUsed = view()->part()->d->m_sheetUsed = title;
-                        m_preferredStylesheetSet = sheetUsed;
-                    }
+                    if (n->id() == ID_STYLE || !rel.contains("alternate"))
+                        m_preferredStylesheetSet = view()->part()->d->m_sheetUsed = title;
                 }
                       
                 if (!m_availableSheets.contains( title ) )
                     m_availableSheets.append( title );
                 
-                if (title != sheetUsed)
+                if (title != m_preferredStylesheetSet)
                     sheet = 0;
             }
         }

-- 
WebKit Debian packaging