Merge 88139

Source/WebCore/platform/graphics/WidthIterator.cpp

 /*
  * Copyright (C) 2003, 2006, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Holger Hans Peter Freyther
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 62 matching lines @@
             m_expansionPerOpportunity = m_expansion / expansionOpportunityCount;
     }
 }
 
 void WidthIterator::advance(int offset, GlyphBuffer* glyphBuffer)
 {
     if (offset > m_end)
         offset = m_end;
 
     int currentCharacter = m_currentCharacter;
+    if (currentCharacter >= offset)
+        return;
+
     const UChar* cp = m_run.data(currentCharacter);
 
     bool rtl = m_run.rtl();
     bool hasExtraSpacing = (m_font->letterSpacing() || m_font->wordSpacing() || m_expansion) && !m_run.spacingDisabled();
 
     FloatRect bounds;
 
     const SimpleFontData* primaryFont = m_font->primaryFont();
     const SimpleFontData* lastFontData = primaryFont;
 
@@ skipping 156 matching lines @@
             QString res = tmp.normalized(QString::NormalizationForm_C, QChar::Unicode_3_2);
             if (res.length() == 1)
                 return res.at(0).unicode();
 #endif
         }
     }
     return 0;
 }
 
 }