[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

hyatt hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:29:09 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 7e0b2c0becf084f454bba097620753732271d7ed
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Mar 11 23:39:21 2003 +0000

    	Fix for tantek's slides, this is an issue on diveintomark's
    	list as well.  <style> was not honoring any media attributes
    	set on it, so print stylesheets were being applied to the screen,
    	etc.!
    
            Reviewed by rjw
    
            * khtml/html/html_headimpl.cpp:
            (HTMLStyleElementImpl::childrenChanged):
            * khtml/html/html_headimpl.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3801 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index b172401..4a69b37 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,16 @@
+2003-03-11  David Hyatt  <hyatt at apple.com>
+
+	Fix for tantek's slides, this is an issue on diveintomark's
+	list as well.  <style> was not honoring any media attributes
+	set on it, so print stylesheets were being applied to the screen,
+	etc.!
+	
+        Reviewed by rjw
+
+        * khtml/html/html_headimpl.cpp:
+        (HTMLStyleElementImpl::childrenChanged):
+        * khtml/html/html_headimpl.h:
+
 === Safari-66 ===
 
 2003-03-11  Darin Adler  <darin at apple.com>
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index b172401..4a69b37 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,16 @@
+2003-03-11  David Hyatt  <hyatt at apple.com>
+
+	Fix for tantek's slides, this is an issue on diveintomark's
+	list as well.  <style> was not honoring any media attributes
+	set on it, so print stylesheets were being applied to the screen,
+	etc.!
+	
+        Reviewed by rjw
+
+        * khtml/html/html_headimpl.cpp:
+        (HTMLStyleElementImpl::childrenChanged):
+        * khtml/html/html_headimpl.h:
+
 === Safari-66 ===
 
 2003-03-11  Darin Adler  <darin at apple.com>
diff --git a/WebCore/khtml/html/html_headimpl.cpp b/WebCore/khtml/html/html_headimpl.cpp
index 42d5bc4..d35a80a 100644
--- a/WebCore/khtml/html/html_headimpl.cpp
+++ b/WebCore/khtml/html/html_headimpl.cpp
@@ -419,6 +419,8 @@ void HTMLStyleElementImpl::childrenChanged()
         m_sheet = new CSSStyleSheetImpl(this);
         m_sheet->ref();
         m_sheet->parseString( text, !getDocument()->inQuirksMode() );
+        MediaListImpl *media = new MediaListImpl( m_sheet, m_media );
+        m_sheet->setMedia( media );
         m_loading = false;
     }
 
diff --git a/WebCore/khtml/html/html_headimpl.h b/WebCore/khtml/html/html_headimpl.h
index fa4cb71..a683965 100644
--- a/WebCore/khtml/html/html_headimpl.h
+++ b/WebCore/khtml/html/html_headimpl.h
@@ -161,7 +161,7 @@ public:
     void sheetLoaded();
 
 protected:
-    StyleSheetImpl *m_sheet;
+    CSSStyleSheetImpl *m_sheet;
     bool m_loading;
     DOMString m_type;
     QString m_media;

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list