[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.20-204-g221d8e8
adele at apple.com
adele at apple.com
Wed Feb 10 22:11:47 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit 11b00dabdfd1ebe4e9ed9a506407daf3499b0d2b
Author: adele at apple.com <adele at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Feb 4 01:52:15 2010 +0000
WebCore: Fix for <rdar://problem/7594212>
https://bugs.webkit.org/show_bug.cgi?id=34549 - CSS counters crash at http://www.w3.org/TR/css3-content/
CrashTracer: [USER] 20 crashes in Safari at com.apple.WebCore: WebCore::CounterNode::insertAfter + 319
Reviewed by Simon Fraser.
Test: fast/css/counters/counter-before-selector-crash.html
* rendering/RenderCounter.cpp: (WebCore::updateCounters): nil check.
LayoutTests: Test for: <rdar://problem/7594212>
https://bugs.webkit.org/show_bug.cgi?id=34549 - CSS counters crash at http://www.w3.org/TR/css3-content/
CrashTracer: [USER] 20 crashes in Safari at com.apple.WebCore: WebCore::CounterNode::insertAfter + 319
Reviewed by Simon Fraser.
* fast/css/counters/counter-before-selector-crash-expected.txt: Added.
* fast/css/counters/counter-before-selector-crash.html: Added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54317 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index a660e4b..44b3184 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2010-02-03 Adele Peterson <adele at apple.com>
+
+ Reviewed by Simon Fraser.
+
+ Test for: <rdar://problem/7594212>
+ https://bugs.webkit.org/show_bug.cgi?id=34549 - CSS counters crash at http://www.w3.org/TR/css3-content/
+ CrashTracer: [USER] 20 crashes in Safari at com.apple.WebCore: WebCore::CounterNode::insertAfter + 319
+
+ * fast/css/counters/counter-before-selector-crash-expected.txt: Added.
+ * fast/css/counters/counter-before-selector-crash.html: Added.
+
2010-02-03 Csaba Osztrogonác <ossy at webkit.org>
Rubber-stamped by Ariya Hidayat.
diff --git a/LayoutTests/fast/css/counters/counter-before-selector-crash-expected.txt b/LayoutTests/fast/css/counters/counter-before-selector-crash-expected.txt
new file mode 100644
index 0000000..e6eec39
--- /dev/null
+++ b/LayoutTests/fast/css/counters/counter-before-selector-crash-expected.txt
@@ -0,0 +1,2 @@
+This tests that we don't crash when using the CSS counters feature.
+
diff --git a/LayoutTests/fast/css/counters/counter-before-selector-crash.html b/LayoutTests/fast/css/counters/counter-before-selector-crash.html
new file mode 100644
index 0000000..cbc8bc5
--- /dev/null
+++ b/LayoutTests/fast/css/counters/counter-before-selector-crash.html
@@ -0,0 +1,26 @@
+<html>
+ <head>
+ <style>
+ div.example:before {
+ content: counter(exampleno, upper-roman);
+ counter-increment: exampleno;
+ }
+ pre.example:before {
+ content: counter(exampleno, upper-roman);
+ counter-increment: exampleno;
+ }
+ </style>
+ <script>
+ function test()
+ {
+ if (window.layoutTestController)
+ layoutTestController.dumpAsText();
+ }
+ </script>
+ </head>
+ <body onload="test()">
+ This tests that we don't crash when using the CSS counters feature.
+ <div class="example"></div>
+ <pre class="example"></pre>
+ </body>
+</html>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 0325f78..50b81c0 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,17 @@
2010-02-03 Adele Peterson <adele at apple.com>
+ Reviewed by Simon Fraser.
+
+ Fix for <rdar://problem/7594212>
+ https://bugs.webkit.org/show_bug.cgi?id=34549 - CSS counters crash at http://www.w3.org/TR/css3-content/
+ CrashTracer: [USER] 20 crashes in Safari at com.apple.WebCore: WebCore::CounterNode::insertAfter + 319
+
+ Test: fast/css/counters/counter-before-selector-crash.html
+
+ * rendering/RenderCounter.cpp: (WebCore::updateCounters): nil check.
+
+2010-02-03 Adele Peterson <adele at apple.com>
+
Reviewed by Brady Eidson.
Initialize the variable in the last checkin to false. I didn't realize DRT relies on this being false.
diff --git a/WebCore/rendering/RenderCounter.cpp b/WebCore/rendering/RenderCounter.cpp
index 46bf9f4..3cb9a07 100644
--- a/WebCore/rendering/RenderCounter.cpp
+++ b/WebCore/rendering/RenderCounter.cpp
@@ -430,7 +430,8 @@ static void updateCounters(RenderObject* renderer)
continue;
if (parent)
parent->removeChild(node, it->first.get());
- newParent->insertAfter(node, newPreviousSibling, it->first.get());
+ if (newParent)
+ newParent->insertAfter(node, newPreviousSibling, it->first.get());
}
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list