Merge 88277

Source/WebCore/platform/graphics/win/UniscribeController.cpp

 /*
  * Copyright (C) 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 83 matching lines @@
 {
     // FIXME: We really want to be using a newer version of Uniscribe that supports the new OpenType
     // functions.  Those functions would allow us to turn off kerning and ligatures.  Without being able
     // to do that, we will have buggy line breaking and metrics when simple and complex text are close
     // together (the complex code path will narrow the text because of kerning and ligatures and then
     // when bidi processing splits into multiple runs, the simple portions will get wider and cause us to
     // spill off the edge of a line).
     if (static_cast<int>(offset) > m_end)
         offset = m_end;
 
-    // Itemize the string.
-    const UChar* cp = m_run.data(m_currentCharacter);
     int length = offset - m_currentCharacter;
     if (length <= 0)
         return;
 
+    // Itemize the string.
+    const UChar* cp = m_run.data(m_currentCharacter);
     unsigned baseCharacter = m_currentCharacter;
 
     // We break up itemization of the string by fontData and (if needed) the use of small caps.
 
     // FIXME: It's inconsistent that we use logical order when itemizing, since this
     // does not match normal RTL.
 
     // FIXME: This function should decode surrogate pairs. Currently it makes little difference that
     // it does not because the font cache on Windows does not support non-BMP characters.
     Vector<UChar, 256> smallCapsBuffer;
@@ skipping 289 matching lines @@
     if (FAILED(shapeResult))
         return false;
 
     glyphs.shrink(glyphCount);
     visualAttributes.shrink(glyphCount);
 
     return true;
 }
 
 }