[webkit-changes] [181155] trunk/Source

Fri, 06 Mar 2015 07:39:51 -0800

Title: [181155] trunk/Source
Revision
181155
Author
mmaxfi...@apple.com
Date
2015-03-06 07:37:07 -0800 (Fri, 06 Mar 2015)

Log Message

[iOS] SVG fonts are garbled
https://bugs.webkit.org/show_bug.cgi?id=142377

Patch by Myles C. Maxfield <mmaxfi...@apple.com> on 2015-03-06
Reviewed by Simon Fraser.

Source/_javascript_Core:

* Configurations/FeatureDefines.xcconfig:

Source/WebCore:

The C++ spec says that casting a negative floating point number to
an unsigned integer is undefined. Instead, use clamping.

Covered by existing SVG font tests.

* Configurations/FeatureDefines.xcconfig:
* svg/SVGToOTFFontConversion.cpp:
(WebCore::writeCFFEncodedNumber):

Source/WebKit/mac:

* Configurations/FeatureDefines.xcconfig:

Source/WebKit2:

* Configurations/FeatureDefines.xcconfig:

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (181154 => 181155)


--- trunk/Source/_javascript_Core/ChangeLog	2015-03-06 14:34:51 UTC (rev 181154)
+++ trunk/Source/_javascript_Core/ChangeLog	2015-03-06 15:37:07 UTC (rev 181155)
@@ -1,3 +1,12 @@
+2015-03-06  Myles C. Maxfield  <mmaxfi...@apple.com>
+
+        [iOS] SVG fonts are garbled
+        https://bugs.webkit.org/show_bug.cgi?id=142377
+
+        Reviewed by Simon Fraser.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2015-03-05  Joseph Pecoraro  <pecor...@apple.com>
 
         ES6: Object Literal Extensions - Shorthand Properties (Identifiers)

Modified: trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig (181154 => 181155)


--- trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig	2015-03-06 14:34:51 UTC (rev 181154)
+++ trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig	2015-03-06 15:37:07 UTC (rev 181155)
@@ -155,8 +155,7 @@
 ENABLE_STREAMS_API = ENABLE_STREAMS_API;
 ENABLE_SUBTLE_CRYPTO = ENABLE_SUBTLE_CRYPTO;
 ENABLE_SVG_FONTS = ENABLE_SVG_FONTS;
-ENABLE_SVG_OTF_CONVERTER[sdk=iphone*] = ;
-ENABLE_SVG_OTF_CONVERTER[sdk=macosx*] = ENABLE_SVG_OTF_CONVERTER;
+ENABLE_SVG_OTF_CONVERTER = ENABLE_SVG_OTF_CONVERTER;
 
 ENABLE_TELEPHONE_NUMBER_DETECTION[sdk=iphone*] = ENABLE_TELEPHONE_NUMBER_DETECTION;
 ENABLE_TELEPHONE_NUMBER_DETECTION[sdk=macosx*] = $(ENABLE_TELEPHONE_NUMBER_DETECTION_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));

Modified: trunk/Source/WebCore/ChangeLog (181154 => 181155)


--- trunk/Source/WebCore/ChangeLog	2015-03-06 14:34:51 UTC (rev 181154)
+++ trunk/Source/WebCore/ChangeLog	2015-03-06 15:37:07 UTC (rev 181155)
@@ -1,3 +1,19 @@
+2015-03-06  Myles C. Maxfield  <mmaxfi...@apple.com>
+
+        [iOS] SVG fonts are garbled
+        https://bugs.webkit.org/show_bug.cgi?id=142377
+
+        Reviewed by Simon Fraser.
+
+        The C++ spec says that casting a negative floating point number to
+        an unsigned integer is undefined. Instead, use clamping.
+
+        Covered by existing SVG font tests.
+
+        * Configurations/FeatureDefines.xcconfig:
+        * svg/SVGToOTFFontConversion.cpp:
+        (WebCore::writeCFFEncodedNumber):
+
 2015-03-06  Commit Queue  <commit-qu...@webkit.org>
 
         Unreviewed, rolling out r181139.

Modified: trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig (181154 => 181155)


--- trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig	2015-03-06 14:34:51 UTC (rev 181154)
+++ trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig	2015-03-06 15:37:07 UTC (rev 181155)
@@ -155,8 +155,7 @@
 ENABLE_STREAMS_API = ENABLE_STREAMS_API;
 ENABLE_SUBTLE_CRYPTO = ENABLE_SUBTLE_CRYPTO;
 ENABLE_SVG_FONTS = ENABLE_SVG_FONTS;
-ENABLE_SVG_OTF_CONVERTER[sdk=iphone*] = ;
-ENABLE_SVG_OTF_CONVERTER[sdk=macosx*] = ENABLE_SVG_OTF_CONVERTER;
+ENABLE_SVG_OTF_CONVERTER = ENABLE_SVG_OTF_CONVERTER;
 
 ENABLE_TELEPHONE_NUMBER_DETECTION[sdk=iphone*] = ENABLE_TELEPHONE_NUMBER_DETECTION;
 ENABLE_TELEPHONE_NUMBER_DETECTION[sdk=macosx*] = $(ENABLE_TELEPHONE_NUMBER_DETECTION_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));

Modified: trunk/Source/WebCore/svg/SVGToOTFFontConversion.cpp (181154 => 181155)


--- trunk/Source/WebCore/svg/SVGToOTFFontConversion.cpp	2015-03-06 14:34:51 UTC (rev 181154)
+++ trunk/Source/WebCore/svg/SVGToOTFFontConversion.cpp	2015-03-06 15:37:07 UTC (rev 181155)
@@ -1036,7 +1036,8 @@
 static void writeCFFEncodedNumber(V& vector, float number)
 {
     vector.append(0xFF);
-    append32(vector, number * 0x10000);
+    // Convert to 16.16 fixed-point
+    append32(vector, clampTo<int32_t>(number * 0x10000));
 }
 
 static const char rLineTo = 0x05;

Modified: trunk/Source/WebKit/mac/ChangeLog (181154 => 181155)


--- trunk/Source/WebKit/mac/ChangeLog	2015-03-06 14:34:51 UTC (rev 181154)
+++ trunk/Source/WebKit/mac/ChangeLog	2015-03-06 15:37:07 UTC (rev 181155)
@@ -1,3 +1,12 @@
+2015-03-06  Myles C. Maxfield  <mmaxfi...@apple.com>
+
+        [iOS] SVG fonts are garbled
+        https://bugs.webkit.org/show_bug.cgi?id=142377
+
+        Reviewed by Simon Fraser.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2015-03-04  Yusuke Suzuki  <utatane....@gmail.com>
 
         Hide Promise with runtime flags under Cocoa JSContext API

Modified: trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig (181154 => 181155)


--- trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig	2015-03-06 14:34:51 UTC (rev 181154)
+++ trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig	2015-03-06 15:37:07 UTC (rev 181155)
@@ -155,8 +155,7 @@
 ENABLE_STREAMS_API = ENABLE_STREAMS_API;
 ENABLE_SUBTLE_CRYPTO = ENABLE_SUBTLE_CRYPTO;
 ENABLE_SVG_FONTS = ENABLE_SVG_FONTS;
-ENABLE_SVG_OTF_CONVERTER[sdk=iphone*] = ;
-ENABLE_SVG_OTF_CONVERTER[sdk=macosx*] = ENABLE_SVG_OTF_CONVERTER;
+ENABLE_SVG_OTF_CONVERTER = ENABLE_SVG_OTF_CONVERTER;
 
 ENABLE_TELEPHONE_NUMBER_DETECTION[sdk=iphone*] = ENABLE_TELEPHONE_NUMBER_DETECTION;
 ENABLE_TELEPHONE_NUMBER_DETECTION[sdk=macosx*] = $(ENABLE_TELEPHONE_NUMBER_DETECTION_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));

Modified: trunk/Source/WebKit2/ChangeLog (181154 => 181155)


--- trunk/Source/WebKit2/ChangeLog	2015-03-06 14:34:51 UTC (rev 181154)
+++ trunk/Source/WebKit2/ChangeLog	2015-03-06 15:37:07 UTC (rev 181155)
@@ -1,3 +1,12 @@
+2015-03-06  Myles C. Maxfield  <mmaxfi...@apple.com>
+
+        [iOS] SVG fonts are garbled
+        https://bugs.webkit.org/show_bug.cgi?id=142377
+
+        Reviewed by Simon Fraser.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2015-03-06  Zan Dobersek  <zdober...@igalia.com>
 
         Unguarded GTK-specific member and method usage in DrawingAreaImpl

Modified: trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig (181154 => 181155)


--- trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig	2015-03-06 14:34:51 UTC (rev 181154)
+++ trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig	2015-03-06 15:37:07 UTC (rev 181155)
@@ -155,8 +155,7 @@
 ENABLE_STREAMS_API = ENABLE_STREAMS_API;
 ENABLE_SUBTLE_CRYPTO = ENABLE_SUBTLE_CRYPTO;
 ENABLE_SVG_FONTS = ENABLE_SVG_FONTS;
-ENABLE_SVG_OTF_CONVERTER[sdk=iphone*] = ;
-ENABLE_SVG_OTF_CONVERTER[sdk=macosx*] = ENABLE_SVG_OTF_CONVERTER;
+ENABLE_SVG_OTF_CONVERTER = ENABLE_SVG_OTF_CONVERTER;
 
 ENABLE_TELEPHONE_NUMBER_DETECTION[sdk=iphone*] = ENABLE_TELEPHONE_NUMBER_DETECTION;
 ENABLE_TELEPHONE_NUMBER_DETECTION[sdk=macosx*] = $(ENABLE_TELEPHONE_NUMBER_DETECTION_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to