Bug 1370053 - Fix a couple of comment/variable-name typos in ResolveParagraph. r=smontagu
authorJonathan Kew <jkew@mozilla.com>
Wed, 07 Jun 2017 09:42:53 +0100
changeset 410778 34eb6c45444316f0b9e0a86f0b7a22aa1d3ae86f
parent 410777 c474a1264de73553754f9d3570613cf2be594148
child 410779 77dc3e0df3b68bb617ba4474d679aaa54a44bd17
push id7391
push usermtabara@mozilla.com
push dateMon, 12 Jun 2017 13:08:53 +0000
treeherdermozilla-beta@2191d7f87e2e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssmontagu
bugs1370053
milestone55.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 1370053 - Fix a couple of comment/variable-name typos in ResolveParagraph. r=smontagu
layout/base/nsBidiPresUtils.cpp
--- a/layout/base/nsBidiPresUtils.cpp
+++ b/layout/base/nsBidiPresUtils.cpp
@@ -826,35 +826,35 @@ nsBidiPresUtils::ResolveParagraph(BidiPa
 #endif
         frame->AddStateBits(NS_FRAME_IS_BIDI);
         return NS_OK;
       }
     }
   }
 
   nsIFrame* lastRealFrame = nullptr;
-  nsBidiLevel lastEmbedingLevel = kBidiLevelNone;
+  nsBidiLevel lastEmbeddingLevel = kBidiLevelNone;
   nsBidiLevel precedingControl = kBidiLevelNone;
 
   auto storeBidiDataToFrame = [&]() {
     FrameBidiData bidiData;
     bidiData.embeddingLevel = embeddingLevel;
     bidiData.baseLevel = aBpd->GetParaLevel();
     // If a control character doesn't have a lower embedding level than
     // both the preceding and the following frame, it isn't something
     // needed for getting the correct result. This optimization should
     // remove almost all of embeds and overrides, and some of isolates.
     if (precedingControl >= embeddingLevel ||
-        precedingControl >= lastEmbedingLevel) {
+        precedingControl >= lastEmbeddingLevel) {
       bidiData.precedingControl = kBidiLevelNone;
     } else {
       bidiData.precedingControl = precedingControl;
     }
     precedingControl = kBidiLevelNone;
-    lastEmbedingLevel = embeddingLevel;
+    lastEmbeddingLevel = embeddingLevel;
     frame->SetProperty(nsIFrame::BidiDataProperty(), bidiData);
   };
 
   for (; ;) {
     if (fragmentLength <= 0) {
       // Get the next frame from mLogicalFrames
       if (++frameIndex >= frameCount) {
         break;
@@ -977,24 +977,24 @@ nsBidiPresUtils::ResolveParagraph(BidiPa
           frame->AdjustOffsetsForBidi(contentOffset, contentOffset + fragmentLength);
         }
       } // isTextFrame
     } // not bidi control frame
     int32_t temp = runLength;
     runLength -= fragmentLength;
     fragmentLength -= temp;
 
-    // Record last real frame so that we can do spliting properly even
+    // Record last real frame so that we can do splitting properly even
     // if a run ends after a virtual bidi control frame.
     if (frame != NS_BIDI_CONTROL_FRAME) {
       lastRealFrame = frame;
     }
     if (lastRealFrame && fragmentLength <= 0) {
       // If the frame is at the end of a run, and this is not the end of our
-      // paragrah, split all ancestor inlines that need splitting.
+      // paragraph, split all ancestor inlines that need splitting.
       // To determine whether we're at the end of the run, we check that we've
       // finished processing the current run, and that the current frame
       // doesn't have a fluid continuation (it could have a fluid continuation
       // of zero length, so testing runLength alone is not sufficient).
       if (runLength <= 0 && !lastRealFrame->GetNextInFlow()) {
         if (numRun + 1 < runCount) {
           nsIFrame* child = lastRealFrame;
           nsContainerFrame* parent = child->GetParent();