Title: [140111] trunk
Revision
140111
Author
dominik.rottsc...@intel.com
Date
2013-01-18 01:48:43 -0800 (Fri, 18 Jan 2013)

Log Message

[EFL] Update freetype in jhbuild to 2.4.11 and activate subpixel layout
https://bugs.webkit.org/show_bug.cgi?id=106774

Source/WebCore:

In order to fix a long standing linespacing/font ascent & descent issue
we found that FreeType commit b0962ac34e660 solves that problem.
Let's update FreeType accordingly, but bump it to 2.4.11 due to the
maintainer recommending several security updates after that said commit.

Also, in order to avoid extra rebaselining, let's activate subpixel
layout at the same time. With subpixel layout I propose to remove
rounding of the linespacing value in order to not introduce rounding
inaccuracies at the SimpleFontData level. Other platforms don't do that
anymore, furthermore the linegap value is not rounded either.

Reviewed by Martin Robinson.

No new tests, affects a large number of tests that will require rebaselining.

* platform/graphics/freetype/SimpleFontDataFreeType.cpp:
(WebCore::SimpleFontData::platformInit): Remove rounding when setting linespacing.

Source/WTF:

In order to fix a long standing linespacing/font ascent & descent issue
we found that FreeType commit b0962ac34e660 solves that problem.
Let's update FreeType accordingly, but bump it to 2.4.11 due to the
maintainer recommending several security updates after that said commit.

Also, in order to avoid extra rebaselining, let's activate subpixel
layout at the same time.

Reviewed by Martin Robinson.

* wtf/Platform.h: Activate Subpixel Layout for EFL.

Tools:

Reviewed by Martin Robinson.

In order to fix a long standing linespacing/font ascent & descent issue
we found that FreeType commit b0962ac34e660 solves that problem.
Let's update FreeType accordingly, but bump it to 2.4.11 due to the
maintainer recommending several security updates after that said commit.

Also, in order to avoid extra rebaselining, let's activate subpixel
layout at the same time.

* efl/jhbuild.modules: New freetype 2.4.11

Modified Paths

Diff

Modified: trunk/Source/WTF/ChangeLog (140110 => 140111)


--- trunk/Source/WTF/ChangeLog	2013-01-18 09:47:36 UTC (rev 140110)
+++ trunk/Source/WTF/ChangeLog	2013-01-18 09:48:43 UTC (rev 140111)
@@ -1,3 +1,20 @@
+2013-01-14  Dominik Röttsches  <dominik.rottsc...@intel.com>
+
+        [EFL] Update freetype in jhbuild to 2.4.11 and activate subpixel layout
+        https://bugs.webkit.org/show_bug.cgi?id=106774
+
+        In order to fix a long standing linespacing/font ascent & descent issue
+        we found that FreeType commit b0962ac34e660 solves that problem.
+        Let's update FreeType accordingly, but bump it to 2.4.11 due to the
+        maintainer recommending several security updates after that said commit.
+
+        Also, in order to avoid extra rebaselining, let's activate subpixel
+        layout at the same time.
+
+        Reviewed by Martin Robinson.
+
+        * wtf/Platform.h: Activate Subpixel Layout for EFL.
+
 2013-01-17  Adam Barth  <aba...@webkit.org>
 
         Teach Functional.h about WeakPtr

Modified: trunk/Source/WTF/wtf/Platform.h (140110 => 140111)


--- trunk/Source/WTF/wtf/Platform.h	2013-01-18 09:47:36 UTC (rev 140110)
+++ trunk/Source/WTF/wtf/Platform.h	2013-01-18 09:48:43 UTC (rev 140111)
@@ -828,8 +828,8 @@
 #endif
 
 #if !defined(ENABLE_SUBPIXEL_LAYOUT)
-#if PLATFORM(CHROMIUM)
-#define ENABLE_SUBPIXEL_LAYOUT 1 
+#if PLATFORM(CHROMIUM) || PLATFORM(EFL)
+#define ENABLE_SUBPIXEL_LAYOUT 1
 #else
 #define ENABLE_SUBPIXEL_LAYOUT 0
 #endif

Modified: trunk/Source/WebCore/ChangeLog (140110 => 140111)


--- trunk/Source/WebCore/ChangeLog	2013-01-18 09:47:36 UTC (rev 140110)
+++ trunk/Source/WebCore/ChangeLog	2013-01-18 09:48:43 UTC (rev 140111)
@@ -1,3 +1,26 @@
+2013-01-14  Dominik Röttsches  <dominik.rottsc...@intel.com>
+
+        [EFL] Update freetype in jhbuild to 2.4.11 and activate subpixel layout
+        https://bugs.webkit.org/show_bug.cgi?id=106774
+
+        In order to fix a long standing linespacing/font ascent & descent issue
+        we found that FreeType commit b0962ac34e660 solves that problem.
+        Let's update FreeType accordingly, but bump it to 2.4.11 due to the
+        maintainer recommending several security updates after that said commit.
+
+        Also, in order to avoid extra rebaselining, let's activate subpixel
+        layout at the same time. With subpixel layout I propose to remove
+        rounding of the linespacing value in order to not introduce rounding
+        inaccuracies at the SimpleFontData level. Other platforms don't do that
+        anymore, furthermore the linegap value is not rounded either.
+
+        Reviewed by Martin Robinson.
+
+        No new tests, affects a large number of tests that will require rebaselining.
+
+        * platform/graphics/freetype/SimpleFontDataFreeType.cpp:
+        (WebCore::SimpleFontData::platformInit): Remove rounding when setting linespacing.
+
 2013-01-18  Vivek Galatage  <vivek...@samsung.com>
 
         Web Inspector: Search shortcut clears the current search box contents

Modified: trunk/Source/WebCore/platform/graphics/freetype/SimpleFontDataFreeType.cpp (140110 => 140111)


--- trunk/Source/WebCore/platform/graphics/freetype/SimpleFontDataFreeType.cpp	2013-01-18 09:47:36 UTC (rev 140110)
+++ trunk/Source/WebCore/platform/graphics/freetype/SimpleFontDataFreeType.cpp	2013-01-18 09:48:43 UTC (rev 140111)
@@ -65,8 +65,12 @@
     m_fontMetrics.setAscent(ascent);
     m_fontMetrics.setDescent(descent);
 
+#if PLATFORM(EFL)
+    m_fontMetrics.setLineSpacing(ascent + descent + lineGap);
+#else
     // Match CoreGraphics metrics.
     m_fontMetrics.setLineSpacing(lroundf(ascent) + lroundf(descent) + lroundf(lineGap));
+#endif
     m_fontMetrics.setLineGap(lineGap);
 
     cairo_scaled_font_text_extents(m_platformData.scaledFont(), "x", &text_extents);
@@ -74,7 +78,7 @@
 
     cairo_scaled_font_text_extents(m_platformData.scaledFont(), " ", &text_extents);
     m_spaceWidth = narrowPrecisionToFloat(text_extents.x_advance);
-    
+
     m_syntheticBoldOffset = m_platformData.syntheticBold() ? 1.0f : 0.f;
 }
 

Modified: trunk/Tools/ChangeLog (140110 => 140111)


--- trunk/Tools/ChangeLog	2013-01-18 09:47:36 UTC (rev 140110)
+++ trunk/Tools/ChangeLog	2013-01-18 09:48:43 UTC (rev 140111)
@@ -1,3 +1,20 @@
+2013-01-14  Dominik Röttsches  <dominik.rottsc...@intel.com>
+
+        [EFL] Update freetype in jhbuild to 2.4.11 and activate subpixel layout
+        https://bugs.webkit.org/show_bug.cgi?id=106774
+
+        Reviewed by Martin Robinson.
+
+        In order to fix a long standing linespacing/font ascent & descent issue
+        we found that FreeType commit b0962ac34e660 solves that problem.
+        Let's update FreeType accordingly, but bump it to 2.4.11 due to the
+        maintainer recommending several security updates after that said commit.
+
+        Also, in order to avoid extra rebaselining, let's activate subpixel
+        layout at the same time.
+
+        * efl/jhbuild.modules: New freetype 2.4.11
+
 2013-01-17  Xiaobo Wang  <xbw...@torchmobile.com.cn>
 
         [BlackBerry] DRT - Accept http/file URL when running drt-launcher from command line

Modified: trunk/Tools/efl/jhbuild.modules (140110 => 140111)


--- trunk/Tools/efl/jhbuild.modules	2013-01-18 09:47:36 UTC (rev 140110)
+++ trunk/Tools/efl/jhbuild.modules	2013-01-18 09:48:43 UTC (rev 140111)
@@ -90,9 +90,9 @@
   </autotools>
 
   <tarball id="freetype6">
-    <source href="" version="2.4.2"
-            hash="sha256:9a987aef8c50d9bcfdfdc9f012f8bd0de6095cc1a5524e62c1a037deb8dacbfe"
-            md5sum="647ee8ed266f9a4117c8d0a4855b3d3e"/>
+    <source href="" version="2.4.11"
+            hash="sha256:ef9d0bcb64647d9e5125dc7534d7ca371c98310fec87677c410f397f71ffbe3f"
+            md5sum="b93435488942486c8d0ca22e8f768034" />
   </tarball>
 
   <autotools id="p11-kit">
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to