Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / rendering / RenderCombineText.cpp

diff --git a/src/third_party/WebKit/Source/core/rendering/RenderCombineText.cpp b/src/third_party/WebKit/Source/core/rendering/RenderCombineText.cpp
index 7e6e44c..2e58c5f 100644 (file)
--- a/src/third_party/WebKit/Source/core/rendering/RenderCombineText.cpp
+++ b/src/third_party/WebKit/Source/core/rendering/RenderCombineText.cpp
@@ -57,6 +57,9 @@ void RenderCombineText::setTextInternal(PassRefPtr<StringImpl> text)
 
 float RenderCombineText::width(unsigned from, unsigned length, const Font& font, float xPosition, TextDirection direction, HashSet<const SimpleFontData*>* fallbackFonts, GlyphOverflow* glyphOverflow) const
 {
+    if (!length)
+        return 0;
+
     if (hasEmptyText())
         return 0;