Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
2010-04-27 Yuzo Fujishima <yuzo@google.com>
Reviewed by Eric Seidel.
Enhance CSS parser for Paged Media (Iteration 2)
Parse and hold paged media rules in CSSStyleSelector.
fast/dom/script-tests/prototype-inheritance-2.js is rebaselined because it assumes @page is ignored.
https://bugs.webkit.org/show_bug.cgi?id=35782
* fast/dom/prototype-inheritance-2-expected.txt:
* fast/dom/script-tests/prototype-inheritance-2.js:
* printing/page-rule-css-text-expected.txt: Added.
* printing/page-rule-css-text.html: Added.
2010-04-27 Yuzo Fujishima <yuzo@google.com>
Reviewed by Eric Seidel.
Enhance CSS parser for Paged Media (Iteration 2)
Parse and hold paged media rules in CSSStyleSelector.
https://bugs.webkit.org/show_bug.cgi?id=35782
Test: printing/page-rule-css-text.html
* css/CSSGrammar.y:
* css/CSSPageRule.cpp:
(WebCore::CSSPageRule::CSSPageRule):
(WebCore::CSSPageRule::selectorText):
* css/CSSPageRule.h:
(WebCore::CSSPageRule::create):
(WebCore::CSSPageRule::isPageRule):
* css/CSSParser.cpp:
(WebCore::CSSParser::createPageRule):
* css/CSSStyleRule.h:
* css/CSSStyleSelector.cpp:
(WebCore::CSSRuleSet::getPageRules):
(WebCore::CSSRuleSet::CSSRuleSet):
(WebCore::CSSRuleSet::~CSSRuleSet):
(WebCore::CSSRuleSet::addPageRule):
(WebCore::CSSRuleSet::addRulesFromSheet):
* css/CSSStyleSelector.h:
* css/StyleBase.h:
(WebCore::StyleBase::isPageRule):
Canonical link: https://commits.webkit.org/49653@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@58383 268f45cc-cd09-0410-ab3c-d52691b4dbfc- Loading branch information
Yuzo Fujishima
committed
Apr 28, 2010
1 parent
849ad87
commit 8684f1c
Showing
13 changed files
with
216 additions
and
57 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| @page { margin-top: 5cm; margin-bottom: 10cm; } | ||
| @page :left { margin-right: 3cm; } | ||
| @page :right { margin-left: 3cm; } | ||
| @page :first { border-top-width: 1px; border-right-width: 1px; border-bottom-width: 1px; border-left-width: 1px; } | ||
| @page hello { color: green; } | ||
| @page world:right { color: red; } | ||
| @media print { @page somepage:first { margin-top: 3cm; margin-right: 3cm; margin-bottom: 3cm; margin-left: 3cm; } } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| <!doctype html> | ||
| <html> | ||
| <head> | ||
| <style type="text/css"> | ||
| @page { | ||
| margin-top:5cm; | ||
| margin-bottom:10cm; | ||
| } | ||
| @page :left { | ||
| margin-right:3cm; | ||
| } | ||
| @page :right { | ||
| margin-left:3cm; | ||
| } | ||
| @page :first { | ||
| border-width:1px; | ||
| } | ||
| @page hello { | ||
| color:green; | ||
| } | ||
| @page world:right { | ||
| color:red; | ||
| } | ||
| @media print { | ||
| @page somepage:first { | ||
| margin:3cm; | ||
| } | ||
| } | ||
| /* FIXME: Add the following once size property is implemented. | ||
| @page :left { | ||
| size: 4in 6in; | ||
| } | ||
| @page :right { | ||
| size: letter; | ||
| } | ||
| */ | ||
| /* FIXME: Add the following once margin at-rule is implemented. | ||
| @page :first { | ||
| @top-left-corner { | ||
| content:"TLC"; | ||
| } | ||
| @bottom-center { | ||
| content:"BC"; | ||
| } | ||
| } | ||
| */ | ||
| </style> | ||
| <script type="text/javascript"> | ||
|
|
||
| if (window.layoutTestController) | ||
| layoutTestController.dumpAsText(); | ||
|
|
||
| function print(str) | ||
| { | ||
| document.getElementById("output").innerHTML += str; | ||
| } | ||
|
|
||
| function printCssTextOfPageRules() | ||
| { | ||
| var ss = document.styleSheets; | ||
| for (var i = 0; i < ss.length; i++) { | ||
| for (var j = 0; j < ss[i].cssRules.length; j++) { | ||
| print(ss[i].cssRules[j].cssText + "<br/>"); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| </script> | ||
| </head> | ||
| <body onload="printCssTextOfPageRules();"> | ||
| <div id="output"></div> | ||
| </body> | ||
| </html> | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.