Bug 518592 - Fix single char <mi> frame type and add a test for dotless i. r=fredw
☠☠ backed out by fce32d1eb6d1 ☠ ☠
authorJames Kitchener <jkitch.bug@gmail.com>
Wed, 12 Mar 2014 08:40:30 -0400
changeset 191394 1f4344d87e75df12dc255f1f25183cbc3ae121fb
parent 191393 8b449c3a4caa43f6695062d9929360a7ddc82882
child 191395 876ba986830c399a8501ef8d7c55170caa77f3da
push id474
push userasasaki@mozilla.com
push dateMon, 02 Jun 2014 21:01:02 +0000
treeherdermozilla-release@967f4cf1b31c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfredw
bugs518592
milestone30.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 518592 - Fix single char <mi> frame type and add a test for dotless i. r=fredw
layout/mathml/nsMathMLTokenFrame.cpp
layout/reftests/mathml/mathvariant-2-ref.html
layout/reftests/mathml/mathvariant-2.html
--- a/layout/mathml/nsMathMLTokenFrame.cpp
+++ b/layout/mathml/nsMathMLTokenFrame.cpp
@@ -79,16 +79,17 @@ nsMathMLTokenFrame::MarkTextFramesAsToke
     data.CompressWhitespace();
     int32_t length = data.Length();
 
     bool isSingleCharacter = length == 1 ||
       (length == 2 && NS_IS_HIGH_SURROGATE(data[0]));
 
     if (isSingleCharacter) {
       child->AddStateBits(NS_FRAME_IS_IN_SINGLE_CHAR_MI);
+      AddStateBits(NS_FRAME_IS_IN_SINGLE_CHAR_MI);
     }
   }
 }
 
 nsresult
 nsMathMLTokenFrame::SetInitialChildList(ChildListID     aListID,
                                         nsFrameList&    aChildList)
 {
--- a/layout/reftests/mathml/mathvariant-2-ref.html
+++ b/layout/reftests/mathml/mathvariant-2-ref.html
@@ -7,10 +7,19 @@
     <math>
       <mrow>
         <mtext fontstyle="italic">&#x0131;&#x0237;</mtext>
         <mtext>&#x0131;&#x0237;</mtext>
         <mtext fontweight="bold">&#x03DC;&#x03DD;</mtext>
         <mtext>&#x03DC;&#x03DD;</mtext>
       </mrow>
     </math>
+    <p>
+    <math>
+      <mrow>
+        <mi mathvariant="italic">&imath;</mi>
+        <mi mathvariant="italic">&jmath;</mi>
+        <mi mathvariant="normal">&imath;&imath;</mi>
+        <mi mathvariant="normal">&jmath;&jmath;</mi>
+      </mrow>
+    </math>
   </body>
 </html>
--- a/layout/reftests/mathml/mathvariant-2.html
+++ b/layout/reftests/mathml/mathvariant-2.html
@@ -7,10 +7,19 @@
     <math>
       <mrow>
         <mtext mathvariant="italic">&#x0131;&#x0237;</mtext>
         <mtext mathvariant="bold">&#x0131;&#x0237;</mtext>
         <mtext mathvariant="bold">&#x03DC;&#x03DD;</mtext>
         <mtext mathvariant="italic">&#x03DC;&#x03DD;</mtext>
       </mrow>
     </math>
+    <p>
+    <math>
+      <mrow>
+        <mi>&imath;</mi>
+        <mi>&jmath;</mi>
+        <mi>&imath;&imath;</mi>
+        <mi>&jmath;&jmath;</mi>
+      </mrow>
+    </math>
   </body>
 </html>