From 6d10cf218b22052e380fff18255953241b821ff3 Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@nokia.com>
Date: Sat, 19 Jun 2010 10:02:25 +0200
Subject: Updated WebKit to 19de3d2848b715f937eb375a078672cc8e9b8185

|| <https://webkit.org/b/40483> || [Qt] The new Qt's documentation text layout is messed up with QtWebKit. ||
---
 src/3rdparty/webkit/.tag                                   |  2 +-
 src/3rdparty/webkit/VERSION                                |  2 +-
 src/3rdparty/webkit/WebCore/ChangeLog                      | 14 ++++++++++++++
 .../webkit/WebCore/platform/graphics/qt/FontQt.cpp         |  2 +-
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/3rdparty/webkit/.tag b/src/3rdparty/webkit/.tag
index 4c476d0..98460a0 100644
--- a/src/3rdparty/webkit/.tag
+++ b/src/3rdparty/webkit/.tag
@@ -1 +1 @@
-515aae71494436816cd0250cdc52caa4f2566aef
+19de3d2848b715f937eb375a078672cc8e9b8185
diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION
index 4cf9463..c2daf34 100644
--- a/src/3rdparty/webkit/VERSION
+++ b/src/3rdparty/webkit/VERSION
@@ -4,4 +4,4 @@ This is a snapshot of the Qt port of WebKit from
 
 and has the sha1 checksum
 
-        515aae71494436816cd0250cdc52caa4f2566aef
+        19de3d2848b715f937eb375a078672cc8e9b8185
diff --git a/src/3rdparty/webkit/WebCore/ChangeLog b/src/3rdparty/webkit/WebCore/ChangeLog
index 3113efe..ddd04c1 100644
--- a/src/3rdparty/webkit/WebCore/ChangeLog
+++ b/src/3rdparty/webkit/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-06-18  Ananth Jasty  <ext-ananth.jasty@nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Text spacing miscalculation when using wordSpacing.
+        https://bugs.webkit.org/show_bug.cgi?id=40483
+
+        Removed wordSpacing compensation in FontQt whitespace width
+        calculation. The QFontMetrics::width() overload that takes
+        a character does not take QFont's word spacing into account.
+
+        * platform/graphics/qt/FontQt.cpp:
+        (WebCore::Font::floatWidthForComplexText):
+
 2010-06-13  Robert Hogan  <robert@webkit.org>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/qt/FontQt.cpp b/src/3rdparty/webkit/WebCore/platform/graphics/qt/FontQt.cpp
index ae1033e..d75f156 100644
--- a/src/3rdparty/webkit/WebCore/platform/graphics/qt/FontQt.cpp
+++ b/src/3rdparty/webkit/WebCore/platform/graphics/qt/FontQt.cpp
@@ -182,7 +182,7 @@ float Font::floatWidthForComplexText(const TextRun& run, HashSet<const SimpleFon
         return 0;
 
     if (run.length() == 1 && treatAsSpace(run[0]))
-        return QFontMetrics(font()).width(run[0]) - m_wordSpacing + run.padding();
+        return QFontMetrics(font()).width(run[0]) + run.padding();
 
     String sanitized = Font::normalizeSpaces(String(run.characters(), run.length()));
     QString string = fromRawDataWithoutRef(sanitized);
-- 
cgit v0.12