Bug 1229437 followup 3 - Fix a mistake in RubyColumn::Iterator::SkipUntilExistingFrame(). a=me
authorXidorn Quan <quanxunzhen@gmail.com>
Wed, 27 Jan 2016 19:04:57 +1100
changeset 281796 695f43695c1756cddedd26c272976af756dc741c
parent 281795 bb1757810834327e26cea61b613f9b5557dce76a
child 281797 3cedb5df2b5d487b69d8983fd02c1953c0905fbf
push id70931
push userxquan@mozilla.com
push dateWed, 27 Jan 2016 08:05:01 +0000
treeherdermozilla-inbound@695f43695c17 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs1229437
milestone47.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 1229437 followup 3 - Fix a mistake in RubyColumn::Iterator::SkipUntilExistingFrame(). a=me
layout/generic/RubyUtils.cpp
--- a/layout/generic/RubyUtils.cpp
+++ b/layout/generic/RubyUtils.cpp
@@ -69,19 +69,20 @@ RubyColumn::Iterator::operator*() const
   MOZ_ASSERT(frame, "Frame here cannot be null");
   return frame;
 }
 
 void
 RubyColumn::Iterator::SkipUntilExistingFrame()
 {
   if (mIndex == -1) {
-    if (!mColumn.mBaseFrame) {
-      ++mIndex;
+    if (mColumn.mBaseFrame) {
+      return;
     }
+    ++mIndex;
   }
   int32_t numTextFrames = mColumn.mTextFrames.Length();
   for (; mIndex < numTextFrames; ++mIndex) {
     if (mColumn.mTextFrames[mIndex]) {
       break;
     }
   }
 }