[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
carol.szabo at nokia.com
carol.szabo at nokia.com
Wed Dec 22 15:46:41 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 37b2744531851335faaa659de050c39ce7584e8b
Author: carol.szabo at nokia.com <carol.szabo at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Nov 12 04:35:57 2010 +0000
2010-11-11 Carol Szabo <carol.szabo at nokia.com>
Reviewed by Kent Tamura.
css2:order of counters in out-of flow content
https://bugs.webkit.org/show_bug.cgi?id=32412
* fast/css/content: Added.
* fast/css/content/content-none-expected.txt: Added.
* fast/css/content/content-none.html: Added.
* fast/css/content/content-normal-expected.txt: Added.
* fast/css/content/content-normal.html: Added.
Added to provide portable tests for the "content" CSS property.
* platform/mac/css2.1/t1204-order-01-d-expected.checksum:
* platform/mac/css2.1/t1204-order-01-d-expected.png:
* platform/mac/css2.1/t1204-order-01-d-expected.txt:
Changed because the existing content was bad, but matching the
existing bug that this patch fixes.
2010-11-11 Carol Szabo <carol.szabo at nokia.com>
Reviewed by Kent Tamura.
css2:order of counters in out-of flow content
https://bugs.webkit.org/show_bug.cgi?id=32412
Tests: fast/css/content/content-none.html
fast/css/content/content-normal.html
* css/CSSParser.cpp:
(WebCore::CSSParser::parseContent):
Added support for none, normal, open-quote, no-open-quote, etc.
identifiers in terms of parsing only, as this has effect on the
evaluation of counters. No further implementation needed for
none and normal, the others are parsed but do not work as expected.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71882 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 1c9adda..0a4fc1e 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,22 @@
+2010-11-11 Carol Szabo <carol.szabo at nokia.com>
+
+ Reviewed by Kent Tamura.
+
+ css2:order of counters in out-of flow content
+ https://bugs.webkit.org/show_bug.cgi?id=32412
+
+ * fast/css/content: Added.
+ * fast/css/content/content-none-expected.txt: Added.
+ * fast/css/content/content-none.html: Added.
+ * fast/css/content/content-normal-expected.txt: Added.
+ * fast/css/content/content-normal.html: Added.
+ Added to provide portable tests for the "content" CSS property.
+ * platform/mac/css2.1/t1204-order-01-d-expected.checksum:
+ * platform/mac/css2.1/t1204-order-01-d-expected.png:
+ * platform/mac/css2.1/t1204-order-01-d-expected.txt:
+ Changed because the existing content was bad, but matching the
+ existing bug that this patch fixes.
+
2010-11-11 Chang Shu <chang.shu at nokia.com>
Reviewed by Antonio Gomes.
diff --git a/LayoutTests/fast/css/content/content-none-expected.txt b/LayoutTests/fast/css/content/content-none-expected.txt
new file mode 100644
index 0000000..c09741c
--- /dev/null
+++ b/LayoutTests/fast/css/content/content-none-expected.txt
@@ -0,0 +1,10 @@
+The texts between the markers should be identical.
+========Marker1========
+
+12345678901234567890 1 1 1 1 1 1 1 1 1 1 1 1 1 11 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 11 1
+========Marker2========
+
+12345678901234567890 1 1 1 1 1 1 1 1 1 1 1 1 1 11 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 11 1
+========Marker3========
+
+PASSED
diff --git a/LayoutTests/fast/css/content/content-none.html b/LayoutTests/fast/css/content/content-none.html
new file mode 100644
index 0000000..31b7c65
--- /dev/null
+++ b/LayoutTests/fast/css/content/content-none.html
@@ -0,0 +1,46 @@
+<html>
+
+ <head>
+ <style type="text/css">
+ span:before { content: "TEST FAILED"; }
+ #test:before { content: none; }
+ </style>
+ <script type="text/javascript">
+ if (window.layoutTestController) {
+ layoutTestController.dumpAsText();
+ layoutTestController.waitUntilDone();
+ }
+
+ function run() {
+ testWidth = window.getComputedStyle(document.getElementById("testContainer"), null).getPropertyValue("width");
+ referenceWidth=window.getComputedStyle(document.getElementById("reference"), null).getPropertyValue("width");
+ if (testWidth == referenceWidth)
+ document.getElementById("console").innerText = "PASSED";
+ else
+ document.getElementById("console").innerText = "FAILED: testWidth=" + testWidth +"; expected " + referenceWidth;
+ if (window.layoutTestController)
+ layoutTestController.notifyDone();
+ }
+ </script>
+ </head>
+
+ <body onload="setTimeout('run()', 0);">
+ The texts between the markers should be identical.
+ <p>========Marker1========</p>
+ <table>
+ <tr>
+ <td id="testContainer"><span id="test">12345678901234567890</span></td>
+ <td>1 1 1 1 1 1 1 1 1 1 1 1 1 11 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 11 1 </td>
+ </tr>
+ </table>
+ <p>========Marker2========</p>
+ <table>
+ <tr>
+ <td id="reference">12345678901234567890</td>
+ <td>1 1 1 1 1 1 1 1 1 1 1 1 1 11 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 11 1 </td>
+ </tr>
+ </table>
+ <p>========Marker3========</p>
+ <pre id="console"/>
+ </body>
+</html>
diff --git a/LayoutTests/fast/css/content/content-normal-expected.txt b/LayoutTests/fast/css/content/content-normal-expected.txt
new file mode 100644
index 0000000..c09741c
--- /dev/null
+++ b/LayoutTests/fast/css/content/content-normal-expected.txt
@@ -0,0 +1,10 @@
+The texts between the markers should be identical.
+========Marker1========
+
+12345678901234567890 1 1 1 1 1 1 1 1 1 1 1 1 1 11 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 11 1
+========Marker2========
+
+12345678901234567890 1 1 1 1 1 1 1 1 1 1 1 1 1 11 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 11 1
+========Marker3========
+
+PASSED
diff --git a/LayoutTests/fast/css/content/content-normal.html b/LayoutTests/fast/css/content/content-normal.html
new file mode 100644
index 0000000..30132b3
--- /dev/null
+++ b/LayoutTests/fast/css/content/content-normal.html
@@ -0,0 +1,46 @@
+<html>
+
+ <head>
+ <style type="text/css">
+ span:before { content: "TEST FAILED"; }
+ #test:before { content: normal; }
+ </style>
+ <script type="text/javascript">
+ if (window.layoutTestController) {
+ layoutTestController.dumpAsText();
+ layoutTestController.waitUntilDone();
+ }
+
+ function run() {
+ testWidth = window.getComputedStyle(document.getElementById("testContainer"), null).getPropertyValue("width");
+ referenceWidth=window.getComputedStyle(document.getElementById("reference"), null).getPropertyValue("width");
+ if (testWidth == referenceWidth)
+ document.getElementById("console").innerText = "PASSED";
+ else
+ document.getElementById("console").innerText = "FAILED: testWidth=" + testWidth +"; expected " + referenceWidth;
+ if (window.layoutTestController)
+ layoutTestController.notifyDone();
+ }
+ </script>
+ </head>
+
+ <body onload="setTimeout('run()', 0);">
+ The texts between the markers should be identical.
+ <p>========Marker1========</p>
+ <table>
+ <tr>
+ <td id="testContainer"><span id="test">12345678901234567890</span></td>
+ <td>1 1 1 1 1 1 1 1 1 1 1 1 1 11 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 11 1 </td>
+ </tr>
+ </table>
+ <p>========Marker2========</p>
+ <table>
+ <tr>
+ <td id="reference">12345678901234567890</td>
+ <td>1 1 1 1 1 1 1 1 1 1 1 1 1 11 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 11 1 </td>
+ </tr>
+ </table>
+ <p>========Marker3========</p>
+ <pre id="console"/>
+ </body>
+</html>
diff --git a/LayoutTests/platform/mac/css2.1/t1204-order-01-d-expected.checksum b/LayoutTests/platform/mac/css2.1/t1204-order-01-d-expected.checksum
index a1c2440..ea9fc04 100644
--- a/LayoutTests/platform/mac/css2.1/t1204-order-01-d-expected.checksum
+++ b/LayoutTests/platform/mac/css2.1/t1204-order-01-d-expected.checksum
@@ -1 +1 @@
-23543ccac399eae5e6f13f4ed4458565
\ No newline at end of file
+3f27a8545e32302f5b23ce60e34467f8
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/css2.1/t1204-order-01-d-expected.png b/LayoutTests/platform/mac/css2.1/t1204-order-01-d-expected.png
index 8455735..c0a28b3 100644
Binary files a/LayoutTests/platform/mac/css2.1/t1204-order-01-d-expected.png and b/LayoutTests/platform/mac/css2.1/t1204-order-01-d-expected.png differ
diff --git a/LayoutTests/platform/mac/css2.1/t1204-order-01-d-expected.txt b/LayoutTests/platform/mac/css2.1/t1204-order-01-d-expected.txt
index e97c611..3eac12c 100644
--- a/LayoutTests/platform/mac/css2.1/t1204-order-01-d-expected.txt
+++ b/LayoutTests/platform/mac/css2.1/t1204-order-01-d-expected.txt
@@ -1,13 +1,13 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x195
- RenderBlock {HTML} at (0,0) size 800x195
- RenderBody {BODY} at (8,16) size 784x171
+layer at (0,0) size 800x177
+ RenderBlock {HTML} at (0,0) size 800x177
+ RenderBody {BODY} at (8,16) size 784x153
RenderBlock {P} at (0,0) size 784x18
RenderText {#text} at (0,0) size 730x18
text run at (0,0) width 408: "You should see nine boxes below, each just containing a unique "
text run at (408,0) width 322: "multiple of eleven, from 11 to 99, and nothing else."
- RenderBlock {UL} at (0,34) size 784x137
+ RenderBlock {UL} at (0,34) size 784x119
RenderBlock {LI} at (0,0) size 50x20 [border: (1px solid #000000)]
RenderInline (generated) at (0,0) size 8x18
RenderCounter at (1,1) size 8x18
@@ -20,19 +20,19 @@ layer at (0,0) size 800x195
text run at (1,1) width 8: "2"
RenderText {#text} at (9,1) size 8x18
text run at (9,1) width 8: "2"
- RenderBlock {LI} at (0,77) size 50x20 [border: (1px solid #000000)]
+ RenderBlock {LI} at (0,59) size 50x20 [border: (1px solid #000000)]
RenderInline (generated) at (0,0) size 8x18
RenderCounter at (1,1) size 8x18
text run at (1,1) width 8: "5"
RenderText {#text} at (9,1) size 8x18
text run at (9,1) width 8: "5"
- RenderBlock {LI} at (0,97) size 50x20 [border: (1px solid #000000)]
+ RenderBlock {LI} at (0,79) size 50x20 [border: (1px solid #000000)]
RenderInline (generated) at (0,0) size 8x18
RenderCounter at (1,1) size 8x18
text run at (1,1) width 8: "7"
RenderText {#text} at (9,1) size 8x18
text run at (9,1) width 8: "7"
- RenderBlock {LI} at (0,117) size 50x20 [border: (1px solid #000000)]
+ RenderBlock {LI} at (0,99) size 50x20 [border: (1px solid #000000)]
RenderInline (generated) at (0,0) size 8x18
RenderCounter at (1,1) size 8x18
text run at (1,1) width 8: "9"
@@ -45,13 +45,8 @@ layer at (8,70) size 50x39
text run at (1,20) width 8: "3"
RenderText {#text} at (9,20) size 8x18
text run at (9,20) width 8: "3"
-layer at (8,109) size 48x18
- RenderBlock (relative positioned) {LI} at (0,59) size 48x18
- RenderInline (generated) at (0,0) size 8x18
- RenderCounter at (0,0) size 8x18
- text run at (0,0) width 8: "4"
-layer at (136,127) size 50x20
- RenderBlock (positioned) {DIV} at (128,18) size 50x20 [border: (1px solid #000000)]
+layer at (136,109) size 50x20
+ RenderBlock (positioned) {DIV} at (128,0) size 50x20 [border: (1px solid #000000)]
RenderInline (generated) at (0,0) size 8x18
RenderCounter at (1,1) size 8x18
text run at (1,1) width 8: "4"
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 38956d5..4318125 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2010-11-11 Carol Szabo <carol.szabo at nokia.com>
+
+ Reviewed by Kent Tamura.
+
+ css2:order of counters in out-of flow content
+ https://bugs.webkit.org/show_bug.cgi?id=32412
+
+ Tests: fast/css/content/content-none.html
+ fast/css/content/content-normal.html
+
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::parseContent):
+ Added support for none, normal, open-quote, no-open-quote, etc.
+ identifiers in terms of parsing only, as this has effect on the
+ evaluation of counters. No further implementation needed for
+ none and normal, the others are parsed but do not work as expected.
+
2010-11-11 Julie-Jeongeun-Kim <jiyuluna at gmail.com>
Reviewed by Kent Tamura.
diff --git a/WebCore/css/CSSParser.cpp b/WebCore/css/CSSParser.cpp
index 8b5b520..c2f80d4 100644
--- a/WebCore/css/CSSParser.cpp
+++ b/WebCore/css/CSSParser.cpp
@@ -2365,7 +2365,19 @@ bool CSSParser::parseContent(int propId, bool important)
// close-quote
// no-open-quote
// no-close-quote
+ // inherit
// FIXME: These are not yet implemented (http://bugs.webkit.org/show_bug.cgi?id=6503).
+ // none
+ // normal
+ switch (val->id) {
+ case CSSValueOpenQuote:
+ case CSSValueCloseQuote:
+ case CSSValueNoOpenQuote:
+ case CSSValueNoCloseQuote:
+ case CSSValueNone:
+ case CSSValueNormal:
+ parsedValue = CSSPrimitiveValue::createIdentifier(val->id);
+ }
} else if (val->unit == CSSPrimitiveValue::CSS_STRING) {
parsedValue = CSSPrimitiveValue::create(val->string, CSSPrimitiveValue::CSS_STRING);
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list