[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 ae68fe952578c3f5bfa3889269b1db455ac9ecb4
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 3 23:37:09 2003 +0000

    	Fix 3472200, media tests fail to parse correctly.  Merging a patch to handle exotic media types
    	from the KHTML trunk.
    
            * khtml/css/parser.cpp:
            * khtml/css/parser.y:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5372 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index fd7c88e..635b0c2 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,13 @@
 2003-11-03  David Hyatt  <hyatt at apple.com>
 
+	Fix 3472200, media tests fail to parse correctly.  Merging a patch to handle exotic media types
+	from the KHTML trunk.
+
+        * khtml/css/parser.cpp:
+        * khtml/css/parser.y:
+
+2003-11-03  David Hyatt  <hyatt at apple.com>
+
 	Fix for 3471314, make sure to check the outline phase before painting backgrounds of iframes.
 	
         Reviewed by mjs
diff --git a/WebCore/khtml/css/parser.cpp b/WebCore/khtml/css/parser.cpp
index bc6f706..d5a3b12 100644
--- a/WebCore/khtml/css/parser.cpp
+++ b/WebCore/khtml/css/parser.cpp
@@ -1208,7 +1208,7 @@ case 27:
 	kdDebug( 6080 ) << "@import: " << qString(yyvsp[-3].string) << endl;
 #endif
 	CSSParser *p = static_cast<CSSParser *>(parser);
-	if ( p->styleElement && p->styleElement->isCSSStyleSheet() )
+	if ( yyvsp[-1].mediaList && p->styleElement && p->styleElement->isCSSStyleSheet() )
 	    yyval.rule = new CSSImportRuleImpl( p->styleElement, domString(yyvsp[-3].string), yyvsp[-1].mediaList );
 	else {
 	    yyval.rule = 0;
@@ -1231,7 +1231,7 @@ case 29:
 case 32:
 #line 358 "parser.y"
 {
-        yyval.mediaList = 0;
+        yyval.mediaList = new MediaListImpl();
      ;
     break;}
 case 34:
@@ -1244,7 +1244,7 @@ case 35:
 #line 369 "parser.y"
 {
 	yyval.mediaList = new MediaListImpl();
-	yyval.mediaList->appendMedium( domString(yyvsp[0].string) );
+	yyval.mediaList->appendMedium( domString(yyvsp[0].string).lower() );
     ;
     break;}
 case 36:
diff --git a/WebCore/khtml/css/parser.y b/WebCore/khtml/css/parser.y
index a711d6b..ca9dcc4 100644
--- a/WebCore/khtml/css/parser.y
+++ b/WebCore/khtml/css/parser.y
@@ -334,7 +334,7 @@ import:
 	kdDebug( 6080 ) << "@import: " << qString($3) << endl;
 #endif
 	CSSParser *p = static_cast<CSSParser *>(parser);
-	if ( p->styleElement && p->styleElement->isCSSStyleSheet() )
+	if ( $5 && p->styleElement && p->styleElement->isCSSStyleSheet() )
 	    $$ = new CSSImportRuleImpl( p->styleElement, domString($3), $5 );
 	else {
 	    $$ = 0;
@@ -356,7 +356,7 @@ string_or_uri:
 
 maybe_media_list:
      /* empty */ {
-        $$ = 0;
+        $$ = new MediaListImpl();
      }
      | media_list
 ;
@@ -368,7 +368,7 @@ media_list:
     }
     | medium {
 	$$ = new MediaListImpl();
-	$$->appendMedium( domString($1) );
+	$$->appendMedium( domString($1).lower() );
     }
     | media_list ',' maybe_space medium {
 	$$ = $1;

-- 
WebKit Debian packaging