Update diff and patch for new WebKit bug
authorAryeh Gregor <AryehGregor+gitcommit@gmail.com>
Wed, 26 Oct 2011 14:17:07 -0600
changeset 654 66e8fd53ba39
parent 653 5e50d5bf6d0a
child 655 8578618a74e6
Update diff and patch for new WebKit bug

Or at least it looks like a new WebKit bug.
conformancetest/diff
conformancetest/patch
--- a/conformancetest/diff	Wed Oct 26 13:59:37 2011 -0600
+++ b/conformancetest/diff	Wed Oct 26 14:17:07 2011 -0600
@@ -130,3 +130,47 @@
  	{"stylewithcss":[false,false,"",false,true,""],"italic":[true,false,"",false,true,""]}],
  ["<span style=font-style:italic>fo[o</span><span style=font-style:oblique>b]ar</span>",
  	[["stylewithcss","false"],["italic",""]],
[email protected]@
+ 	{"stylewithcss":[false,false,"",false,true,""],"outdent":[false,false,"",false,false,""]}],
+ ["<blockquote class=\"webkit-indent-blockquote\" style=\"margin: 0 0 0 40px; border: none; padding: 0px;\"><p>foo[bar]</p><p>baz</p></blockquote><p>extra",
+ 	[["stylewithcss","false"],["outdent",""]],
+-	"<div class=\"webkit-indent-blockquote\" style=\"border-width:initial; border-color:initial; border-image:initial\"><p>foo[bar]</p><blockquote><p>baz</p></blockquote></div><p>extra</p>",
++	"<div class=\"webkit-indent-blockquote\"><p>foo[bar]</p><blockquote><p>baz</p></blockquote></div><p>extra</p>",
+ 	{"stylewithcss":[false,true,"",false,false,""],"outdent":[false,false,"",false,false,""]}],
+ ["<blockquote class=\"webkit-indent-blockquote\" style=\"margin: 0 0 0 40px; border: none; padding: 0px;\"><p>foo[bar]</p><p>baz</p></blockquote><p>extra",
+ 	[["stylewithcss","true"],["outdent",""]],
+-	"<div class=\"webkit-indent-blockquote\" style=\"border-width:initial; border-color:initial; border-image:initial\"><p>foo[bar]</p><blockquote><p>baz</p></blockquote></div><p>extra</p>",
++	"<div class=\"webkit-indent-blockquote\"><p>foo[bar]</p><blockquote><p>baz</p></blockquote></div><p>extra</p>",
+ 	{"stylewithcss":[false,false,"",false,true,""],"outdent":[false,false,"",false,false,""]}],
+ ["<blockquote class=\"webkit-indent-blockquote\" style=\"margin: 0 0 0 40px; border: none; padding: 0px;\"><p>foo[bar</p><p>b]az</p></blockquote><p>extra",
+ 	[["stylewithcss","false"],["outdent",""]],
+-	"<div class=\"webkit-indent-blockquote\" style=\"border-width:initial; border-color:initial; border-image:initial\"><p>foo[bar</p><p>b]az</p></div><p>extra</p>",
++	"<div class=\"webkit-indent-blockquote\"><p>foo[bar</p><p>b]az</p></div><p>extra</p>",
+ 	{"stylewithcss":[false,true,"",false,false,""],"outdent":[false,false,"",false,false,""]}],
+ ["<blockquote class=\"webkit-indent-blockquote\" style=\"margin: 0 0 0 40px; border: none; padding: 0px;\"><p>foo[bar</p><p>b]az</p></blockquote><p>extra",
+ 	[["stylewithcss","true"],["outdent",""]],
+-	"<div class=\"webkit-indent-blockquote\" style=\"border-width:initial; border-color:initial; border-image:initial\"><p>foo[bar</p><p>b]az</p></div><p>extra</p>",
++	"<div class=\"webkit-indent-blockquote\"><p>foo[bar</p><p>b]az</p></div><p>extra</p>",
+ 	{"stylewithcss":[false,false,"",false,true,""],"outdent":[false,false,"",false,false,""]}],
+ ["<blockquote class=\"webkit-indent-blockquote\" style=\"margin: 0 0 0 40px; border: none; padding: 0px;\"><p>foo[bar]</p></blockquote><p>baz</p><p>extra",
+ 	[["stylewithcss","false"],["outdent",""]],
+-	"<div class=\"webkit-indent-blockquote\" style=\"border-width:initial; border-color:initial; border-image:initial\"><p>foo[bar]</p></div><p>baz</p><p>extra</p>",
++	"<div class=\"webkit-indent-blockquote\"><p>foo[bar]</p></div><p>baz</p><p>extra</p>",
+ 	{"stylewithcss":[false,true,"",false,false,""],"outdent":[false,false,"",false,false,""]}],
+ ["<blockquote class=\"webkit-indent-blockquote\" style=\"margin: 0 0 0 40px; border: none; padding: 0px;\"><p>foo[bar]</p></blockquote><p>baz</p><p>extra",
+ 	[["stylewithcss","true"],["outdent",""]],
+-	"<div class=\"webkit-indent-blockquote\" style=\"border-width:initial; border-color:initial; border-image:initial\"><p>foo[bar]</p></div><p>baz</p><p>extra</p>",
++	"<div class=\"webkit-indent-blockquote\"><p>foo[bar]</p></div><p>baz</p><p>extra</p>",
+ 	{"stylewithcss":[false,false,"",false,true,""],"outdent":[false,false,"",false,false,""]}],
+ ["<blockquote class=\"webkit-indent-blockquote\" style=\"margin: 0 0 0 40px; border: none; padding: 0px;\"><p>foo[bar</p></blockquote><p>b]az</p><p>extra",
+ 	[["stylewithcss","false"],["outdent",""]],
+-	"<div class=\"webkit-indent-blockquote\" style=\"border-width:initial; border-color:initial; border-image:initial\"><p>foo[bar</p></div><p>b]az</p><p>extra</p>",
++	"<div class=\"webkit-indent-blockquote\"><p>foo[bar</p></div><p>b]az</p><p>extra</p>",
+ 	{"stylewithcss":[false,true,"",false,false,""],"outdent":[false,false,"",false,false,""]}],
+ ["<blockquote class=\"webkit-indent-blockquote\" style=\"margin: 0 0 0 40px; border: none; padding: 0px;\"><p>foo[bar</p></blockquote><p>b]az</p><p>extra",
+ 	[["stylewithcss","true"],["outdent",""]],
+-	"<div class=\"webkit-indent-blockquote\" style=\"border-width:initial; border-color:initial; border-image:initial\"><p>foo[bar</p></div><p>b]az</p><p>extra</p>",
++	"<div class=\"webkit-indent-blockquote\"><p>foo[bar</p></div><p>b]az</p><p>extra</p>",
+ 	{"stylewithcss":[false,false,"",false,true,""],"outdent":[false,false,"",false,false,""]}],
+ ["<blockquote><blockquote>foo[bar]baz</blockquote></blockquote>",
+ 	[["stylewithcss","false"],["outdent",""]],
--- a/conformancetest/patch	Wed Oct 26 13:59:37 2011 -0600
+++ b/conformancetest/patch	Wed Oct 26 14:17:07 2011 -0600
@@ -1,4 +1,4 @@
[email protected]@ -1585,11 +1585,11 @@
[email protected]@ -1737,11 +1737,11 @@
  	{"stylewithcss":[false,false,"",false,true,""],"delete":[false,false,"",false,false,""]}],
  ["foo&#x308;&#x327;[]bar",
  	[["stylewithcss","false"],["delete",""]],
@@ -12,7 +12,7 @@
  	{"stylewithcss":[false,false,"",false,true,""],"delete":[false,false,"",false,false,""]}],
  ["&ouml;[]bar",
  	[["stylewithcss","false"],["delete",""]],
[email protected]@ -1609,11 +1609,11 @@
[email protected]@ -1761,11 +1761,11 @@
  	{"stylewithcss":[false,false,"",false,true,""],"delete":[false,false,"",false,false,""]}],
  ["o&#x308;&#x327;[]bar",
  	[["stylewithcss","false"],["delete",""]],
@@ -26,7 +26,7 @@
  	{"stylewithcss":[false,false,"",false,true,""],"delete":[false,false,"",false,false,""]}],
  ["&#x5e9;&#x5c1;&#x5b8;[]&#x5dc;&#x5d5;&#x5b9;&#x5dd;",
  	[["stylewithcss","false"],["delete",""]],
[email protected]@ -1625,11 +1625,11 @@
[email protected]@ -1777,11 +1777,11 @@
  	{"stylewithcss":[false,false,"",false,true,""],"delete":[false,false,"",false,false,""]}],
  ["&#x5e9;&#x5c1;&#x5b8;&#x5dc;&#x5d5;&#x5b9;[]&#x5dd;",
  	[["stylewithcss","false"],["delete",""]],
@@ -40,7 +40,7 @@
  	{"stylewithcss":[false,false,"",false,true,""],"delete":[false,false,"",false,false,""]}],
  ["<p>foo</p><p>[]bar</p>",
  	[["stylewithcss","false"],["delete",""]],
[email protected]@ -7465,11 +7465,11 @@
[email protected]@ -8081,11 +8081,11 @@
  	{"stylewithcss":[false,false,"",false,true,""],"forwarddelete":[false,false,"",false,false,""]}],
  ["&#x5e9;&#x5c1;&#x5b8;&#x5dc;[]&#x5d5;&#x5b9;&#x5dd;",
  	[["stylewithcss","false"],["forwarddelete",""]],
@@ -54,7 +54,7 @@
  	{"stylewithcss":[false,false,"",false,true,""],"forwarddelete":[false,false,"",false,false,""]}],
  ["<p>foo[]</p><p>bar</p>",
  	[["stylewithcss","false"],["forwarddelete",""]],
[email protected]@ -17697,11 +17689,11 @@
[email protected]@ -19857,11 +19849,11 @@
  	{"stylewithcss":[false,false,"",false,true,""],"italic":[true,false,"",false,true,""]}],
  ["fo[o<span style=font-style:oblique>b]ar</span>baz",
  	[["stylewithcss","false"],["italic",""]],
@@ -68,3 +68,47 @@
  	{"stylewithcss":[false,false,"",false,true,""],"italic":[true,false,"",false,true,""]}],
  ["<span style=font-style:italic>fo[o</span><span style=font-style:oblique>b]ar</span>",
  	[["stylewithcss","false"],["italic",""]],
[email protected]@ -22897,35 +22889,35 @@
+ 	{"stylewithcss":[false,false,"",false,true,""],"outdent":[false,false,"",false,false,""]}],
+ ["<blockquote class=\"webkit-indent-blockquote\" style=\"margin: 0 0 0 40px; border: none; padding: 0px;\"><p>foo[bar]</p><p>baz</p></blockquote><p>extra",
+ 	[["stylewithcss","false"],["outdent",""]],
+-	"<div class=\"webkit-indent-blockquote\" style=\"border-width:initial; border-color:initial; border-image:initial\"><p>foo[bar]</p><blockquote><p>baz</p></blockquote></div><p>extra</p>",
++	"<div class=\"webkit-indent-blockquote\"><p>foo[bar]</p><blockquote><p>baz</p></blockquote></div><p>extra</p>",
+ 	{"stylewithcss":[false,true,"",false,false,""],"outdent":[false,false,"",false,false,""]}],
+ ["<blockquote class=\"webkit-indent-blockquote\" style=\"margin: 0 0 0 40px; border: none; padding: 0px;\"><p>foo[bar]</p><p>baz</p></blockquote><p>extra",
+ 	[["stylewithcss","true"],["outdent",""]],
+-	"<div class=\"webkit-indent-blockquote\" style=\"border-width:initial; border-color:initial; border-image:initial\"><p>foo[bar]</p><blockquote><p>baz</p></blockquote></div><p>extra</p>",
++	"<div class=\"webkit-indent-blockquote\"><p>foo[bar]</p><blockquote><p>baz</p></blockquote></div><p>extra</p>",
+ 	{"stylewithcss":[false,false,"",false,true,""],"outdent":[false,false,"",false,false,""]}],
+ ["<blockquote class=\"webkit-indent-blockquote\" style=\"margin: 0 0 0 40px; border: none; padding: 0px;\"><p>foo[bar</p><p>b]az</p></blockquote><p>extra",
+ 	[["stylewithcss","false"],["outdent",""]],
+-	"<div class=\"webkit-indent-blockquote\" style=\"border-width:initial; border-color:initial; border-image:initial\"><p>foo[bar</p><p>b]az</p></div><p>extra</p>",
++	"<div class=\"webkit-indent-blockquote\"><p>foo[bar</p><p>b]az</p></div><p>extra</p>",
+ 	{"stylewithcss":[false,true,"",false,false,""],"outdent":[false,false,"",false,false,""]}],
+ ["<blockquote class=\"webkit-indent-blockquote\" style=\"margin: 0 0 0 40px; border: none; padding: 0px;\"><p>foo[bar</p><p>b]az</p></blockquote><p>extra",
+ 	[["stylewithcss","true"],["outdent",""]],
+-	"<div class=\"webkit-indent-blockquote\" style=\"border-width:initial; border-color:initial; border-image:initial\"><p>foo[bar</p><p>b]az</p></div><p>extra</p>",
++	"<div class=\"webkit-indent-blockquote\"><p>foo[bar</p><p>b]az</p></div><p>extra</p>",
+ 	{"stylewithcss":[false,false,"",false,true,""],"outdent":[false,false,"",false,false,""]}],
+ ["<blockquote class=\"webkit-indent-blockquote\" style=\"margin: 0 0 0 40px; border: none; padding: 0px;\"><p>foo[bar]</p></blockquote><p>baz</p><p>extra",
+ 	[["stylewithcss","false"],["outdent",""]],
+-	"<div class=\"webkit-indent-blockquote\" style=\"border-width:initial; border-color:initial; border-image:initial\"><p>foo[bar]</p></div><p>baz</p><p>extra</p>",
++	"<div class=\"webkit-indent-blockquote\"><p>foo[bar]</p></div><p>baz</p><p>extra</p>",
+ 	{"stylewithcss":[false,true,"",false,false,""],"outdent":[false,false,"",false,false,""]}],
+ ["<blockquote class=\"webkit-indent-blockquote\" style=\"margin: 0 0 0 40px; border: none; padding: 0px;\"><p>foo[bar]</p></blockquote><p>baz</p><p>extra",
+ 	[["stylewithcss","true"],["outdent",""]],
+-	"<div class=\"webkit-indent-blockquote\" style=\"border-width:initial; border-color:initial; border-image:initial\"><p>foo[bar]</p></div><p>baz</p><p>extra</p>",
++	"<div class=\"webkit-indent-blockquote\"><p>foo[bar]</p></div><p>baz</p><p>extra</p>",
+ 	{"stylewithcss":[false,false,"",false,true,""],"outdent":[false,false,"",false,false,""]}],
+ ["<blockquote class=\"webkit-indent-blockquote\" style=\"margin: 0 0 0 40px; border: none; padding: 0px;\"><p>foo[bar</p></blockquote><p>b]az</p><p>extra",
+ 	[["stylewithcss","false"],["outdent",""]],
+-	"<div class=\"webkit-indent-blockquote\" style=\"border-width:initial; border-color:initial; border-image:initial\"><p>foo[bar</p></div><p>b]az</p><p>extra</p>",
++	"<div class=\"webkit-indent-blockquote\"><p>foo[bar</p></div><p>b]az</p><p>extra</p>",
+ 	{"stylewithcss":[false,true,"",false,false,""],"outdent":[false,false,"",false,false,""]}],
+ ["<blockquote class=\"webkit-indent-blockquote\" style=\"margin: 0 0 0 40px; border: none; padding: 0px;\"><p>foo[bar</p></blockquote><p>b]az</p><p>extra",
+ 	[["stylewithcss","true"],["outdent",""]],
+-	"<div class=\"webkit-indent-blockquote\" style=\"border-width:initial; border-color:initial; border-image:initial\"><p>foo[bar</p></div><p>b]az</p><p>extra</p>",
++	"<div class=\"webkit-indent-blockquote\"><p>foo[bar</p></div><p>b]az</p><p>extra</p>",
+ 	{"stylewithcss":[false,false,"",false,true,""],"outdent":[false,false,"",false,false,""]}],
+ ["<blockquote><blockquote>foo[bar]baz</blockquote></blockquote>",
+ 	[["stylewithcss","false"],["outdent",""]],