[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
commit-queue at webkit.org
commit-queue at webkit.org
Sun Feb 20 23:11:22 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit 24d88fafd43270e70b4c0d72639c1c86983bb151
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Jan 18 20:37:44 2011 +0000
2011-01-18 Krithigassree Sambamurthy <krithigassree.sambamurthy at nokia.com>
Reviewed by Simon Fraser.
Support background-clip: content-box
https://bugs.webkit.org/show_bug.cgi?id=48771
Addded content-box as a valid background-clip value.
* WebCore/css/CSSParser.cpp:
(WebCore::parseBackgroundClip):
2011-01-18 Krithigassree Sambamurthy <krithigassree.sambamurthy at nokia.com>
Reviewed by Simon Fraser.
Support background-clip: content-box
https://bugs.webkit.org/show_bug.cgi?id=48771
Added test cases to check the various valid background-clip values.
* fast/css/background-clip-text-expected.txt:
* fast/css/background-clip-values-expected.checksum: Added.
* fast/css/background-clip-values-expected.txt: Added.
* fast/css/background-clip-values.html: Added.
* fast/css/script-tests/background-clip-text.js:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76047 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/ChangeLog b/ChangeLog
index 44aa7a9..6a9a834 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2011-01-18 Krithigassree Sambamurthy <krithigassree.sambamurthy at nokia.com>
+
+ Reviewed by Simon Fraser.
+
+ Support background-clip: content-box
+ https://bugs.webkit.org/show_bug.cgi?id=48771
+
+ Addded content-box as a valid background-clip value.
+
+ * WebCore/css/CSSParser.cpp:
+ (WebCore::parseBackgroundClip):
+
2011-01-18 Hayato Ito <hayato at chromium.org>
Reviewed by Kent Tamura.
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 4f906be..84eb96f 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,18 @@
+2011-01-18 Krithigassree Sambamurthy <krithigassree.sambamurthy at nokia.com>
+
+ Reviewed by Simon Fraser.
+
+ Support background-clip: content-box
+ https://bugs.webkit.org/show_bug.cgi?id=48771
+
+ Added test cases to check the various valid background-clip values.
+
+ * fast/css/background-clip-text-expected.txt:
+ * fast/css/background-clip-values-expected.checksum: Added.
+ * fast/css/background-clip-values-expected.txt: Added.
+ * fast/css/background-clip-values.html: Added.
+ * fast/css/script-tests/background-clip-text.js:
+
2011-01-18 Chris Fleizach <cfleizach at apple.com>
Reviewed by Darin Adler.
diff --git a/LayoutTests/fast/css/background-clip-text-expected.txt b/LayoutTests/fast/css/background-clip-text-expected.txt
index d00cd7e..6e11a77 100644
--- a/LayoutTests/fast/css/background-clip-text-expected.txt
+++ b/LayoutTests/fast/css/background-clip-text-expected.txt
@@ -5,6 +5,9 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
PASS test("background-clip: -webkit-text", "background-clip") is "-webkit-text"
PASS test("background-clip: -webkit-text", "-webkit-background-clip") is null
+PASS test("background-clip: content-box", "background-clip") is "content-box"
+PASS test("background-clip: padding-box", "background-clip") is "padding-box"
+PASS test("background-clip: border-box", "background-clip") is "border-box"
PASS test("background-clip: text", "background-clip") is null
PASS test("background-clip: text", "-webkit-background-clip") is null
PASS test("-webkit-background-clip: -webkit-text", "background-clip") is null
diff --git a/LayoutTests/fast/css/background-clip-values-expected.checksum b/LayoutTests/fast/css/background-clip-values-expected.checksum
new file mode 100644
index 0000000..c87f5fa
--- /dev/null
+++ b/LayoutTests/fast/css/background-clip-values-expected.checksum
@@ -0,0 +1 @@
+fafe81b6ca9645ab386aec2870607c28
\ No newline at end of file
diff --git a/LayoutTests/fast/css/background-clip-values-expected.txt b/LayoutTests/fast/css/background-clip-values-expected.txt
new file mode 100644
index 0000000..a5a5238
--- /dev/null
+++ b/LayoutTests/fast/css/background-clip-values-expected.txt
@@ -0,0 +1,8 @@
+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 784x584
+ RenderBlock {DIV} at (0,0) size 280x135 [bgcolor=#008000] [border: (15px dashed #000000)]
+ RenderBlock {DIV} at (0,135) size 280x135 [bgcolor=#008000] [border: (15px dashed #000000)]
+ RenderBlock {DIV} at (0,270) size 280x135 [bgcolor=#008000] [border: (15px dashed #000000)]
diff --git a/LayoutTests/fast/css/background-clip-values.html b/LayoutTests/fast/css/background-clip-values.html
new file mode 100644
index 0000000..69fb318
--- /dev/null
+++ b/LayoutTests/fast/css/background-clip-values.html
@@ -0,0 +1,35 @@
+<html>
+<head>
+<title>Testing Background clip values</title>
+<style type="text/css">
+div {
+ border: 15px dashed black;
+ background-color:green;
+ padding: 15px 25px;
+ height: 75px;
+ width: 200px;
+}
+
+#box1 {
+ background-clip: content-box;
+}
+#box2 {
+ background-clip: padding-box;
+}
+#box3 {
+ background-clip: border-box;
+}
+</style>
+</head>
+<body>
+<div id="box1">
+<!-- Background color should be clipped to the content box. Padding space is white.-->
+</div>
+<div id="box2">
+<!-- Background color should be clipped to the padding box. Padding space is green.-->
+</div>
+<div id="box3">
+<!--Background color should be clipped to the border box. Green should be visible within the dashed border.-->
+</div>
+</body>
+</html>
diff --git a/LayoutTests/fast/css/script-tests/background-clip-text.js b/LayoutTests/fast/css/script-tests/background-clip-text.js
index 00005fa..095816b 100644
--- a/LayoutTests/fast/css/script-tests/background-clip-text.js
+++ b/LayoutTests/fast/css/script-tests/background-clip-text.js
@@ -17,6 +17,10 @@ function test(declaration, property)
shouldBe('test("background-clip: -webkit-text", "background-clip")', '"-webkit-text"');
shouldBe('test("background-clip: -webkit-text", "-webkit-background-clip")', 'null');
+shouldBe('test("background-clip: content-box", "background-clip")', '"content-box"');
+shouldBe('test("background-clip: padding-box", "background-clip")', '"padding-box"');
+shouldBe('test("background-clip: border-box", "background-clip")', '"border-box"');
+
shouldBe('test("background-clip: text", "background-clip")', 'null');
shouldBe('test("background-clip: text", "-webkit-background-clip")', 'null');
diff --git a/Source/WebCore/css/CSSParser.cpp b/Source/WebCore/css/CSSParser.cpp
index 6aa53cc..a4ded65 100644
--- a/Source/WebCore/css/CSSParser.cpp
+++ b/Source/WebCore/css/CSSParser.cpp
@@ -1872,7 +1872,8 @@ void CSSParser::addFillValue(RefPtr<CSSValue>& lval, PassRefPtr<CSSValue> rval)
static bool parseBackgroundClip(CSSParserValue* parserValue, RefPtr<CSSValue>& cssValue)
{
- if (parserValue->id == CSSValueBorderBox || parserValue->id == CSSValuePaddingBox || parserValue->id == CSSValueWebkitText) {
+ if (parserValue->id == CSSValueBorderBox || parserValue->id == CSSValuePaddingBox
+ || parserValue->id == CSSValueContentBox || parserValue->id == CSSValueWebkitText) {
cssValue = CSSPrimitiveValue::createIdentifier(parserValue->id);
return true;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list