Changeset 55406 in webkit

Timestamp:

Mar 2, 2010 2:16:24 AM (14 years ago)

Author:

zecke@webkit.org

Message:

[Qt] Special case Font::floatWidthForComplexText for single space

​https://bugs.webkit.org/show_bug.cgi?id=33876

For a single space we can go through the QFontMetric::width routine
instead of converting the WebCore::String to a QString and then
going through the QTextLine.

• platform/graphics/qt/FontQt.cpp:

(WebCore::Font::floatWidthForComplexText):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/qt/FontQt.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-01-28  Holger Hans Peter Freyther  <zecke@selfish.org>
+
+        Reviewed by Ariya Hidayat.
+
+        [Qt] Special case Font::floatWidthForComplexText for single space
+        https://bugs.webkit.org/show_bug.cgi?id=33876
+
+        For a single space we can go through the QFontMetric::width routine
+        instead of converting the WebCore::String to a QString and then
+        going through the QTextLine.
+
+        * platform/graphics/qt/FontQt.cpp:
+        (WebCore::Font::floatWidthForComplexText):
+
 2010-02-28  Holger Hans Peter Freyther  <zecke@selfish.org>
 

trunk/WebCore/platform/graphics/qt/FontQt.cpp

@@ -1 +1 @@
 /*
     Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
-    Copyright (C) 2008 Holger Hans Peter Freyther
+    Copyright (C) 2008, 2010 Holger Hans Peter Freyther
     Copyright (C) 2009 Dirk Schulze <krit@webkit.org>
 
@@ -175 +175 @@
         return 0;
 
+    if (run.length() == 1 && treatAsSpace(run[0]))
+        return QFontMetrics(font()).width(run[0]) - m_wordSpacing + run.padding();
+
     String sanitized = Font::normalizeSpaces(String(run.characters(), run.length()));
     QString string = fromRawDataWithoutRef(sanitized);