Commit eb9f6717 authored by rwlbuis's avatar rwlbuis

Reviewed by Maciej.

        http://bugzilla.opendarwin.org/show_bug.cgi?id=10893
        InsertRule can not handle @import statements

        Allow @import as part of a css rule.



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@16633 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent abd152d8
2006-09-29 Rob Buis <buis@kde.org>
Reviewed by Maciej.
Testcase for:
http://bugzilla.opendarwin.org/show_bug.cgi?id=10893
InsertRule can not handle @import statements
* fast/dom/css-insert-import-rule.html: Added.
* fast/dom/resources/css-insert-import-rule.css: Added.
2006-09-28 David Harrison <harrison@apple.com>
Reviewed by Justin.
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x576
RenderBlock {P} at (0,0) size 784x18
RenderText {#text} at (0,0) size 73x18
text run at (0,0) width 73: "Test result: "
RenderInline {SPAN} at (0,0) size 39x18
RenderText {#text} at (73,0) size 39x18
text run at (73,0) width 39: "PASS"
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x576
RenderBlock {P} at (0,0) size 784x18
RenderText {#text} at (0,0) size 73x18
text run at (0,0) width 73: "Test result: "
RenderInline {SPAN} at (0,0) size 39x18
RenderText {#text} at (73,0) size 39x18
text run at (73,0) width 39: "PASS"
<head>
<style>
div {
width: 100px;
height: 100px;
background-color: red;
}
</style>
<script>
function test() {
document.styleSheets[0].insertRule('@import url("resources/css-insert-import-rule.css");', 0);
}
</script>
</head>
<body onload="test()";>
<div></div>
</body>
div {
background-color: green !important;
}
2006-09-29 Rob Buis <buis@kde.org>
Reviewed by Maciej.
http://bugzilla.opendarwin.org/show_bug.cgi?id=10893
InsertRule can not handle @import statements
Allow @import as part of a css rule.
* css/CSSGrammar.y:
2006-09-28 David Hyatt <hyatt@apple.com>
Switch over the Mac-specific uses of viewportToContents/contentsToViewport.
......@@ -228,6 +228,7 @@ static int cssyylex(YYSTYPE *yylval) { return CSSParser::current()->lex(yylval);
%type <rule> charset
%type <rule> ruleset
%type <rule> ruleset_or_import
%type <rule> media
%type <rule> import
%type <rule> page
......@@ -297,8 +298,13 @@ stylesheet:
| webkit_mediaquery maybe_space
;
ruleset_or_import:
ruleset |
import
;
webkit_rule:
WEBKIT_RULE_SYM '{' maybe_space ruleset maybe_space '}' {
WEBKIT_RULE_SYM '{' maybe_space ruleset_or_import maybe_space '}' {
static_cast<CSSParser*>(parser)->rule = $4;
}
;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment