Modified: trunk/LayoutTests/ChangeLog (146926 => 146927)
--- trunk/LayoutTests/ChangeLog 2013-03-26 20:40:26 UTC (rev 146926)
+++ trunk/LayoutTests/ChangeLog 2013-03-26 21:13:52 UTC (rev 146927)
@@ -1,3 +1,12 @@
+2013-03-26 Claudio Saavedra <csaave...@igalia.com>
+
+ Convert test from UTF-16 to UTF-8
+
+ Rubber stamped by James Robinson.
+
+ * fast/dom/34176.html: Convert from little endian UTF-16 to UTF-8
+ to make git diff happy.
+
2013-03-26 Alok Priyadarshi <al...@chromium.org>
Rebaseline text output for opaque GraphicsLayers
Modified: trunk/LayoutTests/fast/dom/34176.html (146926 => 146927)
--- trunk/LayoutTests/fast/dom/34176.html 2013-03-26 20:40:26 UTC (rev 146926)
+++ trunk/LayoutTests/fast/dom/34176.html 2013-03-26 21:13:52 UTC (rev 146927)
@@ -1,90 +1,89 @@
-\xFF\xFE< ! D O C T Y P E h t m l >
- < h t m l >
- < h e a d >
- < m e t a h t t p - e q u i v = " C o n t e n t - T y p e " c o n t e n t = " t e x t / h t m l ; c h a r s e t = u t f - 8 " >
- < / h e a d >
-
- < b o d y s t y l e = " d i r e c t i o n : r t l " >
-
- < P s t y l e = " d i r e c t i o n : l t r ; t e x t - a l i g n : r i g h t " > T e s t r e n d e r i n g o f 3 t e x t r u n s - - T e x t R u n 1 T e x t R u n 2 T e x t R u n 3 ,
- i n w h i c h T e x t R u n 1 a n d T e x t R u n 2 ' s b i d i l e v e l a r e 2 , a n d T e x t R u n 3 ' s b i d i l e v e l i s 1 .
- T e x t R u n 2 a n d T e x t R u n 3 a r e s i b l i n g s . B u t t h e i r a n c e s t o r ( n o t t h e i r p a r e n t ) i s a s i b l i n g o f T e x t R u n 1 .
- T h e v i s u a l o r d e r s h o u l d b e T e x t R u n 3 T e x t R u n 1 T e x t R u n 2 , n o t T e x t R u n 3 T e x t R u n 2 T e x t R u n 1 .
- < h r >
-
- < P s t y l e = " d i r e c t i o n : l t r ; t e x t - a l i g n : r i g h t " > P u r e t e x t . T h e f o l l o w i n g 3 l i n e s s h o u l d a l l d i s p l a y a s " \xE9\xE0\xD1 T h i s i s a T e s t "
- < d i v c o n t e n t E d i t a b l e = " t r u e " s t y l e = " b a c k g r o u n d : r e d ; " > T h i s i s a < s p a n > < s p a n > T e s t < s p a n > \xE9\xE0\xD1< / s p a n > < / s p a n > < / s p a n > < / d i v >
- < d i v c o n t e n t E d i t a b l e = " t r u e " s t y l e = " b a c k g r o u n d : r e d ; " > T h i s i s a < s p a n > < s p a n > < s p a n > T e s t < s p a n > \xE9\xE0\xD1< / s p a n > < / s p a n > < / s p a n > < / s p a n > < / d i v >
- < d i v > T h i s i s a < s p a n > T e s t < s p a n > \xE9\xE0\xD1< / s p a n > < / s p a n > < / d i v >
- < h r >
-
- < P s t y l e = " d i r e c t i o n : l t r ; t e x t - a l i g n : r i g h t " > T e x t i n & l t ; e m & g t ; . T h e E n g l i s h t e x t s h o u l d b e d i s p l a y e d a s " T h i s i s a T e s t " .
- < d i v c o n t e n t E d i t a b l e = " t r u e " s t y l e = " b a c k g r o u n d : r e d ; " > T h i s i s a < s p a n s t y l e = " t e x t - d e c o r a t i o n : u n d e r l i n e ; " > < e m > < s p a n > < / s p a n > T e s t < s p a n > < / s p a n > < / e m > < / s p a n > < / d i v >
- < d i v c o n t e n t E d i t a b l e = " t r u e " s t y l e = " b a c k g r o u n d : r e d ; " > T h i s i s a < s p a n s t y l e = " t e x t - d e c o r a t i o n : u n d e r l i n e ; " > < e m > T e s t < s p a n > < / s p a n > < / e m > < / s p a n > < / d i v >
- < d i v c o n t e n t e d i t a b l e s t y l e = " b a c k g r o u n d : r e d ; " > T h i s i s a < s p a n s t y l e = " t e x t - d e c o r a t i o n : u n d e r l i n e ; " > < e m > T e s t < s p a n c o n t e n t e d i t a b l e > \xD3\xDE\xD4< / s p a n > < / e m > < / s p a n > < / d i v >
- < d i v > T h i s i s a < s p a n s t y l e = " t e x t - d e c o r a t i o n : u n d e r l i n e ; " > < e m > < s p a n > < / s p a n > T e s t < / e m > < / s p a n > < / d i v >
- < d i v > T h i s i s a < s p a n s t y l e = " t e x t - d e c o r a t i o n : u n d e r l i n e ; " > < e m > T e s t < / e m > < / s p a n > < / d i v >
- < h r >
-
- < P s t y l e = " d i r e c t i o n : l t r ; t e x t - a l i g n : r i g h t " > T e x t i n & l t ; s t r o n g & g t ; . T h e f o l l o w i n g l i n e s s h o u l d a l l d i s p l a y a s " T h i s i s a T e s t " .
- < d i v c o n t e n t E d i t a b l e = " t r u e " s t y l e = " b a c k g r o u n d : r e d ; " > T h i s i s a < s p a n s t y l e = " t e x t - d e c o r a t i o n : u n d e r l i n e ; " > < s t r o n g > < s p a n > < / s p a n > T e s t < s p a n > < / s p a n > < / s t r o n g > < / s p a n > < / d i v >
- < d i v c o n t e n t E d i t a b l e = " t r u e " s t y l e = " b a c k g r o u n d : r e d ; " > T h i s i s a < s p a n s t y l e = " t e x t - d e c o r a t i o n : u n d e r l i n e ; " > < s t r o n g > T e s t < s p a n > < / s p a n > < / s t r o n g > < / s p a n > < / d i v >
- < d i v > T h i s i s a < s p a n s t y l e = " t e x t - d e c o r a t i o n : u n d e r l i n e ; " > < s t r o n g > < s p a n > < / s p a n > T e s t < / s t r o n g > < / s p a n > < / d i v >
- < d i v > T h i s i s a < s p a n s t y l e = " t e x t - d e c o r a t i o n : u n d e r l i n e ; " > < s t r o n g > T e s t < / s t r o n g > < / s p a n > < / d i v >
- < h r >
-
- < P s t y l e = " d i r e c t i o n : l t r ; t e x t - a l i g n : r i g h t " > T e x t i n & l t ; i & g t ; . T h e f o l l o w i n g l i n e s s h o u l d a l l d i s p l a y a s " T h i s i s a T e s t " .
- < d i v c o n t e n t E d i t a b l e = " t r u e " s t y l e = " b a c k g r o u n d : r e d ; " > T h i s i s a < s p a n s t y l e = " t e x t - d e c o r a t i o n : u n d e r l i n e ; " > < i > < s p a n > < / s p a n > T e s t < s p a n > < / s p a n > < / i > < / s p a n > < / d i v >
- < d i v c o n t e n t E d i t a b l e = " t r u e " s t y l e = " b a c k g r o u n d : r e d ; " > T h i s i s a < s p a n s t y l e = " t e x t - d e c o r a t i o n : u n d e r l i n e ; " > < i > T e s t < s p a n > < / s p a n > < / i > < / s p a n > < / d i v >
- < d i v > T h i s i s a < s p a n s t y l e = " t e x t - d e c o r a t i o n : u n d e r l i n e ; " > < i > < s p a n > < / s p a n > T e s t < / i > < / s p a n > < / d i v >
- < d i v > T h i s i s a < s p a n s t y l e = " t e x t - d e c o r a t i o n : u n d e r l i n e ; " > < i > T e s t < / i > < / s p a n > < / d i v >
- < h r >
-
- < P s t y l e = " d i r e c t i o n : l t r ; t e x t - a l i g n : r i g h t " > T e x t i n & l t ; b & g t ; . T h e f o l l o w i n g l i n e s s h o u l d a l l d i s p l a y a s " T h i s i s a T e s t " .
- < d i v c o n t e n t E d i t a b l e = " t r u e " s t y l e = " b a c k g r o u n d : r e d ; " > T h i s i s a < s p a n s t y l e = " t e x t - d e c o r a t i o n : u n d e r l i n e ; " > < b > < s p a n > < / s p a n > T e s t < s p a n > < / s p a n > < / b > < / s p a n > < / d i v >
- < d i v c o n t e n t E d i t a b l e = " t r u e " s t y l e = " b a c k g r o u n d : r e d ; " > T h i s i s a < s p a n s t y l e = " t e x t - d e c o r a t i o n : u n d e r l i n e ; " > < b > T e s t < s p a n > < / s p a n > < / b > < / s p a n > < / d i v >
- < d i v > T h i s i s a < s p a n s t y l e = " t e x t - d e c o r a t i o n : u n d e r l i n e ; " > < b > < s p a n > < / s p a n > T e s t < / b > < / s p a n > < / d i v >
- < d i v > T h i s i s a < s p a n s t y l e = " t e x t - d e c o r a t i o n : u n d e r l i n e ; " > < b > T e s t < / s t r o n g > < / s p a n > < / d i v >
- < h r >
-
- < P s t y l e = " d i r e c t i o n : l t r ; t e x t - a l i g n : r i g h t " > T e x t i n & l t ; i m g & g t ; , & l t ; h r e f & g t ; , & l t ; e m & g t ; , & l t ; t r & g t ; . T h e f o l l o w i n g E n g l i s h t e x t s h o u l d a l l d i s p l a y a s " T h i s i s a T e s t " .
- < d i v c o n t e n t E d i t a b l e = " t r u e " s t y l e = " b a c k g r o u n d : r e d ; " > T h i s i s a < s p a n s t y l e = " t e x t - d e c o r a t i o n : u n d e r l i n e ; " > < a h r e f > T e s t < s p a n > < i m g s r c = d : / t m p / p 1 . p n g / > < / s p a n > < / a > < / s p a n > < / d i v >
- < d i v c o n t e n t E d i t a b l e = " t r u e " s t y l e = " b a c k g r o u n d : r e d ; " > T h i s i s a < s p a n s t y l e = " t e x t - d e c o r a t i o n : u n d e r l i n e ; " > < a h r e f > T e s t < s p a n > \xE9\xE0\xD1< / s p a n > < / a > < / s p a n > < / d i v >
- < d i v c o n t e n t E d i t a b l e = " t r u e " s t y l e = " b a c k g r o u n d : r e d ; " > T h i s i s a < s p a n s t y l e = " t e x t - d e c o r a t i o n : u n d e r l i n e ; " > < e m > T e s t < a h r e f > < / a > < / e m > < / s p a n > < / d i v >
- < d i v c o n t e n t E d i t a b l e = " t r u e " s t y l e = " b a c k g r o u n d : r e d ; " > T h i s i s a < s p a n s t y l e = " t e x t - d e c o r a t i o n : u n d e r l i n e ; " > < e m > T e s t < s p a n > < i m g s r c = d : / t m p / p 1 . p n g / > < / s p a n > < / e m > < / s p a n > < / d i v >
- < d i v > T h i s i s a < s p a n s t y l e = " t e x t - d e c o r a t i o n : u n d e r l i n e ; " > < a h r e f > T e s t < s p a n > a g a i n < / s p a n > < / a > < / s p a n > < / d i v >
- < d i v > T h i s i s a < s p a n s t y l e = " t e x t - d e c o r a t i o n : u n d e r l i n e ; " > < e m > T e s t < t a b l e > < t r > < t d > a < / t d > < / t r > < / t d > < / t r > < / t a b l e > < / e m > < / s p a n > < / d i v >
- < h r >
- < u l i d = " c o n s o l e " d i r = l t r > < / u l >
-
- < s c r i p t >
-
- f u n c t i o n l o g ( s t r )
- {
- v a r l i = d o c u m e n t . c r e a t e E l e m e n t ( " l i " ) ;
- l i . a p p e n d C h i l d ( d o c u m e n t . c r e a t e T e x t N o d e ( s t r ) ) ;
- v a r c o n s o l e = d o c u m e n t . g e t E l e m e n t B y I d ( " c o n s o l e " ) ;
- c o n s o l e . a p p e n d C h i l d ( l i ) ;
- }
-
- f u n c t i o n a s s e r t E q u a l ( m e s s a g e , a c t u a l , e x p e c t e d )
- {
- i f ( a c t u a l ! = e x p e c t e d )
- l o g ( " \ n " + m e s s a g e + " : F a i l u r e , a c t u a l : " + a c t u a l + " ; e x p e c t e d : " + e x p e c t e d ) ;
- e l s e
- l o g ( " \ n " + m e s s a g e + " : S u c c e s s " ) ;
- }
-
- v a r t e s t s = d o c u m e n t . g e t E l e m e n t s B y T a g N a m e ( ' d i v ' ) ;
- v a r s e l = g e t S e l e c t i o n ( ) ;
- f o r ( v a r i = 0 ; i < t e s t s . l e n g t h ; + + i ) {
- s e l . s e t P o s i t i o n ( t e s t s [ i ] , 0 ) ;
- s e l . m o d i f y ( " m o v e " , " b a c k w a r d " , " l i n e b o u n d a r y " ) ;
- s e l . m o d i f y ( " e x t e n d " , " f o r w a r d " , " w o r d " ) ;
- a s s e r t E q u a l ( " T e s t " + i + " : " , s e l . t o S t r i n g ( ) , " T h i s " ) ;
- }
- < / s c r i p t >
- < / b o d y >
-
- < / h t m l >
-
\ No newline at end of file
+<!DOCTYPE html>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+</head>
+
+<body style="direction:rtl">
+
+<P style="direction:ltr; text-align:right">Test rendering of 3 text runs -- TextRun1 TextRun2 TextRun3,
+in which TextRun1 and TextRun2's bidi level are 2, and TextRun3's bidi level is 1.
+TextRun2 and TextRun3 are siblings. But their ancestor (not their parent) is a sibling of TextRun1.
+The visual order should be TextRun3 TextRun1 TextRun2, not TextRun3 TextRun2 TextRun1.
+<hr>
+
+<P style="direction:ltr; text-align:right">Pure text. The following 3 lines should all display as "שנב This is a Test"
+<div contentEditable="true" style="background:red;">This is a <span><span>Test <span>שנב</span></span></span></div>
+<div contentEditable="true" style="background:red;">This is a <span><span><span>Test <span>שנב</span></span></span></span></div>
+<div>This is a <span>Test <span>שנב</span></span></div>
+<hr>
+
+<P style="direction:ltr; text-align:right">Text in <em>. The English text should be displayed as "This is a Test".
+<div contentEditable="true" style="background:red;">This is a <span style="text-decoration: underline;"><em><span></span>Test<span></span></em></span></div>
+<div contentEditable="true" style="background:red;">This is a <span style="text-decoration: underline;"><em>Test<span></span></em></span></div>
+<div contenteditable style="background:red;">This is a <span style="text-decoration: underline;"><em>Test <span contenteditable>דמה</span></em></span></div>
+<div>This is a <span style="text-decoration: underline;"><em><span></span>Test</em></span></div>
+<div>This is a <span style="text-decoration: underline;"><em>Test</em></span></div>
+<hr>
+
+<P style="direction:ltr; text-align:right">Text in <strong>. The following lines should all display as "This is a Test".
+<div contentEditable="true" style="background:red;">This is a <span style="text-decoration: underline;"><strong><span></span>Test<span></span></strong></span></div>
+<div contentEditable="true" style="background:red;">This is a <span style="text-decoration: underline;"><strong>Test<span></span></strong></span></div>
+<div>This is a <span style="text-decoration: underline;"><strong><span></span>Test</strong></span></div>
+<div>This is a <span style="text-decoration: underline;"><strong>Test</strong></span></div>
+<hr>
+
+<P style="direction:ltr; text-align:right">Text in <i>. The following lines should all display as "This is a Test".
+<div contentEditable="true" style="background:red;">This is a <span style="text-decoration: underline;"><i><span></span>Test<span></span></i></span></div>
+<div contentEditable="true" style="background:red;">This is a <span style="text-decoration: underline;"><i>Test<span></span></i></span></div>
+<div>This is a <span style="text-decoration: underline;"><i><span></span>Test</i></span></div>
+<div>This is a <span style="text-decoration: underline;"><i>Test</i></span></div>
+<hr>
+
+<P style="direction:ltr; text-align:right">Text in <b>. The following lines should all display as "This is a Test".
+<div contentEditable="true" style="background:red;">This is a <span style="text-decoration: underline;"><b><span></span>Test<span></span></b></span></div>
+<div contentEditable="true" style="background:red;">This is a <span style="text-decoration: underline;"><b>Test<span></span></b></span></div>
+<div>This is a <span style="text-decoration: underline;"><b><span></span>Test</b></span></div>
+<div>This is a <span style="text-decoration: underline;"><b>Test</strong></span></div>
+<hr>
+
+<P style="direction:ltr; text-align:right">Text in <img>, <href>, <em>, <tr>. The following English text should all display as "This is a Test".
+<div contentEditable="true" style="background:red;">This is a <span style="text-decoration: underline;"><a href>Test<span><img src= ""
+<div contentEditable="true" style="background:red;">This is a <span style="text-decoration: underline;"><a href>Test <span>שנב</span></a></span></div>
+<div contentEditable="true" style="background:red;">This is a <span style="text-decoration: underline;"><em>Test<a href></a></em></span></div>
+<div contentEditable="true" style="background:red;">This is a <span style="text-decoration: underline;"><em>Test<span><img src= ""
+<div>This is a <span style="text-decoration: underline;"><a href>Test <span>again</span></a></span></div>
+<div>This is a <span style="text-decoration: underline;"><em>Test<table><tr><td>a</td></tr></td></tr></table></em></span></div>
+<hr>
+<ul id="console" dir=ltr></ul>
+
+<script>
+
+ function log(str)
+ {
+ var li = document.createElement("li");
+ li.appendChild(document.createTextNode(str));
+ var console = document.getElementById("console");
+ console.appendChild(li);
+ }
+
+ function assertEqual(message, actual, expected)
+ {
+ if (actual != expected)
+ log("\n" + message + ": Failure, actual: " + actual + "; expected: " + expected);
+ else
+ log("\n" + message + ": Success");
+ }
+
+ var tests = document.getElementsByTagName('div');
+ var sel = getSelection();
+ for (var i = 0; i < tests.length; ++i) {
+ sel.setPosition(tests[i],0);
+ sel.modify("move", "backward", "lineboundary");
+ sel.modify("extend", "forward", "word");
+ assertEqual("Test " + i + ": ", sel.toString(), "This");
+ }
+</script>
+</body>
+
+</html>
