Diff
Modified: trunk/PerformanceTests/ChangeLog (215416 => 215417)
--- trunk/PerformanceTests/ChangeLog 2017-04-17 16:15:56 UTC (rev 215416)
+++ trunk/PerformanceTests/ChangeLog 2017-04-17 16:37:26 UTC (rev 215417)
@@ -1,3 +1,16 @@
+2017-04-17 Ryan Haddad <ryanhad...@apple.com>
+
+ Unreviewed, rolling out r215366.
+
+ This test is failing on performance bots.
+
+ Reverted changeset:
+
+ "Add performance test for asking the platform for a font for
+ U+2060 WORD JOINER"
+ https://bugs.webkit.org/show_bug.cgi?id=170842
+ http://trac.webkit.org/changeset/215366
+
2017-04-14 Myles C. Maxfield <mmaxfi...@apple.com>
Add performance test for asking the platform for a font for U+2060 WORD JOINER
Deleted: trunk/PerformanceTests/Layout/word-joiner.html (215416 => 215417)
--- trunk/PerformanceTests/Layout/word-joiner.html 2017-04-17 16:15:56 UTC (rev 215416)
+++ trunk/PerformanceTests/Layout/word-joiner.html 2017-04-17 16:37:26 UTC (rev 215417)
@@ -1,44 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<script src=""
-</head>
-</head>
-<body>
- <pre id="log"></pre>
- <div id="target" style="width: 300px; display: block; font-family: 'Zapfino';">
- </div>
- <script>
- var target = document.getElementById("target");
- var style = target.style;
- var locales = ["ar", "hy", "as", "iu", "ab", "hi", "am", "ka", "el", "gu", "pa", "ko", "ko", "he", "kn", "ja", "km", "lo", "aa", "ml", "my", "or", "si", "ta", "te", "dv", "th", "bo", "zh_hk", "ii"];
-
- for (var i = 0; i < locales.length; ++i) {
- var span = document.createElement("span");
- span.className = "tester";
- var joiner = document.createTextNode(String.fromCharCode(0x2060));
- span.appendChild(joiner);
- target.appendChild(span);
- }
-
- function updateLanguages() {
- if (window.internals)
- internals.invalidateFontCache();
- var testers = document.getElementsByClassName("tester");
- for (var i = 0; i < testers.length; ++i) {
- testers[i].lang = locales[i];
- }
- }
-
- updateLanguages();
-
- function test() {
- updateLanguages();
- var testers = document.getElementsByClassName("tester");
- testers[testers.length - 1].getClientRects();
- }
-
- PerfTestRunner.measureRunsPerSecond({ run: test });
- </script>
-</body>
-</html>
\ No newline at end of file
Modified: trunk/Source/WTF/ChangeLog (215416 => 215417)
--- trunk/Source/WTF/ChangeLog 2017-04-17 16:15:56 UTC (rev 215416)
+++ trunk/Source/WTF/ChangeLog 2017-04-17 16:37:26 UTC (rev 215417)
@@ -1,3 +1,16 @@
+2017-04-17 Ryan Haddad <ryanhad...@apple.com>
+
+ Unreviewed, rolling out r215366.
+
+ This test is failing on performance bots.
+
+ Reverted changeset:
+
+ "Add performance test for asking the platform for a font for
+ U+2060 WORD JOINER"
+ https://bugs.webkit.org/show_bug.cgi?id=170842
+ http://trac.webkit.org/changeset/215366
+
2017-04-17 Yusuke Suzuki <utatane....@gmail.com>
[JSCOnly] Fix build failures in macOS
Modified: trunk/Source/WTF/wtf/unicode/CharacterNames.h (215416 => 215417)
--- trunk/Source/WTF/wtf/unicode/CharacterNames.h 2017-04-17 16:15:56 UTC (rev 215416)
+++ trunk/Source/WTF/wtf/unicode/CharacterNames.h 2017-04-17 16:37:26 UTC (rev 215417)
@@ -92,7 +92,6 @@
const UChar whiteCircle = 0x25CB;
const UChar whiteSesameDot = 0xFE46;
const UChar whiteUpPointingTriangle = 0x25B3;
-const UChar wordJoiner = 0x2060;
const UChar yenSign = 0x00A5;
const UChar zeroWidthJoiner = 0x200D;
const UChar zeroWidthNoBreakSpace = 0xFEFF;
@@ -155,7 +154,6 @@
using WTF::Unicode::whiteCircle;
using WTF::Unicode::whiteSesameDot;
using WTF::Unicode::whiteUpPointingTriangle;
-using WTF::Unicode::wordJoiner;
using WTF::Unicode::yenSign;
using WTF::Unicode::zeroWidthJoiner;
using WTF::Unicode::zeroWidthNoBreakSpace;
Modified: trunk/Source/WebCore/ChangeLog (215416 => 215417)
--- trunk/Source/WebCore/ChangeLog 2017-04-17 16:15:56 UTC (rev 215416)
+++ trunk/Source/WebCore/ChangeLog 2017-04-17 16:37:26 UTC (rev 215417)
@@ -1,3 +1,16 @@
+2017-04-17 Ryan Haddad <ryanhad...@apple.com>
+
+ Unreviewed, rolling out r215366.
+
+ This test is failing on performance bots.
+
+ Reverted changeset:
+
+ "Add performance test for asking the platform for a font for
+ U+2060 WORD JOINER"
+ https://bugs.webkit.org/show_bug.cgi?id=170842
+ http://trac.webkit.org/changeset/215366
+
2017-04-17 Youenn Fablet <you...@apple.com>
RTCPeerConnection addTrack does not require a stream parameter
Modified: trunk/Source/WebCore/platform/graphics/WidthCache.h (215416 => 215417)
--- trunk/Source/WebCore/platform/graphics/WidthCache.h 2017-04-17 16:15:56 UTC (rev 215416)
+++ trunk/Source/WebCore/platform/graphics/WidthCache.h 2017-04-17 16:37:26 UTC (rev 215417)
@@ -140,22 +140,22 @@
return nullptr;
// The width cache is not really profitable unless we're doing expensive glyph transformations.
if (!hasKerningOrLigatures)
- return nullptr;
+ return 0;
// Word spacing and letter spacing can change the width of a word.
if (hasWordSpacingOrLetterSpacing)
- return nullptr;
+ return 0;
// Since this is just a width cache, we don't have enough information to satisfy glyph queries.
if (glyphOverflow)
- return nullptr;
+ return 0;
// If we allow tabs and a tab occurs inside a word, the width of the word varies based on its position on the line.
if (run.allowTabs())
- return nullptr;
+ return 0;
if (static_cast<unsigned>(run.length()) > SmallStringKey::capacity())
- return nullptr;
+ return 0;
if (m_countdown > 0) {
--m_countdown;
- return nullptr;
+ return 0;
}
return addSlowCase(run.text(), entry);
@@ -207,7 +207,7 @@
// No need to be fancy: we're just trying to avoid pathological growth.
m_singleCharMap.clear();
m_map.clear();
- return nullptr;
+ return 0;
}
typedef HashMap<SmallStringKey, float, SmallStringKeyHash, SmallStringKeyHashTraits> Map;
