[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 b70821323b83563e21ef06e9232f675673176c3f
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 7 04:19:08 2002 +0000

    	Enable user stylesheet support.  It works from a fresh start but
    	is not yet completely dynamic.
    
            * khtml/khtml_part.cpp:
            (KHTMLPart::setUserStyleSheet):
            * kwq/KWQKHTMLSettings.mm:
            (KHTMLSettings::userStyleSheet):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1762 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index f21d877..ce69509 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,13 @@
+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.
+	
+        * khtml/khtml_part.cpp:
+        (KHTMLPart::setUserStyleSheet):
+        * kwq/KWQKHTMLSettings.mm:
+        (KHTMLSettings::userStyleSheet):
+
 2002-08-06  Darin Adler  <darin at apple.com>
 
 	- fixed 2965321 -- Crash on window close in kthml::Loader::cancelRequests from particular page
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index f21d877..ce69509 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,13 @@
+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.
+	
+        * khtml/khtml_part.cpp:
+        (KHTMLPart::setUserStyleSheet):
+        * kwq/KWQKHTMLSettings.mm:
+        (KHTMLSettings::userStyleSheet):
+
 2002-08-06  Darin Adler  <darin at apple.com>
 
 	- fixed 2965321 -- Crash on window close in kthml::Loader::cancelRequests from particular page
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index f21d877..ce69509 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+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.
+	
+        * khtml/khtml_part.cpp:
+        (KHTMLPart::setUserStyleSheet):
+        * kwq/KWQKHTMLSettings.mm:
+        (KHTMLSettings::userStyleSheet):
+
 2002-08-06  Darin Adler  <darin at apple.com>
 
 	- fixed 2965321 -- Crash on window close in kthml::Loader::cancelRequests from particular page
diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index 35341d2..8431d1e 100644
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -91,8 +91,6 @@ using namespace DOM;
 
 #include "khtmlpart_p.h"
 
-#ifndef APPLE_CHANGES
-
 namespace khtml {
     class PartStyleSheetLoader : public CachedObjectClient
     {
@@ -120,6 +118,7 @@ namespace khtml {
     };
 };
 
+#ifndef APPLE_CHANGES
 
 FrameList::Iterator FrameList::find( const QString &name )
 {
@@ -1815,10 +1814,8 @@ QString KHTMLPart::encoding() const
 
 void KHTMLPart::setUserStyleSheet(const KURL &url)
 {
-#ifndef APPLE_CHANGES
   if ( d->m_doc && d->m_doc->docLoader() )
     (void) new khtml::PartStyleSheetLoader(this, url.url(), d->m_doc->docLoader());
-#endif
 }
 
 void KHTMLPart::setUserStyleSheet(const QString &styleSheet)
diff --git a/WebCore/kwq/KWQKHTMLSettings.mm b/WebCore/kwq/KWQKHTMLSettings.mm
index e467558..65f1ea4 100644
--- a/WebCore/kwq/KWQKHTMLSettings.mm
+++ b/WebCore/kwq/KWQKHTMLSettings.mm
@@ -143,5 +143,9 @@ bool KHTMLSettings::isJavaScriptDebugEnabled() const
 
 QString KHTMLSettings::userStyleSheet() const
 {
+    if ([[[NSUserDefaults standardUserDefaults] objectForKey:@"WebKitUserStyleSheetEnabledPreferenceKey"] boolValue])
+        // The user style sheet is enabled.
+	return QString::fromNSString([[NSUserDefaults standardUserDefaults] objectForKey:@"WebKitUserStyleSheetLocationPreferenceKey"]);
+
     return QString();
 }

-- 
WebKit Debian packaging