[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
mihaip at chromium.org
mihaip at chromium.org
Wed Dec 22 13:43:07 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 8d95b3df959765e5980d083f135388e6f7627527
Author: mihaip at chromium.org <mihaip at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Sep 23 23:39:53 2010 +0000
2010-09-23 Mihai Parparita <mihaip at chromium.org>
Reviewed by Ojan Vafai.
[Chromium] convert clientWidthAfterDocumentIsRemoved to dumpAsText
https://bugs.webkit.org/show_bug.cgi?id=46397
As suggested in http://crbug.com/9613, this should just be a text-only
test.
* fast/dom/clientWidthAfterDocumentIsRemoved-expected.txt: Added.
* fast/dom/clientWidthAfterDocumentIsRemoved.html:
* platform/chromium-linux/fast/dom/clientWidthAfterDocumentIsRemoved-expected.checksum: Removed.
* platform/chromium-linux/fast/dom/clientWidthAfterDocumentIsRemoved-expected.png: Removed.
* platform/chromium-mac/fast/dom/clientWidthAfterDocumentIsRemoved-expected.txt: Removed.
* platform/chromium-win/fast/dom/clientWidthAfterDocumentIsRemoved-expected.checksum: Removed.
* platform/chromium-win/fast/dom/clientWidthAfterDocumentIsRemoved-expected.png: Removed.
* platform/chromium-win/fast/dom/clientWidthAfterDocumentIsRemoved-expected.txt: Removed.
* platform/chromium/test_expectations.txt:
* platform/mac/fast/dom/clientWidthAfterDocumentIsRemoved-expected.checksum: Removed.
* platform/mac/fast/dom/clientWidthAfterDocumentIsRemoved-expected.png: Removed.
* platform/mac/fast/dom/clientWidthAfterDocumentIsRemoved-expected.txt: Removed.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68214 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 2baacc4..aef11d6 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,26 @@
+2010-09-23 Mihai Parparita <mihaip at chromium.org>
+
+ Reviewed by Ojan Vafai.
+
+ [Chromium] convert clientWidthAfterDocumentIsRemoved to dumpAsText
+ https://bugs.webkit.org/show_bug.cgi?id=46397
+
+ As suggested in http://crbug.com/9613, this should just be a text-only
+ test.
+
+ * fast/dom/clientWidthAfterDocumentIsRemoved-expected.txt: Added.
+ * fast/dom/clientWidthAfterDocumentIsRemoved.html:
+ * platform/chromium-linux/fast/dom/clientWidthAfterDocumentIsRemoved-expected.checksum: Removed.
+ * platform/chromium-linux/fast/dom/clientWidthAfterDocumentIsRemoved-expected.png: Removed.
+ * platform/chromium-mac/fast/dom/clientWidthAfterDocumentIsRemoved-expected.txt: Removed.
+ * platform/chromium-win/fast/dom/clientWidthAfterDocumentIsRemoved-expected.checksum: Removed.
+ * platform/chromium-win/fast/dom/clientWidthAfterDocumentIsRemoved-expected.png: Removed.
+ * platform/chromium-win/fast/dom/clientWidthAfterDocumentIsRemoved-expected.txt: Removed.
+ * platform/chromium/test_expectations.txt:
+ * platform/mac/fast/dom/clientWidthAfterDocumentIsRemoved-expected.checksum: Removed.
+ * platform/mac/fast/dom/clientWidthAfterDocumentIsRemoved-expected.png: Removed.
+ * platform/mac/fast/dom/clientWidthAfterDocumentIsRemoved-expected.txt: Removed.
+
2010-09-23 Tony Chang <tony at chromium.org>
Reviewed by David Levin.
diff --git a/LayoutTests/fast/dom/clientWidthAfterDocumentIsRemoved-expected.txt b/LayoutTests/fast/dom/clientWidthAfterDocumentIsRemoved-expected.txt
new file mode 100644
index 0000000..2e73e5b
--- /dev/null
+++ b/LayoutTests/fast/dom/clientWidthAfterDocumentIsRemoved-expected.txt
@@ -0,0 +1,3 @@
+This test passes if it doesn't crash!
+
+
diff --git a/LayoutTests/fast/dom/clientWidthAfterDocumentIsRemoved.html b/LayoutTests/fast/dom/clientWidthAfterDocumentIsRemoved.html
index b13961f..331bff6 100644
--- a/LayoutTests/fast/dom/clientWidthAfterDocumentIsRemoved.html
+++ b/LayoutTests/fast/dom/clientWidthAfterDocumentIsRemoved.html
@@ -6,6 +6,9 @@
</iframe>
<script>
+if (window.layoutTestController)
+ layoutTestController.dumpAsText();
+
window.onload = function() {
var iframe = document.getElementById("onlybear");
var doc = iframe.contentDocument;
diff --git a/LayoutTests/platform/chromium-linux/fast/dom/clientWidthAfterDocumentIsRemoved-expected.checksum b/LayoutTests/platform/chromium-linux/fast/dom/clientWidthAfterDocumentIsRemoved-expected.checksum
deleted file mode 100644
index 9d77139..0000000
--- a/LayoutTests/platform/chromium-linux/fast/dom/clientWidthAfterDocumentIsRemoved-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-f3919ceacf25cda4eecccfa4101a5a47
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-linux/fast/dom/clientWidthAfterDocumentIsRemoved-expected.png b/LayoutTests/platform/chromium-linux/fast/dom/clientWidthAfterDocumentIsRemoved-expected.png
deleted file mode 100644
index e54ee7f..0000000
Binary files a/LayoutTests/platform/chromium-linux/fast/dom/clientWidthAfterDocumentIsRemoved-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-mac/fast/dom/clientWidthAfterDocumentIsRemoved-expected.txt b/LayoutTests/platform/chromium-mac/fast/dom/clientWidthAfterDocumentIsRemoved-expected.txt
deleted file mode 100644
index 1ac1ad2..0000000
--- a/LayoutTests/platform/chromium-mac/fast/dom/clientWidthAfterDocumentIsRemoved-expected.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL data:text/html, <!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.0//EN' 'http://www.w3.org/TR/html4/strict.dtd'><html></html> from frame with URL clientWidthAfterDocumentIsRemoved.html. Domains, protocols and ports must match.
-
-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 212x18
- text run at (0,0) width 212: "This test passes if it doesn't crash!"
- RenderBlock (anonymous) at (0,34) size 784x154
- RenderPartObject {IFRAME} at (0,0) size 304x154 [border: (2px inset #000000)]
- layer at (0,0) size 300x150
- RenderView at (0,0) size 300x150
- layer at (0,0) size 300x8
- RenderBlock {HTML} at (0,0) size 300x8
- RenderBody {BODY} at (8,8) size 284x0
- RenderText {#text} at (0,0) size 0x0
- RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/chromium-win/fast/dom/clientWidthAfterDocumentIsRemoved-expected.checksum b/LayoutTests/platform/chromium-win/fast/dom/clientWidthAfterDocumentIsRemoved-expected.checksum
deleted file mode 100644
index 7a46692..0000000
--- a/LayoutTests/platform/chromium-win/fast/dom/clientWidthAfterDocumentIsRemoved-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-5bca8afd3bb82d5703a4e72af5e513f9
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/fast/dom/clientWidthAfterDocumentIsRemoved-expected.png b/LayoutTests/platform/chromium-win/fast/dom/clientWidthAfterDocumentIsRemoved-expected.png
deleted file mode 100644
index 7973e4d..0000000
Binary files a/LayoutTests/platform/chromium-win/fast/dom/clientWidthAfterDocumentIsRemoved-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-win/fast/dom/clientWidthAfterDocumentIsRemoved-expected.txt b/LayoutTests/platform/chromium-win/fast/dom/clientWidthAfterDocumentIsRemoved-expected.txt
deleted file mode 100644
index 1daa599..0000000
--- a/LayoutTests/platform/chromium-win/fast/dom/clientWidthAfterDocumentIsRemoved-expected.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL data:text/html, <!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.0//EN' 'http://www.w3.org/TR/html4/strict.dtd'><html></html> from frame with URL clientWidthAfterDocumentIsRemoved.html. Domains, protocols and ports must match.
-
-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 784x20
- RenderText {#text} at (0,0) size 204x19
- text run at (0,0) width 204: "This test passes if it doesn't crash!"
- RenderBlock (anonymous) at (0,36) size 784x154
- RenderPartObject {IFRAME} at (0,0) size 304x154 [border: (2px inset #000000)]
- layer at (0,0) size 300x150
- RenderView at (0,0) size 300x150
- layer at (0,0) size 300x8
- RenderBlock {HTML} at (0,0) size 300x8
- RenderBody {BODY} at (8,8) size 284x0
- RenderText {#text} at (0,0) size 0x0
- RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index 936ff16..93b17d5 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -1754,9 +1754,6 @@ BUG10473 LINUX : fast/replaced/width100percent-searchfield.html = FAIL
// This test isn't just slow -- sometimes it times out indefinitely.
BUG27569 LINUX MAC WIN : http/tests/xmlhttprequest/redirect-cross-origin-tripmine.html = TIMEOUT PASS
-BUG9613 WIN LINUX : fast/dom/clientWidthAfterDocumentIsRemoved.html = IMAGE+TEXT TEXT
-BUG9613 MAC : fast/dom/clientWidthAfterDocumentIsRemoved.html = TEXT
-
// Merge WebKit 42133:42199 regressions
BUG20570 LINUX : fast/events/context-no-deselect.html = FAIL
diff --git a/LayoutTests/platform/mac/fast/dom/clientWidthAfterDocumentIsRemoved-expected.checksum b/LayoutTests/platform/mac/fast/dom/clientWidthAfterDocumentIsRemoved-expected.checksum
deleted file mode 100644
index 710eba7..0000000
--- a/LayoutTests/platform/mac/fast/dom/clientWidthAfterDocumentIsRemoved-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-fe9aa05a05444b873366048bc02469ad
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/dom/clientWidthAfterDocumentIsRemoved-expected.png b/LayoutTests/platform/mac/fast/dom/clientWidthAfterDocumentIsRemoved-expected.png
deleted file mode 100644
index f25d211..0000000
Binary files a/LayoutTests/platform/mac/fast/dom/clientWidthAfterDocumentIsRemoved-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/fast/dom/clientWidthAfterDocumentIsRemoved-expected.txt b/LayoutTests/platform/mac/fast/dom/clientWidthAfterDocumentIsRemoved-expected.txt
deleted file mode 100644
index d6f9107..0000000
--- a/LayoutTests/platform/mac/fast/dom/clientWidthAfterDocumentIsRemoved-expected.txt
+++ /dev/null
@@ -1,17 +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 212x18
- text run at (0,0) width 212: "This test passes if it doesn't crash!"
- RenderBlock (anonymous) at (0,34) size 784x154
- RenderPartObject {IFRAME} at (0,0) size 304x154 [border: (2px inset #000000)]
- layer at (0,0) size 300x150
- RenderView at (0,0) size 300x150
- layer at (0,0) size 300x8
- RenderBlock {HTML} at (0,0) size 300x8
- RenderBody {BODY} at (8,8) size 284x0
- RenderText {#text} at (0,0) size 0x0
- RenderText {#text} at (0,0) size 0x0
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list