[webkit-changes] [192938] trunk

Tue, 01 Dec 2015 19:23:59 -0800

Title: [192938] trunk
Revision
192938
Author
[email protected]
Date
2015-12-01 19:23:59 -0800 (Tue, 01 Dec 2015)

Log Message

Unreviewed, rolling out r192894 and r192904.
https://bugs.webkit.org/show_bug.cgi?id=151738

Crashes sometimes on Windows (Requested by litherum on
#webkit).

Reverted changesets:

"[Win] Web fonts with small caps have excess whitespace with
the complex text codepath"
https://bugs.webkit.org/show_bug.cgi?id=151698
http://trac.webkit.org/changeset/192894

"Test gardening after r192894"
http://trac.webkit.org/changeset/192904

Modified Paths

Removed Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (192937 => 192938)


--- trunk/LayoutTests/ChangeLog	2015-12-02 03:16:28 UTC (rev 192937)
+++ trunk/LayoutTests/ChangeLog	2015-12-02 03:23:59 UTC (rev 192938)
@@ -1,3 +1,21 @@
+2015-12-01  Commit Queue  <[email protected]>
+
+        Unreviewed, rolling out r192894 and r192904.
+        https://bugs.webkit.org/show_bug.cgi?id=151738
+
+        Crashes sometimes on Windows (Requested by litherum on
+        #webkit).
+
+        Reverted changesets:
+
+        "[Win] Web fonts with small caps have excess whitespace with
+        the complex text codepath"
+        https://bugs.webkit.org/show_bug.cgi?id=151698
+        http://trac.webkit.org/changeset/192894
+
+        "Test gardening after r192894"
+        http://trac.webkit.org/changeset/192904
+
 2015-12-01  Myles C. Maxfield  <[email protected]>
 
         [SVG -> OTF Converter] Force UnitsPerEm to 1000

Deleted: trunk/LayoutTests/fast/text/resources/tinyfont.svg (192937 => 192938)


--- trunk/LayoutTests/fast/text/resources/tinyfont.svg	2015-12-02 03:16:28 UTC (rev 192937)
+++ trunk/LayoutTests/fast/text/resources/tinyfont.svg	2015-12-02 03:23:59 UTC (rev 192938)
@@ -1,13 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata></metadata>
-<defs>
-<font id="Litherum" horiz-adv-x="100">
-<font-face units-per-em="100" ascent="80" descent="-20"/>
-<glyph unicode=" "/>
-<glyph horiz-adv-x="80" unicode="e&#x300;" d="M0 -20v100h100v-100z"/>
-<glyph horiz-adv-x="80" unicode="&#xe8;" d="M0 -20v100h100v-100z"/>
-</font>
-</defs>
-</svg>

Deleted: trunk/LayoutTests/fast/text/small-caps-complex-expected.html (192937 => 192938)


--- trunk/LayoutTests/fast/text/small-caps-complex-expected.html	2015-12-02 03:16:28 UTC (rev 192937)
+++ trunk/LayoutTests/fast/text/small-caps-complex-expected.html	2015-12-02 03:23:59 UTC (rev 192938)
@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-@font-face {
-    font-family: "WebAhem";
-    src: url("../../resources/Ahem.ttf") format(truetype);
-}
-@font-face {
-    font-family: "WebFallbackFont";
-    src: url("resources/tinyfont.svg") format("svg");
-}
-</style>
-</head>
-<body>
-This test makes sure that small-caps works in both the simple and complex text codepaths.
-<div style="position: relative;">
-<div style="font: 100px WebAhem, WebFallbackFont; font-variant: small-caps;">a&#xe8;bcd</div>
-<div style="position: absolute; left: 50px; top: 0px; width: 125px; height: 100px; background-color: black;"></div>
-<div style="position: absolute; left: 350px; top: 0px; width: 20px; height: 100px; background-color: black;"></div>
-<div style="position: absolute; left: 0px; top: 83px; width: 370px; height: 32px; background-color: black;"></div>
-<div style="position: absolute; left: 0px; top: 20px; width: 370px; height: 15px; background-color: black;"></div>
-</div>
-</body>
-</html>

Deleted: trunk/LayoutTests/fast/text/small-caps-complex.html (192937 => 192938)


--- trunk/LayoutTests/fast/text/small-caps-complex.html	2015-12-02 03:16:28 UTC (rev 192937)
+++ trunk/LayoutTests/fast/text/small-caps-complex.html	2015-12-02 03:23:59 UTC (rev 192938)
@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-@font-face {
-    font-family: "WebAhem";
-    src: url("../../resources/Ahem.ttf") format("truetype");
-}
-@font-face {
-    font-family: "WebFallbackFont";
-    src: url("resources/tinyfont.svg") format("svg");
-}
-</style>
-</head>
-<body>
-This test makes sure that small-caps works in both the simple and complex text codepaths.
-<div style="position: relative;">
-<div style="font: 100px WebAhem, WebFallbackFont; font-variant: small-caps;">ae&#x300;bcd</div>
-<div style="position: absolute; left: 50px; top: 0px; width: 125px; height: 100px; background-color: black;"></div>
-<div style="position: absolute; left: 350px; top: 0px; width: 20px; height: 100px; background-color: black;"></div>
-<div style="position: absolute; left: 0px; top: 93px; width: 370px; height: 22px; background-color: black;"></div>
-<div style="position: absolute; left: 0px; top: 20px; width: 370px; height: 15px; background-color: black;"></div>
-</div>
-</body>
-</html>

Modified: trunk/Source/WebCore/ChangeLog (192937 => 192938)


--- trunk/Source/WebCore/ChangeLog	2015-12-02 03:16:28 UTC (rev 192937)
+++ trunk/Source/WebCore/ChangeLog	2015-12-02 03:23:59 UTC (rev 192938)
@@ -1,3 +1,21 @@
+2015-12-01  Commit Queue  <[email protected]>
+
+        Unreviewed, rolling out r192894 and r192904.
+        https://bugs.webkit.org/show_bug.cgi?id=151738
+
+        Crashes sometimes on Windows (Requested by litherum on
+        #webkit).
+
+        Reverted changesets:
+
+        "[Win] Web fonts with small caps have excess whitespace with
+        the complex text codepath"
+        https://bugs.webkit.org/show_bug.cgi?id=151698
+        http://trac.webkit.org/changeset/192894
+
+        "Test gardening after r192894"
+        http://trac.webkit.org/changeset/192904
+
 2015-12-01  Yusuke Suzuki  <[email protected]>
 
         [ES6] Implement LLInt/Baseline Support for ES6 Generators and enable this feature

Modified: trunk/Source/WebCore/platform/graphics/win/SimpleFontDataWin.cpp (192937 => 192938)


--- trunk/Source/WebCore/platform/graphics/win/SimpleFontDataWin.cpp	2015-12-02 03:16:28 UTC (rev 192937)
+++ trunk/Source/WebCore/platform/graphics/win/SimpleFontDataWin.cpp	2015-12-02 03:23:59 UTC (rev 192938)
@@ -135,6 +135,12 @@
 RefPtr<Font> Font::platformCreateScaledFont(const FontDescription& fontDescription, float scaleFactor) const
 {
     float scaledSize = scaleFactor * m_platformData.size();
+    if (isCustomFont()) {
+        FontPlatformData scaledFont(m_platformData);
+        scaledFont.setSize(scaledSize);
+        return Font::create(scaledFont, true, false);
+    }
+
     LOGFONT winfont;
     GetObject(m_platformData.hfont(), sizeof(LOGFONT), &winfont);
     winfont.lfHeight = -lroundf(scaledSize * (m_platformData.useGDI() ? 1 : 32));

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to