Revert of Different fonts selected for width calculation and actual painting

Source/core/rendering/RenderBlockLineLayout.cpp

Index: Source/core/rendering/RenderBlockLineLayout.cpp
diff --git a/Source/core/rendering/RenderBlockLineLayout.cpp b/Source/core/rendering/RenderBlockLineLayout.cpp
index 2fe57fbfbb596538ca3ff1e778fcb827c0470706..3e939f1cfb35d94ce1e014fe486c6511df8a9609 100644
--- a/Source/core/rendering/RenderBlockLineLayout.cpp
+++ b/Source/core/rendering/RenderBlockLineLayout.cpp
@@ -1932,34 +1932,14 @@ void RenderBlockFlow::deleteEllipsisLineBoxes()
 void RenderBlockFlow::checkLinesForTextOverflow()
 {
     // Determine the width of the ellipsis using the current font.
+    // FIXME: CSS3 says this is configurable, also need to use 0x002E (FULL STOP) if horizontal ellipsis is "not renderable"
     const Font& font = style()->font();
-
-    const UChar fullStopString[] = {fullstopCharacter, fullstopCharacter, fullstopCharacter};
-    DEFINE_STATIC_LOCAL(AtomicString, fullstopCharacterStr, (fullStopString, 3));
     DEFINE_STATIC_LOCAL(AtomicString, ellipsisStr, (&horizontalEllipsis, 1));
-
     const Font& firstLineFont = firstLineStyle()->font();
     // FIXME: We should probably not hard-code the direction here. https://crbug.com/333004
     TextDirection ellipsisDirection = LTR;
-    float firstLineEllipsisWidth = 0;
-    float ellipsisWidth = 0;
-
-    // As per CSS3 http://www.w3.org/TR/2003/CR-css3-text-20030514/ sequence of three
-    // Full Stops (002E) can be used.
-    if (firstLineFont.primaryFontHasGlyphForCharacter(horizontalEllipsis)) {
-        firstLineEllipsisWidth = firstLineFont.width(constructTextRun(this, firstLineFont, &horizontalEllipsis, 1, firstLineStyle(), ellipsisDirection));
-    } else {
-        ellipsisStr = fullstopCharacterStr;
-        firstLineEllipsisWidth = firstLineFont.width(constructTextRun(this, firstLineFont, &fullstopCharacter, 1, firstLineStyle(), ellipsisDirection)) * 3;
-    }
-    ellipsisWidth = (font == firstLineFont) ? firstLineEllipsisWidth : 0;
-
-    if (!ellipsisWidth) {
-        if (font.primaryFontHasGlyphForCharacter(horizontalEllipsis))
-            ellipsisWidth = font.width(constructTextRun(this, font, &horizontalEllipsis, 1, style(), ellipsisDirection));
-        else
-            ellipsisWidth = font.width(constructTextRun(this, font, &fullstopCharacter, 1, style(), ellipsisDirection)) * 3;
-    }
+    float firstLineEllipsisWidth = firstLineFont.width(constructTextRun(this, firstLineFont, &horizontalEllipsis, 1, firstLineStyle(), ellipsisDirection));
+    float ellipsisWidth = (font == firstLineFont) ? firstLineEllipsisWidth : font.width(constructTextRun(this, font, &horizontalEllipsis, 1, style(), ellipsisDirection));
 
     // For LTR text truncation, we want to get the right edge of our padding box, and then we want to see
     // if the right edge of a line box exceeds that.  For RTL, we use the left edge of the padding box and