git://git.webkit.org / WebKit-https.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7bc43f0)
Fix from Carston Guenther for bugzilla bug 3236.
authorhyatt <hyatt@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 10 Jun 2005 06:47:36 +0000 (06:47 +0000)
committerhyatt <hyatt@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 10 Jun 2005 06:47:36 +0000 (06:47 +0000)
attr(x) should work even if x is not present on the element.

This is Radar bug #3584466

        Reviewed by hyatt

        Test cases added: fast/css-generated-content/013.html

        * khtml/css/cssstyleselector.cpp:
        (khtml::CSSStyleSelector::applyProperty):
        * layout-tests/fast/css-generated-content/013-expected.txt: Added.
        * layout-tests/fast/css-generated-content/013.html: Added.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@9351 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/fast/css-generated-content/013-expected.txt [new file with mode: 0644] patch | blob
LayoutTests/fast/css-generated-content/013.html [new file with mode: 0644] patch | blob
WebCore/ChangeLog-2005-08-23 patch | blob | history
WebCore/khtml/css/cssstyleselector.cpp patch | blob | history

diff --git a/LayoutTests/fast/css-generated-content/013-expected.txt b/LayoutTests/fast/css-generated-content/013-expected.txt
new file mode 100644 (file)
index 0000000..1535e04
--- /dev/null
+++ b/LayoutTests/fast/css-generated-content/013-expected.txt
@@ -0,0 +1,41 @@
+layer at (0,0) size 800x600
+  RenderCanvas 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 {H1} at (0,0) size 784x37
+        RenderInline (generated) at (0,0) size 207x37
+          RenderText at (0,0) size 207x37
+            text run at (0,0) width 207: "First Chapter: "
+        RenderText {TEXT} at (207,0) size 105x37
+          text run at (207,0) width 105: "TEST 1"
+      RenderBlock (anonymous) at (0,58) size 784x18
+        RenderText {TEXT} at (0,0) size 239x18
+          text run at (0,0) width 239: "Should read: \"First Chapter: TEST 1\""
+      RenderBlock {H2} at (0,95) size 784x28
+        RenderInline (generated) at (0,0) size 99x28
+          RenderText at (0,0) size 99x28
+            text run at (0,0) width 99: "Chapter: "
+        RenderText {TEXT} at (99,0) size 79x28
+          text run at (99,0) width 79: "TEST 2"
+      RenderBlock (anonymous) at (0,142) size 784x18
+        RenderText {TEXT} at (0,0) size 207x18
+          text run at (0,0) width 207: "Should read: \"Chapter: TEST 2\""
+      RenderBlock {H3} at (0,178) size 784x22
+        RenderInline (generated) at (0,0) size 118x22
+          RenderText at (0,0) size 118x22
+            text run at (0,0) width 118: "Chapter One: "
+        RenderText {TEXT} at (118,0) size 65x22
+          text run at (118,0) width 65: "TEST 3"
+      RenderBlock (anonymous) at (0,218) size 784x18
+        RenderText {TEXT} at (0,0) size 238x18
+          text run at (0,0) width 238: "Should read: \"Chapter One: TEST 3\""
+      RenderBlock {H4} at (0,257) size 784x18
+        RenderInline (generated) at (0,0) size 66x18
+          RenderText at (0,0) size 66x18
+            text run at (0,0) width 66: "Chapter: "
+        RenderText {TEXT} at (66,0) size 54x18
+          text run at (66,0) width 54: "TEST 4"
+      RenderBlock (anonymous) at (0,296) size 784x18
+        RenderText {TEXT} at (0,0) size 207x18
+          text run at (0,0) width 207: "Should read: \"Chapter: TEST 4\""
diff --git a/LayoutTests/fast/css-generated-content/013.html b/LayoutTests/fast/css-generated-content/013.html
new file mode 100644 (file)
index 0000000..b05c92f
--- /dev/null
+++ b/LayoutTests/fast/css-generated-content/013.html
@@ -0,0 +1,28 @@
+<html>
+<head>
+<title>CSS content test</title>
+<style>
+H1:before {
+  content: attr(myAttr) " Chapter: "
+}
+H2:before {
+  content: attr(myAttr) "Chapter: "
+}
+H3:before {
+  content: "Chapter " attr(myAttr) ": "
+}
+H4:before {
+  content: "Chapter: " attr(myAttr)
+}
+</style>
+</head>
+<body>
+<h1 myAttr="First">TEST 1</h1>
+Should read: "First Chapter: TEST 1"
+<h2>TEST 2</h2>
+Should read: "Chapter: TEST 2"
+<h3 myAttr="One">TEST 3</h3>
+Should read: "Chapter One: TEST 3"
+<h4>TEST 4</h4>
+Should read: "Chapter: TEST 4"
+</body>
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 6ce35caeda824e8870b31ed5baa7cef887c513bc..87719c60b5a84ca3fa27fa1b7e5daf60737d25d3 100644 (file)
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,20 @@
+2005-06-09  David Hyatt  <hyatt@apple.com>
+
+       Fix from Carston Guenther for bugzilla bug 3236.
+
+       attr(x) should work even if x is not present on the element.
+
+       This is Radar bug #3584466
+       
+        Reviewed by hyatt
+
+        Test cases added: fast/css-generated-content/013.html
+
+        * khtml/css/cssstyleselector.cpp:
+        (khtml::CSSStyleSelector::applyProperty):
+        * layout-tests/fast/css-generated-content/013-expected.txt: Added.
+        * layout-tests/fast/css-generated-content/013.html: Added.
+
 2005-06-09  Darin Adler  <darin@apple.com>
 
         Tested by Mark Rowe.
diff --git a/WebCore/khtml/css/cssstyleselector.cpp b/WebCore/khtml/css/cssstyleselector.cpp
index 0b3331d95061500fe93ae14bef10004e1c715b5c..5069133af4c5bb364761dcb8b9f4aa6c3bc219b9 100644 (file)
--- a/WebCore/khtml/css/cssstyleselector.cpp
+++ b/WebCore/khtml/css/cssstyleselector.cpp
@@ -3042,8 +3042,12 @@ void CSSStyleSelector::applyProperty( int id, DOM::CSSValueImpl *value )
                 // just the hardcoded HTML set.  Can a namespace be specified for
                 // an attr(foo)?
                 int attrID = element->getDocument()->attrId(0, val->getStringValue().implementation(), false);
-                if (attrID)
-                    style->setContent(element->getAttribute(attrID).implementation(), i != 0);
+                if (attrID) {
+                    DOMStringImpl* v = element->getAttribute(attrID).implementation();
+                    if (!v)
+                        v = DOMStringImpl::empty(); // Don't allow v to be null, since we want to concatenate this string even if it's empty.
+                    style->setContent(v, i != 0);
+                }  
             }
             else if (val->primitiveType()==CSSPrimitiveValue::CSS_URI)
             {
Mirror of the WebKit open source project from svn.webkit.org.