[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 b3195ea1cde6782fcaed6ce8d987828af5301a62
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 7 05:46:55 2002 +0000

    	Make user stylesheet changes dynamic.  Web documents will now
    	update as the user stylesheet is applied and unapplied.  Altered
    	how reapplyStyles works a bit.
    
            * khtml/khtml_part.cpp:
            (KHTMLPart::reparseConfiguration):
            * khtml/xml/dom_docimpl.cpp:
            (DocumentImpl::setUserStyleSheet):
            * kwq/WebCoreBridge.mm:
            (-[WebCoreBridge reapplyStyles]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1763 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index ce69509..7268292 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,18 @@
 2002-08-06  David Hyatt  <hyatt at apple.com>
 
+	Make user stylesheet changes dynamic.  Web documents will now
+	update as the user stylesheet is applied and unapplied.  Altered
+	how reapplyStyles works a bit.
+		
+        * khtml/khtml_part.cpp:
+        (KHTMLPart::reparseConfiguration):
+        * khtml/xml/dom_docimpl.cpp:
+        (DocumentImpl::setUserStyleSheet):
+        * kwq/WebCoreBridge.mm:
+        (-[WebCoreBridge reapplyStyles]):
+
+2002-08-06  David Hyatt  <hyatt at apple.com>
+
 	Enable user stylesheet support.  It works from a fresh start but
 	is not yet completely dynamic.
 	
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index ce69509..7268292 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,18 @@
 2002-08-06  David Hyatt  <hyatt at apple.com>
 
+	Make user stylesheet changes dynamic.  Web documents will now
+	update as the user stylesheet is applied and unapplied.  Altered
+	how reapplyStyles works a bit.
+		
+        * khtml/khtml_part.cpp:
+        (KHTMLPart::reparseConfiguration):
+        * khtml/xml/dom_docimpl.cpp:
+        (DocumentImpl::setUserStyleSheet):
+        * kwq/WebCoreBridge.mm:
+        (-[WebCoreBridge reapplyStyles]):
+
+2002-08-06  David Hyatt  <hyatt at apple.com>
+
 	Enable user stylesheet support.  It works from a fresh start but
 	is not yet completely dynamic.
 	
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index ce69509..7268292 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,18 @@
 2002-08-06  David Hyatt  <hyatt at apple.com>
 
+	Make user stylesheet changes dynamic.  Web documents will now
+	update as the user stylesheet is applied and unapplied.  Altered
+	how reapplyStyles works a bit.
+		
+        * khtml/khtml_part.cpp:
+        (KHTMLPart::reparseConfiguration):
+        * khtml/xml/dom_docimpl.cpp:
+        (DocumentImpl::setUserStyleSheet):
+        * kwq/WebCoreBridge.mm:
+        (-[WebCoreBridge reapplyStyles]):
+
+2002-08-06  David Hyatt  <hyatt at apple.com>
+
 	Enable user stylesheet support.  It works from a fresh start but
 	is not yet completely dynamic.
 	
diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index 8431d1e..1d30a7d 100644
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -3829,8 +3829,14 @@ void KHTMLPart::reparseConfiguration()
   delete d->m_settings;
   d->m_settings = new KHTMLSettings(*KHTMLFactory::defaultHTMLSettings());
 
+  QString userStyleSheet = KHTMLFactory::defaultHTMLSettings()->userStyleSheet();
+  if ( !userStyleSheet.isEmpty() )
+    setUserStyleSheet( KURL( userStyleSheet ) );
+  else
+    setUserStyleSheet( KURL( QString::null ) );
+
   QApplication::setOverrideCursor( waitCursor );
-  if(d->m_doc) d->m_doc->recalcStyle( NodeImpl::Force );
+  if(d->m_doc) d->m_doc->updateStyleSelector();
   QApplication::restoreOverrideCursor();
 }
 
diff --git a/WebCore/khtml/xml/dom_docimpl.cpp b/WebCore/khtml/xml/dom_docimpl.cpp
index 2454d56..b795f2d 100644
--- a/WebCore/khtml/xml/dom_docimpl.cpp
+++ b/WebCore/khtml/xml/dom_docimpl.cpp
@@ -1115,7 +1115,7 @@ void DocumentImpl::setUserStyleSheet( const QString& sheet )
 {
     if ( m_usersheet != sheet ) {
         m_usersheet = sheet;
-        recalcStyle( Force );
+	updateStyleSelector();
     }
 }
 
diff --git a/WebCore/kwq/WebCoreBridge.mm b/WebCore/kwq/WebCoreBridge.mm
index a8ed932..c036704 100644
--- a/WebCore/kwq/WebCoreBridge.mm
+++ b/WebCore/kwq/WebCoreBridge.mm
@@ -160,10 +160,7 @@ using khtml::RenderPart;
 
 - (void)reapplyStyles
 {
-    DOM::DocumentImpl *doc = part->impl->getDocument();
-    if (doc && doc->renderer()) {
-        doc->updateStyleSelector();
-    }
+    return part->reparseConfiguration();
 }
 
 - (void)forceLayout

-- 
WebKit Debian packaging