Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / platform / text / StringTruncator.cpp

diff --git a/src/third_party/WebKit/Source/platform/text/StringTruncator.cpp b/src/third_party/WebKit/Source/platform/text/StringTruncator.cpp
index 7e618d3..4d9dac2 100644 (file)
--- a/src/third_party/WebKit/Source/platform/text/StringTruncator.cpp
+++ b/src/third_party/WebKit/Source/platform/text/StringTruncator.cpp
@@ -33,10 +33,9 @@
 #include "platform/text/TextBreakIterator.h"
 #include "platform/text/TextRun.h"
 #include "wtf/Assertions.h"
-#include "wtf/Vector.h"
 #include "wtf/unicode/CharacterNames.h"
 
-namespace WebCore {
+namespace blink {
 
 #define STRING_BUFFER_SIZE 2048
 
@@ -92,30 +91,26 @@ static unsigned rightTruncateToBuffer(const String& string, unsigned length, uns
     return truncatedLength;
 }
 
-static float stringWidth(const Font& renderer, const String& string, bool disableRoundingHacks)
+static float stringWidth(const Font& renderer, const String& string)
 {
     TextRun run(string);
-    if (disableRoundingHacks)
-        run.disableRoundingHacks();
     return renderer.width(run);
 }
 
-static float stringWidth(const Font& renderer, const UChar* characters, unsigned length, bool disableRoundingHacks)
+static float stringWidth(const Font& renderer, const UChar* characters, unsigned length)
 {
     TextRun run(characters, length);
-    if (disableRoundingHacks)
-        run.disableRoundingHacks();
     return renderer.width(run);
 }
 
-static String truncateString(const String& string, float maxWidth, const Font& font, TruncationFunction truncateToBuffer, bool disableRoundingHacks)
+static String truncateString(const String& string, float maxWidth, const Font& font, TruncationFunction truncateToBuffer)
 {
     if (string.isEmpty())
         return string;
 
     ASSERT(maxWidth >= 0);
 
-    float currentEllipsisWidth = stringWidth(font, &horizontalEllipsis, 1, disableRoundingHacks);
+    float currentEllipsisWidth = stringWidth(font, &horizontalEllipsis, 1);
 
     UChar stringBuffer[STRING_BUFFER_SIZE];
     unsigned truncatedLength;
@@ -131,7 +126,7 @@ static String truncateString(const String& string, float maxWidth, const Font& f
         truncatedLength = length;
     }
 
-    float width = stringWidth(font, stringBuffer, truncatedLength, disableRoundingHacks);
+    float width = stringWidth(font, stringBuffer, truncatedLength);
     if (width <= maxWidth)
         return string;
 
@@ -167,7 +162,7 @@ static String truncateString(const String& string, float maxWidth, const Font& f
 
         truncatedLength = truncateToBuffer(string, length, keepCount, stringBuffer);
 
-        width = stringWidth(font, stringBuffer, truncatedLength, disableRoundingHacks);
+        width = stringWidth(font, stringBuffer, truncatedLength);
         if (width <= maxWidth) {
             keepCountForLargestKnownToFit = keepCount;
             widthForLargestKnownToFit = width;
@@ -188,19 +183,19 @@ static String truncateString(const String& string, float maxWidth, const Font& f
     return String(stringBuffer, truncatedLength);
 }
 
-String StringTruncator::centerTruncate(const String& string, float maxWidth, const Font& font, EnableRoundingHacksOrNot enableRoundingHacks)
+String StringTruncator::centerTruncate(const String& string, float maxWidth, const Font& font)
 {
-    return truncateString(string, maxWidth, font, centerTruncateToBuffer, !enableRoundingHacks);
+    return truncateString(string, maxWidth, font, centerTruncateToBuffer);
 }
 
-String StringTruncator::rightTruncate(const String& string, float maxWidth, const Font& font, EnableRoundingHacksOrNot enableRoundingHacks)
+String StringTruncator::rightTruncate(const String& string, float maxWidth, const Font& font)
 {
-    return truncateString(string, maxWidth, font, rightTruncateToBuffer, !enableRoundingHacks);
+    return truncateString(string, maxWidth, font, rightTruncateToBuffer);
 }
 
-float StringTruncator::width(const String& string, const Font& font, EnableRoundingHacksOrNot enableRoundingHacks)
+float StringTruncator::width(const String& string, const Font& font)
 {
-    return stringWidth(font, string, !enableRoundingHacks);
+    return stringWidth(font, string);
 }
 
-} // namespace WebCore
+} // namespace blink