Merge 113951

Source/WebCore/platform/graphics/skia/GlyphPageTreeNodeSkia.cpp

 /*
  * Copyright (c) 2008, 2009 Google 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:
  * 
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 86 matching lines @@
 
     if (fontData->hasVerticalGlyphs()) {
         bool lookVariants = false;
         for (unsigned i = 0; i < bufferLength; ++i) {
             if (!Font::isCJKIdeograph(buffer[i])) {
                 lookVariants = true;
                 continue;
             }
         }
         if (lookVariants)
-            substituteWithVerticalGlyphs(fontData, glyphs, bufferLength);
+            substituteWithVerticalGlyphs(fontData, glyphs, length);
     }
 
     unsigned allGlyphs = 0; // track if any of the glyphIDs are non-zero
     for (unsigned i = 0; i < length; i++) {
         setGlyphDataForIndex(offset + i, glyphs[i], glyphs[i] ? fontData : NULL);
         allGlyphs |= glyphs[i];
     }
 
     return allGlyphs != 0;
 }
 
 }  // namespace WebCore