[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
hamaji at chromium.org
hamaji at chromium.org
Wed Apr 7 23:15:22 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 73d86f9954d42f8154fab54143a898d90e3b05d6
Author: hamaji at chromium.org <hamaji at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Oct 29 22:32:04 2009 +0000
2009-10-29 Shinichiro Hamaji <hamaji at chromium.org>
Reviewed by Darin Adler.
fast/css/counters/invalidate-cached-counter-node can be dumpAsText
https://bugs.webkit.org/show_bug.cgi?id=30931
* fast/css/counters/invalidate-cached-counter-node-expected.txt: Added.
* fast/css/counters/invalidate-cached-counter-node.html:
* platform/mac/fast/css/counters/invalidate-cached-counter-node-expected.checksum: Removed.
* platform/mac/fast/css/counters/invalidate-cached-counter-node-expected.png: Removed.
* platform/mac/fast/css/counters/invalidate-cached-counter-node-expected.txt: Removed.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50304 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 1f8a9f1..0629a2b 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2009-10-29 Shinichiro Hamaji <hamaji at chromium.org>
+
+ Reviewed by Darin Adler.
+
+ fast/css/counters/invalidate-cached-counter-node can be dumpAsText
+ https://bugs.webkit.org/show_bug.cgi?id=30931
+
+ * fast/css/counters/invalidate-cached-counter-node-expected.txt: Added.
+ * fast/css/counters/invalidate-cached-counter-node.html:
+ * platform/mac/fast/css/counters/invalidate-cached-counter-node-expected.checksum: Removed.
+ * platform/mac/fast/css/counters/invalidate-cached-counter-node-expected.png: Removed.
+ * platform/mac/fast/css/counters/invalidate-cached-counter-node-expected.txt: Removed.
+
2009-10-29 Csaba Osztrogonác <ossy at webkit.org>
[Qt] Remove some tests that now pass.
diff --git a/LayoutTests/fast/css/counters/invalidate-cached-counter-node-expected.txt b/LayoutTests/fast/css/counters/invalidate-cached-counter-node-expected.txt
new file mode 100644
index 0000000..a08fdd5
--- /dev/null
+++ b/LayoutTests/fast/css/counters/invalidate-cached-counter-node-expected.txt
@@ -0,0 +1,3 @@
+Test for rdar://problem/6131096 Reproducible crash in CounterNode::isReset under guard malloc.
+
+PASS
diff --git a/LayoutTests/fast/css/counters/invalidate-cached-counter-node.html b/LayoutTests/fast/css/counters/invalidate-cached-counter-node.html
index 72cf414..4f181f8 100644
--- a/LayoutTests/fast/css/counters/invalidate-cached-counter-node.html
+++ b/LayoutTests/fast/css/counters/invalidate-cached-counter-node.html
@@ -9,12 +9,27 @@
Test for <i><a href="rdar://problem/6131096">rdar://problem/6131096</a>
Reproducible crash in CounterNode::isReset under guard malloc</i>.
</p>
- <div id="destroy-me" class="test">This should not be visible</div>
- <div id="keep-me" class="test">This sentence should be numbered 1.</div>
+ <div id="view">
+ <div id="destroy-me" class="test">This should not be visible</div>
+ <div id="keep-me" class="test">This sentence should be numbered 1.</div>
+ </div>
<script>
document.body.offsetTop;
document.getElementById("destroy-me").style.display = "none";
document.body.offsetTop;
document.getElementById("keep-me").style.fontSize = "20px";
+
+ if (window.layoutTestController) {
+ layoutTestController.dumpAsText();
+ var testResult;
+ var counterValue = layoutTestController.counterValueForElementById("keep-me");
+ if (counterValue == "1")
+ testResult = "PASS";
+ else
+ testResult = 'FAIL: the counter value should have been "1", but was "' + counterValue + '".';
+ var viewElement = document.getElementById("view");
+ viewElement.parentNode.removeChild(viewElement);
+ document.body.appendChild(document.createTextNode(testResult));
+ }
</script>
</body>
diff --git a/LayoutTests/platform/mac/fast/css/counters/invalidate-cached-counter-node-expected.checksum b/LayoutTests/platform/mac/fast/css/counters/invalidate-cached-counter-node-expected.checksum
deleted file mode 100644
index 60d9bcf..0000000
--- a/LayoutTests/platform/mac/fast/css/counters/invalidate-cached-counter-node-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-fb03370481b7a00b069eb4cd4609e10b
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/css/counters/invalidate-cached-counter-node-expected.png b/LayoutTests/platform/mac/fast/css/counters/invalidate-cached-counter-node-expected.png
deleted file mode 100644
index cf48f15..0000000
Binary files a/LayoutTests/platform/mac/fast/css/counters/invalidate-cached-counter-node-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/fast/css/counters/invalidate-cached-counter-node-expected.txt b/LayoutTests/platform/mac/fast/css/counters/invalidate-cached-counter-node-expected.txt
deleted file mode 100644
index 48bd5f2..0000000
--- a/LayoutTests/platform/mac/fast/css/counters/invalidate-cached-counter-node-expected.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-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 {P} at (0,0) size 784x18
- RenderText {#text} at (0,0) size 53x18
- text run at (0,0) width 53: "Test for "
- RenderInline {I} at (0,0) size 572x18
- RenderInline {A} at (0,0) size 154x18 [color=#0000EE]
- RenderText {#text} at (53,0) size 154x18
- text run at (53,0) width 154: "rdar://problem/6131096"
- RenderText {#text} at (207,0) size 418x18
- text run at (207,0) width 4: " "
- text run at (211,0) width 414: "Reproducible crash in CounterNode::isReset under guard malloc"
- RenderText {#text} at (625,0) size 4x18
- text run at (625,0) width 4: "."
- RenderBlock {DIV} at (0,34) size 784x23
- RenderInline (generated) at (0,0) size 20x23
- RenderCounter at (0,0) size 10x23
- text run at (0,0) width 10: "1"
- RenderText at (10,0) size 10x23
- text run at (10,0) width 10: ". "
- RenderText {#text} at (20,0) size 300x23
- text run at (20,0) width 300: "This sentence should be numbered 1."
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list